Debug osrm-extract CI crash

Calculate confidence interval for benchmark measurements (#6950 )
Get rid of unused Boost dependencies (#6960 )
2024-06-22 20:30:21 +02:00 · 2024-06-21 21:43:27 +02:00 · 2024-06-21 19:04:34 +02:00 · 2024-06-21 08:51:56 +02:00 · 2024-06-20 21:44:28 +02:00 · 2024-06-20 09:08:57 +02:00
1174 changed files with 77259 additions and 82330 deletions
@@ -13,6 +13,10 @@ Checks: >
    -bugprone-forward-declaration-namespace,
    -bugprone-sizeof-expression,
    -bugprone-throw-keyword-missing,
    -bugprone-chained-comparison,
    -bugprone-incorrect-enable-if,
    -bugprone-switch-missing-default-case,
    -bugprone-empty-catch,
    -clang-analyzer-*,
    -clang-diagnostic-deprecated-declarations,
    -clang-diagnostic-constant-conversion,
@@ -42,15 +46,20 @@ Checks: >
    -llvm-twine-local,
    misc-*,
    -misc-argument-comment,
    -misc-const-correctness,
    -misc-non-private-member-variables-in-classes,
    -misc-unconventional-assign-operator,
    -misc-no-recursion,
    -misc-misplaced-const,
    -misc-definitions-in-headers,
    -misc-unused-parameters,
    -misc-include-cleaner,
    modernize-concat-nested-namespaces,
    modernize-use-using,
    performance-*,
    -performance-noexcept-move-constructor,
    -performance-no-int-to-ptr,
    -performance-enum-size,
    -performance-avoid-endl,
    readability-*,
    -readability-avoid-const-params-in-decls,
    -readability-braces-around-statements,
@@ -79,6 +88,10 @@ Checks: >
    -readability-make-member-function-const,
    -readability-redundant-string-init,
    -readability-non-const-parameter,
    -readability-redundant-inline-specifier,
    -readability-avoid-nested-conditional-operator,
    -readability-avoid-return-with-void-value,
    -readability-redundant-casting,
    -readability-static-accessed-through-instance
 WarningsAsErrors: '*'
@@ -1,5 +0,0 @@
 ---
 name: Question
 about: Ask a question about OSRM
 labels: question
 ---
@@ -6,6 +6,9 @@ on:
 jobs:
  publish:
    strategy:
      matrix:
        docker-base-image: ["debian", "alpine"]
    runs-on: ubuntu-latest
    steps:       
      - name: Check out the repo
@@ -53,10 +56,10 @@ jobs:
        with:
          push: true
          platforms: linux/amd64,linux/arm64
-          file: ./docker/Dockerfile
+          file: ./docker/Dockerfile-${{ matrix.docker-base-image }}
          tags: ${{ steps.metadebug.outputs.tags  }}
          build-args: |
-            DOCKER_TAG=${{ join(steps.metadebug.outputs.tags ) }}
+            DOCKER_TAG=${{ join(steps.metadebug.outputs.tags ) }}-${{ matrix.docker-base-image }}
      - name: Build container image - assertions
@@ -64,10 +67,10 @@ jobs:
        with:
          push: true
          platforms: linux/amd64,linux/arm64
-          file: ./docker/Dockerfile
+          file: ./docker/Dockerfile-${{ matrix.docker-base-image }}
          tags: ${{ steps.metaassertions.outputs.tags  }}
          build-args: |
-            DOCKER_TAG=${{ join(steps.metaassertions.outputs.tags ) }}
+            DOCKER_TAG=${{ join(steps.metaassertions.outputs.tags ) }}-${{ matrix.docker-base-image }}
      # build and publish "normal" image as last to get it listed on top
      - name: Build container image - normal
@@ -75,10 +78,7 @@ jobs:
        with:
          push: true
          platforms: linux/amd64,linux/arm64
-          file: ./docker/Dockerfile
+          file: ./docker/Dockerfile-${{ matrix.docker-base-image }}
-          tags:  ${{ steps.meta.outputs.tags  }}
+          tags: ${{ steps.meta.outputs.tags  }}
          build-args: |
-            DOCKER_TAG=${{ join(steps.meta.outputs.tags ) }}            
+            DOCKER_TAG=${{ join(steps.meta.outputs.tags ) }}-${{ matrix.docker-base-image }}
@@ -0,0 +1,24 @@
 name: 'Close stale issues'
 on:
  schedule:
    - cron: '30 1 * * *' # every day at 1:30am
 permissions:
  issues: write
  pull-requests: write
 jobs:
  stale:
    runs-on: ubuntu-24.04
    steps:
      - uses: actions/stale@v9
        with:
          stale-issue-message: 'This issue seems to be stale. It will be closed in 30 days if no further activity occurs.'
          stale-pr-message: 'This PR seems to be stale. Is it still relevant?'
          days-before-issue-stale: 180 # 6 months
          days-before-issue-close: 30 # 1 month
          days-before-pr-stale: 180 # 6 months
          days-before-pr-close: -1 # never close PRs
          exempt-issue-labels: 'Do Not Stale,Feature Request,Performance,Bug Report,CI,Starter Task,Refactor,Guidance'
@@ -105,3 +105,4 @@ debug.lua
 # node-osrm artifacts
 lib/binding
@@ -1,4 +1,87 @@
 # Unreleased
  - Changes from 5.27.1
    - Features
      - REMOVED: Remove all core-CH left-overs [#6920](https://github.com/Project-OSRM/osrm-backend/pull/6920)
      - ADDED: Add support for a keepalive_timeout flag. [#6674](https://github.com/Project-OSRM/osrm-backend/pull/6674)
      - ADDED: Add support for a default_radius flag. [#6575](https://github.com/Project-OSRM/osrm-backend/pull/6575)
      - ADDED: Add support for disabling feature datasets. [#6666](https://github.com/Project-OSRM/osrm-backend/pull/6666)
      - ADDED: Add support for opposite approach request parameter. [#6842](https://github.com/Project-OSRM/osrm-backend/pull/6842)
      - ADDED: Add support for accessing edge flags in `process_segment` [#6658](https://github.com/Project-OSRM/osrm-backend/pull/6658)
    - Build:
      - CHANGED: Upgrade clang-format to version 15. [#6919](https://github.com/Project-OSRM/osrm-backend/pull/6919)
      - CHANGED: Use Debian Bookworm as base Docker image [#6904](https://github.com/Project-OSRM/osrm-backend/pull/6904)
      - CHANGED: Upgrade CI actions to latest versions [#6893](https://github.com/Project-OSRM/osrm-backend/pull/6893)
      - CHANGED:  Remove outdated warnings #6894 [#6894](https://github.com/Project-OSRM/osrm-backend/pull/6894)
      - ADDED: Add CI job which builds OSRM with gcc 12. [#6455](https://github.com/Project-OSRM/osrm-backend/pull/6455)
      - CHANGED: Upgrade to clang-tidy 15. [#6439](https://github.com/Project-OSRM/osrm-backend/pull/6439)
      - CHANGED: Update actions/cache to v3. [#6420](https://github.com/Project-OSRM/osrm-backend/pull/6420)
      - REMOVED: Drop support of Node 12 & 14. [#6431](https://github.com/Project-OSRM/osrm-backend/pull/6431)
      - ADDED: Add 'load directly' mode to default Cucumber test suite. [#6663](https://github.com/Project-OSRM/osrm-backend/pull/6663)
      - CHANGED: Fix compilation for Boost 1.85.0 [#6856](https://github.com/Project-OSRM/osrm-backend/pull/6856)
      - CHANGED: Drop support for Node 16 [#6855](https://github.com/Project-OSRM/osrm-backend/pull/6855)
      - REMOVED: Remove unused AppVeyor files [#6860](https://github.com/Project-OSRM/osrm-backend/pull/6860)
      - CHANGED: Upgrade clang-format to version 15 [#6859](https://github.com/Project-OSRM/osrm-backend/pull/6859)
    - NodeJS:
      - CHANGED: Use node-api instead of NAN. [#6452](https://github.com/Project-OSRM/osrm-backend/pull/6452)
    - Misc:
      - CHANGED: Get rid of unused Boost dependencies. [#6960](https://github.com/Project-OSRM/osrm-backend/pull/6960)
      - CHANGED: Apply micro-optimisation for Table & Trip APIs. [#6949](https://github.com/Project-OSRM/osrm-backend/pull/6949)
      - CHANGED: Apply micro-optimisation for Route API. [#6948](https://github.com/Project-OSRM/osrm-backend/pull/6948)
      - CHANGED: Apply micro-optimisation for Match API. [#6945](https://github.com/Project-OSRM/osrm-backend/pull/6945)
      - CHANGED: Apply micro-optimisation for Nearest API. [#6944](https://github.com/Project-OSRM/osrm-backend/pull/6944)
      - CHANGED: Avoid copy of intersection in totalTurnAngle. [#6938](https://github.com/Project-OSRM/osrm-backend/pull/6938)
      - CHANGED: Use std::unordered_map::emplace instead of operator[] when producing JSONs. [#6936](https://github.com/Project-OSRM/osrm-backend/pull/6936)
      - CHANGED: Avoid copy of vectors in MakeRoute function. [#6939](https://github.com/Project-OSRM/osrm-backend/pull/6939)
      - FIXED: Fix bugprone-unused-return-value clang-tidy warning. [#6934](https://github.com/Project-OSRM/osrm-backend/pull/6934)
      - FIXED: Fix performance-noexcept-move-constructor clang-tidy warning. [#6931](https://github.com/Project-OSRM/osrm-backend/pull/6933)
      - FIXED: Fix performance-noexcept-swap clang-tidy warning. [#6931](https://github.com/Project-OSRM/osrm-backend/pull/6931)
      - CHANGED: Use custom struct instead of std::pair in QueryHeap. [#6921](https://github.com/Project-OSRM/osrm-backend/pull/6921)
      - CHANGED: Use std::string_view::starts_with instead of boost::starts_with. [#6918](https://github.com/Project-OSRM/osrm-backend/pull/6918)
      - CHANGED: Get rid of boost::math::constants::* and M_PI in favor of std::numbers. [#6916](https://github.com/Project-OSRM/osrm-backend/pull/6916)
      - CHANGED: Make constants in PackedVector constexpr. [#6917](https://github.com/Project-OSRM/osrm-backend/pull/6917)
      - CHANGED: Use std::variant instead of mapbox::util::variant. [#6903](https://github.com/Project-OSRM/osrm-backend/pull/6903)
      - CHANGED: Bump rapidjson to version f9d53419e912910fd8fa57d5705fa41425428c35 [#6906](https://github.com/Project-OSRM/osrm-backend/pull/6906)
      - CHANGED: Bump mapbox/variant to version 1.2.0 [#6898](https://github.com/Project-OSRM/osrm-backend/pull/6898)
      - CHANGED: Avoid copy of std::function-based callback in path unpacking [#6895](https://github.com/Project-OSRM/osrm-backend/pull/6895)
      - CHANGED: Replace boost::hash by std::hash [#6892](https://github.com/Project-OSRM/osrm-backend/pull/6892)
      - CHANGED: Partial fix migration from boost::optional to std::optional [#6551](https://github.com/Project-OSRM/osrm-backend/issues/6551)
      - CHANGED: Replace boost::filesystem with std::filesystem [#6432](https://github.com/Project-OSRM/osrm-backend/pull/6432)
      - CHANGED: Update Conan Boost version to 1.85.0. [#6868](https://github.com/Project-OSRM/osrm-backend/pull/6868)
      - FIXED: Fix an error in a RouteParameters AnnotationsType operator overload. [#6646](https://github.com/Project-OSRM/osrm-backend/pull/6646)
      - ADDED: Add support for "unlimited" to be passed as a value for the default-radius and max-matching-radius flags. [#6599](https://github.com/Project-OSRM/osrm-backend/pull/6599)
      - CHANGED: Allow -1.0 as unlimited for default_radius value. [#6599](https://github.com/Project-OSRM/osrm-backend/pull/6599)
      - CHANGED: keep libosrm* in the docker image for downstream linking [#6602](https://github.com/Project-OSRM/osrm-backend/pull/6602)
      - CHANGED: Move vector in CSVFilesParser instead copying it. [#6470](https://github.com/Project-OSRM/osrm-backend/pull/6470)
      - REMOVED: Get rid of unused functions in util/json_util.hpp. [#6446](https://github.com/Project-OSRM/osrm-backend/pull/6446)
      - FIXED: Apply workaround for Conan installation issue on CI. [#6442](https://github.com/Project-OSRM/osrm-backend/pull/6442)
      - FIXED: Fix `npm audit` warnings in NPM package. [#6437](https://github.com/Project-OSRM/osrm-backend/pull/6437)
      - FIXED: Handle snapping parameter for all plugins in NodeJs bindings, but not for Route only. [#6417](https://github.com/Project-OSRM/osrm-backend/pull/6417)
      - FIXED: Fix annotations=true handling in NodeJS bindings & libosrm. [#6415](https://github.com/Project-OSRM/osrm-backend/pull/6415/)
      - FIXED: Fix bindings compilation issue on the latest Node. Update NAN to 2.17.0. [#6416](https://github.com/Project-OSRM/osrm-backend/pull/6416)
      - CHANGED: Make edge metrics strongly typed [#6420](https://github.com/Project-OSRM/osrm-backend/pull/6420)
      - FIXED: Typo in file name src/util/timed_historgram.cpp -> src/util/timed_histogram.cpp [#6428](https://github.com/Project-OSRM/osrm-backend/issues/6428)
      - CHANGED: Replace boost::string_ref with std::string_view [#6433](https://github.com/Project-OSRM/osrm-backend/pull/6433)
      - ADDED: Print tracebacks for Lua runtime errors [#6564](https://github.com/Project-OSRM/osrm-backend/pull/6564)
      - FIXED: Added a variable to preprocessor guard in file osrm-backend/include/util/range_table.hpp to solve build error. [#6596](https://github.com/Project-OSRM/osrm-backend/pull/6596)
      - FIXED: Ensure required file check in osrm-routed is correctly enforced. [#6655](https://github.com/Project-OSRM/osrm-backend/pull/6655)
      - FIXED: Correct HTTP docs to reflect summary output dependency on steps parameter. [#6655](https://github.com/Project-OSRM/osrm-backend/pull/6655)
      - ADDED: Extract prerelease/build information from package semver [#6839](https://github.com/Project-OSRM/osrm-backend/pull/6839)
    - Profiles:
      - FIXED: Bicycle and foot profiles now don't route on proposed ways [#6615](https://github.com/Project-OSRM/osrm-backend/pull/6615)
    - Routing:
      - FIXED: Fix adding traffic signal penalties during compression [#6419](https://github.com/Project-OSRM/osrm-backend/pull/6419)
      - FIXED: Correctly handle compressed traffic signals. [#6724](https://github.com/Project-OSRM/osrm-backend/pull/6724)
      - FIXED: Fix bug when searching for maneuver overrides [#6739](https://github.com/Project-OSRM/osrm-backend/pull/6739)
      - FIXED: Remove force-loop checks for routes with u-turns [#6858](https://github.com/Project-OSRM/osrm-backend/pull/6858)
      - FIXED: Correctly check runtime search conditions for forcing routing steps [#6866](https://github.com/Project-OSRM/osrm-backend/pull/6866)
    - Map Matching:
      - CHANGED: Optimise path distance calculation in MLD map matching even more. [#6884](https://github.com/Project-OSRM/osrm-backend/pull/6884)
      - CHANGED: Optimise path distance calculation in MLD map matching. [#6876](https://github.com/Project-OSRM/osrm-backend/pull/6876)
      - CHANGED: Optimise R-tree queries in the case of map matching. [#6881](https://github.com/Project-OSRM/osrm-backend/pull/6876)
    - Debug tiles:
      - FIXED: Ensure speed layer features have unique ids. [#6726](https://github.com/Project-OSRM/osrm-backend/pull/6726)
 # 5.27.1
  - Changes from 5.27.0
    - Misc:
      - FIXED: Revert back to using custom HTTP parser instead of Boost.Beast. [#6407](https://github.com/Project-OSRM/osrm-backend/pull/6407)
@@ -1,8 +1,8 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.18)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR AND NOT MSVC_IDE)
  message(FATAL_ERROR "In-source builds are not allowed.
@@ -33,7 +33,6 @@ option(ENABLE_COVERAGE "Build with coverage instrumentalisation" OFF)
 option(ENABLE_SANITIZER "Use memory sanitizer for Debug build" OFF)
 option(ENABLE_LTO "Use LTO if available" OFF)
 option(ENABLE_FUZZING "Fuzz testing using LLVM's libFuzzer" OFF)
 option(ENABLE_GOLD_LINKER "Use GNU gold linker if available" ON)
 option(ENABLE_NODE_BINDINGS "Build NodeJs bindings" OFF)
 option(ENABLE_CLANG_TIDY "Enables clang-tidy checks" OFF)
@@ -43,16 +42,13 @@ if (ENABLE_CLANG_TIDY)
    message(FATAL_ERROR "ENABLE_CLANG_TIDY is ON but clang-tidy is not found!")
  else()
    message(STATUS "Found clang-tidy at ${CLANG_TIDY_COMMAND}")
-    set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_COMMAND};--warnings-as-errors=*")
+    set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_COMMAND};--warnings-as-errors=*;--header-filter=.*")
  endif()
 endif()
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 # be compatible with version handling before cmake 3.x
 if (POLICY CMP0048)
  cmake_policy(SET CMP0048 OLD)
 endif()
 if (POLICY CMP0057)
  cmake_policy(SET CMP0057 NEW)
 endif()
@@ -74,14 +70,17 @@ include(JSONParser)
 file(READ "package.json" packagejsonraw)
 sbeParseJson(packagejson packagejsonraw)
-if (packagejson.version MATCHES "^([0-9]+)\.([0-9]+)\.([0-9]+)")
+# This regex is not strict enough, but the correct one is too complicated for cmake matching.
-    set(OSRM_VERSION_MAJOR ${CMAKE_MATCH_1})
+# https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
-    set(OSRM_VERSION_MINOR ${CMAKE_MATCH_2})
+if (packagejson.version MATCHES "^([0-9]+)\.([0-9]+)\.([0-9]+)([-+][0-9a-zA-Z.-]+)?$")
-    set(OSRM_VERSION_PATCH ${CMAKE_MATCH_3})
+    set(OSRM_VERSION_MAJOR            ${CMAKE_MATCH_1})
    set(OSRM_VERSION_MINOR            ${CMAKE_MATCH_2})
    set(OSRM_VERSION_PATCH            ${CMAKE_MATCH_3})
    set(OSRM_VERSION_PRERELEASE_BUILD ${CMAKE_MATCH_4})
-    set(OSRM_VERSION "${OSRM_VERSION_MAJOR}.${OSRM_VERSION_MINOR}.${OSRM_VERSION_PATCH}")
+    set(OSRM_VERSION packagejson.version)
 else()
-    message(FATAL_ERROR "Version from package.json cannot be parsed, expected semver compatible X.Y.Z, but found ${packagejson.version}")
+    message(FATAL_ERROR "Version from package.json cannot be parsed, expected semver compatible label, but found ${packagejson.version}")
 endif()
 if (MSVC)
@@ -113,35 +112,17 @@ include(CheckCXXCompilerFlag)
 include(FindPackageHandleStandardArgs)
 include(GNUInstallDirs)
 set(bitness 32)
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
  set(bitness 64)
  message(STATUS "Building on a 64 bit system")
 else()
-  message(STATUS "Building on a 32 bit system")
+  message(FATAL_ERROR "Building on a 32 bit system is not supported")
 endif()
 if(WIN32 AND MSVC_VERSION LESS 1900)
  message(FATAL_ERROR "Building with Microsoft compiler needs Latest Visual Studio 2015 (Community or better)")
 endif()
 # Strictly require GCC>=5.0 and Clang>=3.4 - GCC 4.8 is already too old for C++14.
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
    message(FATAL_ERROR "GCC>=5.0 required. In case you are on Ubuntu upgrade via ppa:ubuntu-toolchain-r/test")
  endif()
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
    message(FATAL_ERROR "Clang>=3.4 required. In case you are on Ubuntu upgrade via http://apt.llvm.org")
  endif()
 endif()
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/include/)
 include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include/)
-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/sol2-3.3.0/include)
+include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/sol2/include)
 include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/variant/include)
-set(BOOST_COMPONENTS date_time chrono filesystem iostreams program_options regex system thread unit_test_framework)
+set(BOOST_COMPONENTS date_time iostreams program_options thread unit_test_framework)
 configure_file(
  ${CMAKE_CURRENT_SOURCE_DIR}/include/util/version.hpp.in
@@ -190,26 +171,6 @@ add_library(osrm_customize src/osrm/customizer.cpp $<TARGET_OBJECTS:CUSTOMIZER>
 add_library(osrm_update $<TARGET_OBJECTS:UPDATER> $<TARGET_OBJECTS:MICROTAR> $<TARGET_OBJECTS:UTIL>)
 add_library(osrm_store $<TARGET_OBJECTS:STORAGE> $<TARGET_OBJECTS:MICROTAR> $<TARGET_OBJECTS:UTIL>)
 if(ENABLE_GOLD_LINKER)
    execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
    if("${LD_VERSION}" MATCHES "GNU gold")
        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold -Wl,--disable-new-dtags")
        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=gold -Wl,--disable-new-dtags")
        set(OSRM_LDFLAGS "${OSRM_LDFLAGS} -fuse-ld=gold -Wl,--disable-new-dtags")
        message(STATUS "Using GNU gold as linker.")
        # Issue 2785: check gold binutils version and don't use gc-sections for versions prior 2.25
        string(REGEX REPLACE ".*\\(GNU Binutils[^\\)0-9]+([0-9]+\\.[0-9]+)[^\\)]*\\).*" "\\1" GOLD_BINUTILS_VERSION "${LD_VERSION}")
        if ("${GOLD_BINUTILS_VERSION}" VERSION_LESS "2.26")
          message(STATUS "Disabling gc-sections on gold binutils < 2.26, see: https://sourceware.org/bugzilla/show_bug.cgi?id=17639")
          set(LD_AVOID_GC_SECTIONS TRUE)
        endif()
    else()
        message(WARNING "GNU gold linker isn't available.")
        set(ENABLE_GOLD_LINKER OFF)
    endif()
 endif()
 # Explicitly set the build type to Release if no other type is specified
 # on the command line.  Without this, cmake defaults to an unoptimized,
 # non-debug build, which almost nobody wants.
@@ -247,78 +208,21 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Og -ggdb")
 endif()
-
+if(ENABLE_LTO AND (CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES MinRelSize OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo))
-if(CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES MinRelSize OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
+  include(CheckIPOSupported)
-  message(STATUS "Configuring release mode optimizations")
+  check_ipo_supported(RESULT LTO_SUPPORTED OUTPUT error)
-  # Check if LTO is available
+  if(LTO_SUPPORTED)
-  check_cxx_compiler_flag("-Wl,-flto" LTO_AVAILABLE)
+      message(STATUS "IPO / LTO enabled")
-
+      set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
-  if(ENABLE_LTO AND LTO_AVAILABLE)
+  else()
-    set(OLD_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+      message(WARNING "IPO / LTO not supported: <${error}>")
    # GCC in addition allows parallelizing LTO
    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
      include(ProcessorCount)
      ProcessorCount(NPROC)
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto=${NPROC}")
    else()
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
    endif()
    set(CHECK_LTO_SRC "int main(){return 0;}")
    check_cxx_source_compiles("${CHECK_LTO_SRC}" LTO_WORKS)
    if(LTO_WORKS)
      message(STATUS "LTO working")
      set(OSRM_CXXFLAGS "${OSRM_CXXFLAGS} -flto")
      set(OSRM_LDFLAGS "${OSRM_LDFLAGS} -flto")
      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto")
      set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -flto")
    else()
      message(STATUS "LTO broken")
      set(CMAKE_CXX_FLAGS "${OLD_CXX_FLAGS}")
      set(ENABLE_LTO Off)
    endif()
    # Since gcc 4.9 the LTO format is non-standart ('slim'), so we need to use the build-in tools
    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND NOT MINGW)
      find_program(GCC_AR gcc-ar)
      find_program(GCC_RANLIB gcc-ranlib)
      if ("${GCC_AR}" STREQUAL "GCC_AR-NOTFOUND" OR "${GCC_RANLIB}" STREQUAL "GCC_RANLIB-NOTFOUND")
        message(WARNING "GCC specific binutils not found. In case of linker issues export env vars: AR=gcc-ar, NM=gcc-nm, RANLIB=gcc-ranlib")
      else()
        message(STATUS "Using GCC specific binutils for LTO:")
        message(STATUS " ${GCC_AR}")
        message(STATUS " ${GCC_RANLIB}")
        set(CMAKE_AR ${GCC_AR})
        set(CMAKE_RANLIB ${GCC_RANLIB})
      endif()
    endif()
    # Same for clang LTO requires their own toolchain
    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
      find_program(LLVM_AR llvm-ar)
      find_program(LLVM_RANLIB llvm-ranlib)
      if ("${LLVM_AR}" STREQUAL "LLVM_AR-NOTFOUND" OR "${LLVM_RANLIB}" STREQUAL "LLVM_RANLIB-NOTFOUND")
        message(WARNING "LLVM specific binutils not found.")
      else()
        message(STATUS "Using LLVM specific binutils for LTO:")
        message(STATUS " ${LLVM_AR}")
        message(STATUS " ${LLVM_RANLIB}")
        set(CMAKE_AR ${LLVM_AR})
        set(CMAKE_RANLIB ${LLVM_RANLIB})
      endif()
    endif()
  endif()
 endif()
 # TODO: this was added for Mason, we are not sure if it is true after migration to Conan
 if(UNIX AND NOT APPLE AND ENABLE_CONAN AND (LTO_WORKS OR ENABLE_GOLD_LINKER))
  message(WARNING "ENABLE_CONAN and ENABLE_LTO/ENABLE_GOLD_LINKER may not work on all linux systems currently")
 endif()
 set(MAYBE_COVERAGE_LIBRARIES "")
 if (ENABLE_COVERAGE)
  if (NOT CMAKE_BUILD_TYPE MATCHES "Debug")
-    message(ERROR "ENABLE_COVERAGE=ON only make sense with a Debug build")
+    message(ERROR "ENABLE_COVERAGE=ON only makes sense with a Debug build")
  endif()
  message(STATUS "Enabling coverage")
  set(MAYBE_COVERAGE_LIBRARIES "-lgcov")
@@ -352,14 +256,6 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
    add_dependency_defines(-DWIN32)
    set(OPTIONAL_SOCKET_LIBS ws2_32 wsock32)
  endif()
  # -fpermissive is required for parallel_do Intel TBB internal issue with GCC < 5
  # https://github.com/Project-OSRM/osrm-backend/pull/3603#issuecomment-277688589
  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
    message(STATUS "Adding -fpermissive for GCC version < 5 bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=51048). See #3603.")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
  endif()
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
  # using Intel C++
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-intel -wd10237 -Wall -ipo -fPIC")
@@ -370,57 +266,17 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
  add_dependency_defines(-DBOOST_LIB_DIAGNOSTIC)
  add_dependency_defines(-D_CRT_SECURE_NO_WARNINGS)
  add_dependency_defines(-DNOMINMAX) # avoid min and max macros that can break compilation
  add_dependency_defines(-D_USE_MATH_DEFINES) #needed for M_PI with cmath.h
  add_dependency_defines(-D_WIN32_WINNT=0x0501)
  add_dependency_defines(-DXML_STATIC)
  find_library(ws2_32_LIBRARY_PATH ws2_32)
  target_link_libraries(osrm-extract wsock32 ws2_32)
 endif()
 # Configuring linker
 execute_process(COMMAND ${CMAKE_CXX_COMPILER} "-Wl,--version" ERROR_QUIET OUTPUT_VARIABLE LINKER_VERSION)
 # For ld.gold and ld.bfs (the GNU linkers) we optimize hard
 if("${LINKER_VERSION}" MATCHES "GNU gold" OR "${LINKER_VERSION}" MATCHES "GNU ld")
  message(STATUS "Setting linker optimizations")
  if(NOT (CMAKE_CXX_COMPILER_ID MATCHES "MSVC" OR "${LD_AVOID_GC_SECTIONS}"))
    # Tell compiler to put every function in separate section, linker can then match sections and functions
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections")
    # Tell linker to do dead code and data eminination during link time discarding sections
    set(LINKER_FLAGS "${LINKER_FLAGS} -Wl,--gc-sections")
  endif()
  # Default linker optimization flags
  set(LINKER_FLAGS "${LINKER_FLAGS} -Wl,-O1 -Wl,--hash-style=gnu -Wl,--sort-common")
 else()
  message(STATUS "Using unknown linker, not setting linker optimizations")
 endif ()
 set(OSRM_LDFLAGS "${OSRM_LDFLAGS} ${LINKER_FLAGS}")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LINKER_FLAGS}")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINKER_FLAGS}")
 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}")
 # Activate C++1y
 if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
  set(OSRM_CXXFLAGS "${OSRM_CXXFLAGS} -std=c++17")
 endif()
 # Configuring other platform dependencies
 if(APPLE)
  execute_process(COMMAND xcrun --sdk macosx --show-sdk-path OUTPUT_VARIABLE CMAKE_OSX_SYSROOT OUTPUT_STRIP_TRAILING_WHITESPACE)
  exec_program(uname ARGS -v  OUTPUT_VARIABLE DARWIN_VERSION)
  string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
  if(OSXLIBSTD)
    message(STATUS "linking against ${OSXLIBSTD}")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=${OSXLIBSTD}")
  elseif(DARWIN_VERSION GREATER 12)
    message(STATUS "linking against libc++")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
  endif()
 endif()
 if(UNIX AND NOT APPLE)
-  set(MAYBE_RT_LIBRARY -lrt)
+  find_library(RT_LIB rt)
  if (RT_LIB)
    set(MAYBE_RT_LIBRARY -lrt)
  endif()
 endif()
 find_package(Threads REQUIRED)
@@ -432,11 +288,6 @@ include_directories(SYSTEM ${RAPIDJSON_INCLUDE_DIR})
 set(MICROTAR_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/microtar/src")
 include_directories(SYSTEM ${MICROTAR_INCLUDE_DIR})
 set(MBXGEOM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/geometry.hpp-0.9.2/include")
 include_directories(SYSTEM ${MBXGEOM_INCLUDE_DIR})
 set(CHEAPRULER_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/cheap-ruler-cpp-2778eb8/include")
 include_directories(SYSTEM ${CHEAPRULER_INCLUDE_DIR})
 add_library(MICROTAR OBJECT "${CMAKE_CURRENT_SOURCE_DIR}/third_party/microtar/src/microtar.c")
 set_property(TARGET MICROTAR PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_no_warning(MICROTAR unused-variable)
@@ -456,7 +307,7 @@ add_subdirectory(${FLATBUFFERS_SRC_DIR}
        ${CMAKE_CURRENT_BINARY_DIR}/flatbuffers-build
        EXCLUDE_FROM_ALL)
-set(FMT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/fmt-9.1.0/include")
+set(FMT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/fmt/include")
 add_compile_definitions(FMT_HEADER_ONLY)
 include_directories(SYSTEM ${FMT_INCLUDE_DIR})
@@ -475,22 +326,16 @@ if(ENABLE_CONAN)
  include(${CMAKE_CURRENT_LIST_DIR}/cmake/conan.cmake)
-  set(CONAN_BOOST_VERSION "1.79.0#96e4902111a2e343a8ba0aa95391bb58")
+  conan_check(REQUIRED)
-  set(CONAN_BZIP2_VERSION "1.0.8#d1b2d5816f25865acf978501dff1f897")
+
-  set(CONAN_EXPAT_VERSION "2.2.10#916908d4a570ad839edd25322c3268cd")
+  set(CONAN_BOOST_VERSION "1.85.0@#14265ec82b25d91305bbb3b30d3357f8")
-  set(CONAN_LUA_VERSION "5.4.4#3ec62efc37cd0a5d80b9e5cb35277360")
+  set(CONAN_BZIP2_VERSION "1.0.8@#d1b2d5816f25865acf978501dff1f897")
-  set(CONAN_TBB_VERSION "2021.3.0#507ec17cbd51a84167e143b20d170eea")
+  set(CONAN_EXPAT_VERSION "2.6.2@#2d385d0d50eb5561006a7ff9e356656b")
  set(CONAN_LUA_VERSION "5.4.6@#658d6089093cf01992c2737ab2e96763")
  set(CONAN_TBB_VERSION "2021.12.0@#e56e5b44be8d690530585dd3634c0106")
  set(CONAN_SYSTEM_INCLUDES ON)
  # TODO: 
  # if we link TBB dynamically osrm-extract.exe finishes on the first access to any TBB symbol 
  # with exit code = -1073741515, which means that program cannot load required DLL.
  if (MSVC)
    set(TBB_SHARED False)
  else()
    set(TBB_SHARED True)
  endif()
  set(CONAN_ARGS
    REQUIRES
@@ -503,11 +348,16 @@ if(ENABLE_CONAN)
    GENERATORS cmake_find_package json  # json generator generates a conanbuildinfo.json in the build folder so (non-CMake) projects can easily parse OSRM's dependencies
    KEEP_RPATHS
    NO_OUTPUT_DIRS
-    OPTIONS boost:filesystem_version=3 # https://stackoverflow.com/questions/73392648/error-with-boost-filesystem-version-in-cmake
+    OPTIONS boost:without_stacktrace=True # Apple Silicon cross-compilation fails without it
            onetbb:shared=${TBB_SHARED}
            boost:without_stacktrace=True # Apple Silicon cross-compilation fails without it
    BUILD missing
  )
  # Enable revisions in the conan config
  execute_process(COMMAND ${CONAN_CMD} config set general.revisions_enabled=1 RESULT_VARIABLE RET_CODE)
  if(NOT "${RET_CODE}" STREQUAL "0")
    message(FATAL_ERROR "Error setting revisions for Conan: '${RET_CODE}'")
  endif()
  # explicitly say Conan to use x86 dependencies if build for x86 platforms (https://github.com/conan-io/cmake-conan/issues/141)
  if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
    conan_cmake_run("${CONAN_ARGS};ARCH;x86")
@@ -527,14 +377,10 @@ if(ENABLE_CONAN)
  set(Boost_USE_STATIC_LIBS ON)
  find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
  set(Boost_DATE_TIME_LIBRARY "${Boost_date_time_LIB_TARGETS}")
  set(Boost_CHRONO_LIBRARY "${Boost_chrono_LIB_TARGETS}")
  set(Boost_PROGRAM_OPTIONS_LIBRARY "${Boost_program_options_LIB_TARGETS}")
  set(Boost_FILESYSTEM_LIBRARY "${Boost_filesystem_LIB_TARGETS}")
  set(Boost_IOSTREAMS_LIBRARY "${Boost_iostreams_LIB_TARGETS}")
  set(Boost_THREAD_LIBRARY "${Boost_thread_LIB_TARGETS}")
  set(Boost_SYSTEM_LIBRARY "${Boost_system_LIB_TARGETS}")
  set(Boost_ZLIB_LIBRARY "${Boost_zlib_LIB_TARGETS}")
  set(Boost_REGEX_LIBRARY "${Boost_regex_LIB_TARGETS}")
  set(Boost_UNIT_TEST_FRAMEWORK_LIBRARY "${Boost_unit_test_framework_LIB_TARGETS}")
@@ -550,12 +396,7 @@ if(ENABLE_CONAN)
  # expat and bzip2 are used from conan rather than the system
  include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include)
 else()
-  if (BUILD_ROUTED)
+  find_package(Boost 1.70 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
    # osrm-routed requires newer boost:asio 
    find_package(Boost 1.70 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
  else()
    find_package(Boost 1.60 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
  endif()
  add_dependency_includes(${Boost_INCLUDE_DIRS})
  find_package(TBB REQUIRED)
@@ -602,7 +443,6 @@ if(ENABLE_CCACHE AND (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILE
    message(STATUS "Using ccache to speed up incremental builds")
    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
    set(ENV{CCACHE_CPP2} "true")
  endif()
 endif()
@@ -613,18 +453,17 @@ add_dependency_includes(${ZLIB_INCLUDE_DIRS})
 add_dependency_defines(-DBOOST_SPIRIT_USE_PHOENIX_V3)
 add_dependency_defines(-DBOOST_RESULT_OF_USE_DECLTYPE)
-add_dependency_defines(-DBOOST_FILESYSTEM_NO_DEPRECATED)
+
 # Workaround for https://github.com/boostorg/phoenix/issues/111
 add_dependency_defines(-DBOOST_PHOENIX_STL_TUPLE_H_)
 add_definitions(${OSRM_DEFINES})
 include_directories(SYSTEM ${DEPENDENCIES_INCLUDE_DIRS})
 set(BOOST_BASE_LIBRARIES
   ${Boost_DATE_TIME_LIBRARY}
   ${Boost_CHRONO_LIBRARY}
   ${Boost_FILESYSTEM_LIBRARY}
   ${Boost_IOSTREAMS_LIBRARY}
-   ${Boost_THREAD_LIBRARY}
+   ${Boost_THREAD_LIBRARY})
   ${Boost_SYSTEM_LIBRARY})
 set(BOOST_ENGINE_LIBRARIES
  ${Boost_ZLIB_LIBRARY}
@@ -643,7 +482,6 @@ endif()
 set(EXTRACTOR_LIBRARIES
    ${BZIP2_LIBRARIES}
    ${Boost_REGEX_LIBRARY}
    ${BOOST_BASE_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT}
    ${EXPAT_LIBRARIES}
@@ -748,7 +586,6 @@ if (BUILD_ROUTED)
  set_property(TARGET osrm-routed PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
 endif()
 file(GLOB VariantGlob third_party/variant/include/mapbox/*.hpp)
 file(GLOB FlatbuffersGlob third_party/flatbuffers/include/flatbuffers/*.h)
 file(GLOB LibraryGlob include/osrm/*.hpp)
 file(GLOB ParametersGlob include/engine/api/*_parameters.hpp)
@@ -768,7 +605,6 @@ install(FILES ${ContractorHeader} DESTINATION include/osrm/contractor)
 install(FILES ${LibraryGlob} DESTINATION include/osrm)
 install(FILES ${ParametersGlob} DESTINATION include/osrm/engine/api)
 install(FILES ${ApiHeader} DESTINATION include/osrm/engine/api)
 install(FILES ${VariantGlob} DESTINATION include/mapbox)
 install(FILES ${FlatbuffersGlob} DESTINATION include/flatbuffers)
 install(TARGETS osrm-extract DESTINATION bin)
 install(TARGETS osrm-partition DESTINATION bin)
@@ -792,6 +628,10 @@ install(TARGETS osrm_guidance DESTINATION lib)
 set(DefaultProfilesDir profiles)
 install(DIRECTORY ${DefaultProfilesDir} DESTINATION share/osrm)
 # Install data geojson files to /usr/local/share/osrm/data by default
 set(DefaultProfilesDir data)
 install(DIRECTORY ${DefaultProfilesDir} DESTINATION share/osrm)
 # Setup exporting variables for pkgconfig and subproject
 #
@@ -10,7 +10,7 @@ You can add a :+1: emoji reaction to the issue if you want to express interest i
 # Developer
-We use `clang-format` version `3.8` to consistently format the code base. There is a helper script under `scripts/format.sh`.
+We use `clang-format` version `15` to consistently format the code base. There is a helper script under `scripts/format.sh`.
 The format is automatically checked by the `mason-linux-release` job of a Travis CI build.
 To save development time a local hook `.git/hooks/pre-push`
 ```
@@ -1,10 +1,9 @@
 ## Open Source Routing Machine
 | Linux / macOS / Windows | Code Coverage |
 | ----------------------- | ------------- |
 | [![osrm-backend CI](https://github.com/Project-OSRM/osrm-backend/actions/workflows/osrm-backend.yml/badge.svg)](https://github.com/Project-OSRM/osrm-backend/actions/workflows/osrm-backend.yml) | [![Codecov](https://codecov.io/gh/Project-OSRM/osrm-backend/branch/master/graph/badge.svg)](https://codecov.io/gh/Project-OSRM/osrm-backend) |
-High performance routing engine written in C++14 designed to run on OpenStreetMap data.
+[![osrm-backend CI](https://github.com/Project-OSRM/osrm-backend/actions/workflows/osrm-backend.yml/badge.svg)](https://github.com/Project-OSRM/osrm-backend/actions/workflows/osrm-backend.yml) [![Codecov](https://codecov.io/gh/Project-OSRM/osrm-backend/branch/master/graph/badge.svg)](https://codecov.io/gh/Project-OSRM/osrm-backend) [![Discord](https://img.shields.io/discord/1034487840219860992)](https://discord.gg/es9CdcCXcb)
 High performance routing engine written in C++ designed to run on OpenStreetMap data.
 The following services are available via HTTP API, C++ library interface and NodeJs wrapper:
 - Nearest - Snaps coordinates to the street network and returns the nearest matches
@@ -16,12 +15,12 @@ The following services are available via HTTP API, C++ library interface and Nod
 To quickly try OSRM use our [demo server](http://map.project-osrm.org) which comes with both the backend and a frontend on top.
-For a quick introduction about how the road network is represented in OpenStreetMap and how to map specific road network features have a look at [this guide about mapping for navigation](https://www.mapbox.com/mapping/mapping-for-navigation/).
+For a quick introduction about how the road network is represented in OpenStreetMap and how to map specific road network features have a look at [the OSM wiki on routing](https://wiki.openstreetmap.org/wiki/Routing) or [this guide about mapping for navigation](https://web.archive.org/web/20221206013651/https://labs.mapbox.com/mapping/mapping-for-navigation/).
 Related [Project-OSRM](https://github.com/Project-OSRM) repositories:
 - [osrm-frontend](https://github.com/Project-OSRM/osrm-frontend) - User-facing frontend with map. The demo server runs this on top of the backend
 - [osrm-text-instructions](https://github.com/Project-OSRM/osrm-text-instructions) - Text instructions from OSRM route response
- [osrm-backend-docker](https://hub.docker.com/r/osrm/osrm-backend/) - Ready to use Docker images
+- [osrm-backend-docker](https://github.com/project-osrm/osrm-backend/pkgs/container/osrm-backend) - Ready to use Docker images
 ## Documentation
@@ -33,6 +32,7 @@ Related [Project-OSRM](https://github.com/Project-OSRM) repositories:
 ## Contact
 - Discord: [join](https://discord.gg/es9CdcCXcb)
 - IRC: `irc.oftc.net`, channel: `#osrm` ([Webchat](https://webchat.oftc.net))
 - Mailinglist: `https://lists.openstreetmap.org/listinfo/osrm-talk`
@@ -58,12 +58,12 @@ Download OpenStreetMap extracts for example from [Geofabrik](http://download.geo
 Pre-process the extract with the car profile and start a routing engine HTTP server on port 5000
-    docker run -t -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-extract -p /opt/car.lua /data/berlin-latest.osm.pbf
+    docker run -t -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-extract -p /opt/car.lua /data/berlin-latest.osm.pbf || echo "osrm-extract failed"
 The flag `-v "${PWD}:/data"` creates the directory `/data` inside the docker container and makes the current working directory `"${PWD}"` available there. The file `/data/berlin-latest.osm.pbf` inside the container is referring to `"${PWD}/berlin-latest.osm.pbf"` on the host.
-    docker run -t -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-partition /data/berlin-latest.osrm
+    docker run -t -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-partition /data/berlin-latest.osrm || echo "osrm-partition failed"
-    docker run -t -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-customize /data/berlin-latest.osrm
+    docker run -t -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-customize /data/berlin-latest.osrm || echo "osrm-customize failed"
 Note there is no `berlin-latest.osrm` file, but multiple `berlin-latest.osrm.*` files, i.e. `berlin-latest.osrm` is not file path, but "base" path referring to set of files and there is an option to omit this `.osrm` suffix completely(e.g. `osrm-partition /data/berlin-latest`).
@@ -1,15 +0,0 @@
 os: Visual Studio 2019
 # clone directory
 clone_folder: c:\projects\osrm
 platform: x64
 # no-op for the time being until someone with access to GitHub checks settings will remove integration with AppVeyor
 # https://github.com/Project-OSRM/osrm-backend/pull/6312#issuecomment-1217237055 
 build_script:
  - EXIT 0
 branches:
  only:
    - master
@@ -1,32 +0,0 @@
@ECHO OFF
 SETLOCAL
 SET EL=0
 ECHO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 SET PLATFORM=x64
 SET CONFIGURATION=Release
 ::SET LOCAL_DEV=1
 FOR /F "tokens=*" %%i in ('git rev-parse --abbrev-ref HEAD') do SET APPVEYOR_REPO_BRANCH=%%i
 ECHO APPVEYOR_REPO_BRANCH^: %APPVEYOR_REPO_BRANCH%
 SET PATH=C:\Program Files\7-Zip;%PATH%
 powershell Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 CALL appveyor-build.bat
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 GOTO DONE
 :ERROR
 ECHO ~~~~~~~~~~~~~~~~~~~~~~ ERROR %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ECHO ERRORLEVEL^: %ERRORLEVEL%
 SET EL=%ERRORLEVEL%
 :DONE
 ECHO ~~~~~~~~~~~~~~~~~~~~~~ DONE %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 EXIT /b %EL%
@@ -1,75 +0,0 @@
 {
    "AWSTemplateFormatVersion": "2010-09-09",
    "Description": "user for publishing to s3://mapbox-node-binary/osrm",
    "Resources": {
        "User": {
            "Type": "AWS::IAM::User",
            "Properties": {
                "Policies": [
                    {
                        "PolicyName": "list",
                        "PolicyDocument": {
                            "Statement": [
                                {
                                    "Action": [
                                        "s3:ListBucket"
                                    ],
                                    "Effect": "Allow",
                                    "Resource": "arn:aws:s3:::mapbox-node-binary",
                                    "Condition": {
                                        "StringLike": {
                                            "s3:prefix": [
                                                "osrm/*"
                                            ]
                                        }
                                    }
                                }
                            ]
                        }
                    },
                    {
                        "PolicyName": "publish",
                        "PolicyDocument": {
                            "Statement": [
                                {
                                    "Action": [
                                        "s3:DeleteObject",
                                        "s3:GetObject",
                                        "s3:GetObjectAcl",
                                        "s3:PutObject",
                                        "s3:PutObjectAcl"
                                    ],
                                    "Effect": "Allow",
                                    "Resource": "arn:aws:s3:::mapbox-node-binary/osrm/*"
                                }
                            ]
                        }
                    }
                ]
            }
        },
        "AccessKey": {
            "Type": "AWS::IAM::AccessKey",
            "Properties": {
                "UserName": {
                    "Ref": "User"
                }
            }
        }
    },
    "Outputs": {
        "AccessKeyId": {
            "Value": {
                "Ref": "AccessKey"
            }
        },
        "SecretAccessKey": {
            "Value": {
                "Fn::GetAtt": [
                    "AccessKey",
                    "SecretAccessKey"
                ]
            }
        }
    }
 }
@@ -1,59 +0,0 @@
 var cf = require('@mapbox/cloudfriend');
 var package_json = require('../package.json')
 module.exports = {
  AWSTemplateFormatVersion: '2010-09-09',
  Description: 'user for publishing to s3://mapbox-node-binary/' + package_json.name,
  Resources: {
    User: {
      Type: 'AWS::IAM::User',
      Properties: {
        Policies: [
          {
            PolicyName: 'list',
            PolicyDocument: {
              Statement: [
                {
                  Action: ['s3:ListBucket'],
                  Effect: 'Allow',
                  Resource: 'arn:aws:s3:::mapbox-node-binary',
                  Condition : {
                    StringLike : {
                      "s3:prefix": [ package_json.name + "/*"]
                    }
                  }
                }
              ]
            }
          },
          {
            PolicyName: 'publish',
            PolicyDocument: {
              Statement: [
                {
                  Action: ['s3:DeleteObject', 's3:GetObject', 's3:GetObjectAcl', 's3:PutObject', 's3:PutObjectAcl'],
                  Effect: 'Allow',
                  Resource: 'arn:aws:s3:::mapbox-node-binary/' + package_json.name + '/*'
                }
              ]
            }
          }
        ]
      }
    },
    AccessKey: {
      Type: 'AWS::IAM::AccessKey',
      Properties: {
        UserName: cf.ref('User')
      }
    }
  },
  Outputs: {
    AccessKeyId: {
      Value: cf.ref('AccessKey')
    },
    SecretAccessKey: {
      Value: cf.getAtt('AccessKey', 'SecretAccessKey')
    }
  }
 };
@@ -1,29 +0,0 @@
 # - Check whether the CXX compiler supports a given flag.
 # CHECK_CXX_COMPILER_FLAG(<flag> <var>)
 #  <flag> - the compiler flag
 #  <var>  - variable to store the result
 # This internally calls the check_cxx_source_compiles macro.  See help
 # for CheckCXXSourceCompiles for a listing of variables that can
 # modify the build.
 # Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 INCLUDE(CheckCXXSourceCompiles)
 MACRO (CHECK_CXX_COMPILER_FLAG _FLAG _RESULT)
   SET(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
   SET(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
   CHECK_CXX_SOURCE_COMPILES("int main() { return 0;}" ${_RESULT}
     # Some compilers do not fail with a bad flag
     FAIL_REGEX "unrecognized .*option"                     # GNU
     FAIL_REGEX "ignoring unknown option"                   # MSVC
     FAIL_REGEX "[Uu]nknown option"                         # HP
     FAIL_REGEX "[Ww]arning: [Oo]ption"                     # SunPro
     FAIL_REGEX "command option .* is not recognized"       # XL
     )
   SET (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
 ENDMACRO (CHECK_CXX_COMPILER_FLAG)
@@ -36,7 +36,10 @@
 # This is because, the lua location is not standardized and may exist in
 # locations other than lua/
-include(FindPkgConfig)
+if(NOT PKG_CONFIG_FOUND)
  include(CMakeFindDependencyMacro)
  find_dependency(PkgConfig)
 endif()
 unset(_lua_include_subdirs)
 unset(_lua_library_names)
@@ -1,7 +1,7 @@
 # https://github.com/sbellus/json-cmake/blob/9913da8800b95322d393894d3525d634568f305e/JSONParser.cmake
 # MIT Licensed - https://github.com/sbellus/json-cmake/blob/master/LICENSE
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.18)
 if (DEFINED JSonParserGuard)
    return()
@@ -55,7 +55,7 @@ function(_get_msvc_ide_version result)
        set(${result} 15 PARENT_SCOPE)
    elseif(NOT MSVC_VERSION VERSION_LESS 1920 AND MSVC_VERSION VERSION_LESS 1930)
        set(${result} 16 PARENT_SCOPE)
-    elseif(NOT MSVC_VERSION VERSION_LESS 1930 AND MSVC_VERSION VERSION_LESS 1940)
+    elseif(NOT MSVC_VERSION VERSION_LESS 1930 AND MSVC_VERSION VERSION_LESS 1950)
        set(${result} 17 PARENT_SCOPE)
    else()
        message(FATAL_ERROR "Conan: Unknown MSVC compiler version [${MSVC_VERSION}]")
@@ -50,9 +50,7 @@ add_warning(all)
 add_warning(extra)
 add_warning(pedantic)
 add_warning(error) # treat all warnings as errors
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
    add_warning(strict-overflow=2)
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
    add_warning(strict-overflow=1)
 endif()
 add_warning(suggest-override)
@@ -79,15 +77,10 @@ add_warning(sizeof-array-argument)
 add_warning(switch-bool)
 add_warning(tautological-compare)
 add_warning(trampolines)
-no_warning(c++17-extensions)
+# these warnings are not enabled by default
-# TODO: these warnings are not enabled by default, but we consider them as useful and good to enable in the future
+# no_warning(name-of-warning)
-no_warning(implicit-int-conversion)
+no_warning(deprecated-comma-subscript)
-no_warning(implicit-float-conversion)
+no_warning(comma-subscript)
-no_warning(unused-member-function)
+no_warning(ambiguous-reversed-operator)
-no_warning(old-style-cast)
+no_warning(restrict)
-no_warning(non-virtual-dtor)
+no_warning(free-nonheap-object)
 no_warning(float-conversion)
 no_warning(sign-conversion)
 no_warning(shorten-64-to-32)
 no_warning(padded)
 no_warning(missing-noreturn)
@@ -1,6 +1,6 @@
 module.exports = {
-    default: '--strict --tags ~@stress --tags ~@todo --tags ~@mld-only --require features/support --require features/step_definitions',
+    default: '--strict --tags ~@stress --tags ~@todo --tags ~@mld --require features/support --require features/step_definitions',
-    verify: '--strict --tags ~@stress --tags ~@todo --tags ~@mld-only -f progress --require features/support --require features/step_definitions',
+    ch: '--strict --tags ~@stress --tags ~@todo --tags ~@mld -f progress --require features/support --require features/step_definitions',
    todo: '--strict --tags @todo --require features/support --require features/step_definitions',
    all: '--strict --require features/support --require features/step_definitions',
    mld: '--strict --tags ~@stress --tags ~@todo --tags ~@ch --require features/support --require features/step_definitions -f progress'
@@ -1,67 +0,0 @@
 FROM debian:bullseye-slim as builder
 ARG DOCKER_TAG
 ARG BUILD_CONCURRENCY
 RUN mkdir -p /src  && mkdir -p /opt
 RUN apt-get update && \
    apt-get -y --no-install-recommends install ca-certificates cmake make git gcc g++ libbz2-dev libxml2-dev wget \
    libzip-dev libboost1.74-all-dev lua5.4 liblua5.4-dev -o APT::Install-Suggests=0 -o APT::Install-Recommends=0
 RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
    ldconfig /usr/local/lib && \
    git clone --branch v2021.3.0 --single-branch https://github.com/oneapi-src/oneTBB.git && \
    cd oneTBB && \
    mkdir build && \
    cd build && \
    cmake -DTBB_TEST=OFF -DCMAKE_BUILD_TYPE=Release ..  && \
    cmake --build . && \
    cmake --install .
 COPY . /src
 WORKDIR /src
 RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
    echo "Building OSRM ${DOCKER_TAG}" && \
    git show --format="%H" | head -n1 > /opt/OSRM_GITSHA && \
    echo "Building OSRM gitsha $(cat /opt/OSRM_GITSHA)" && \
    mkdir -p build && \
    cd build && \
    BUILD_TYPE="Release" && \
    ENABLE_ASSERTIONS="Off" && \
    BUILD_TOOLS="Off" && \
    case ${DOCKER_TAG} in *"-debug"*) BUILD_TYPE="Debug";; esac && \
    case ${DOCKER_TAG} in *"-assertions"*) BUILD_TYPE="RelWithDebInfo" && ENABLE_ASSERTIONS="On" && BUILD_TOOLS="On";; esac && \
    echo "Building ${BUILD_TYPE} with ENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} BUILD_TOOLS=${BUILD_TOOLS}" && \
    cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} -DBUILD_TOOLS=${BUILD_TOOLS} -DENABLE_LTO=On && \
    make -j${NPROC} install && \
    cd ../profiles && \
    cp -r * /opt && \
    strip /usr/local/bin/* && \
    rm -rf /src /usr/local/lib/libosrm*
 # Multistage build to reduce image size - https://docs.docker.com/engine/userguide/eng-image/multistage-build/#use-multi-stage-builds
 # Only the content below ends up in the image, this helps remove /src from the image (which is large)
 FROM debian:bullseye-slim as runstage
 COPY --from=builder /usr/local /usr/local
 COPY --from=builder /opt /opt
 RUN apt-get update && \
    apt-get install -y --no-install-recommends libboost-program-options1.74.0 libboost-regex1.74.0 \
        libboost-date-time1.74.0 libboost-chrono1.74.0 libboost-filesystem1.74.0 \
        libboost-iostreams1.74.0 libboost-system1.74.0 libboost-thread1.74.0 \
        expat liblua5.4-0 && \
    rm -rf /var/lib/apt/lists/* && \
 # add /usr/local/lib to ldconfig to allow loading libraries from there
    ldconfig /usr/local/lib
 RUN /usr/local/bin/osrm-extract --help && \
    /usr/local/bin/osrm-routed --help && \
    /usr/local/bin/osrm-contract --help && \
    /usr/local/bin/osrm-partition --help && \
    /usr/local/bin/osrm-customize --help
 WORKDIR /opt
 EXPOSE 5000
@@ -0,0 +1 @@
 Dockerfile-debian
@@ -0,0 +1,62 @@
 FROM alpine:3.20.0 as alpine-mimalloc
 RUN apk add --no-cache mimalloc
 ENV LD_PRELOAD=/usr/lib/libmimalloc.so.2
 ENV MIMALLOC_LARGE_OS_PAGES=1
 FROM alpine-mimalloc as builder
 ARG DOCKER_TAG
 ARG BUILD_CONCURRENCY
 RUN mkdir -p /src  && mkdir -p /opt
 RUN apk add --no-cache \
    cmake make git clang libbz2 libxml2 \
    boost-dev boost-program_options boost-filesystem boost-iostreams boost-thread \
    lua5.4-dev onetbb-dev expat-dev
 COPY . /src
 WORKDIR /src
 RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
    echo "Building OSRM ${DOCKER_TAG}" && \
    git show --format="%H" | head -n1 > /opt/OSRM_GITSHA && \
    echo "Building OSRM gitsha $(cat /opt/OSRM_GITSHA)" && \
    mkdir -p build && \
    cd build && \
    BUILD_TYPE="Release" && \
    ENABLE_ASSERTIONS="Off" && \
    BUILD_TOOLS="Off" && \
    case ${DOCKER_TAG} in *"-debug"*) BUILD_TYPE="Debug";; esac && \
    case ${DOCKER_TAG} in *"-assertions"*) BUILD_TYPE="RelWithDebInfo" && ENABLE_ASSERTIONS="On" && BUILD_TOOLS="On";; esac && \
    echo "Building ${BUILD_TYPE} with ENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} BUILD_TOOLS=${BUILD_TOOLS}" && \
    cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} -DBUILD_TOOLS=${BUILD_TOOLS} -DENABLE_LTO=On && \
    make -j${NPROC} install && \
    cd ../profiles && \
    cp -r * /opt && \
    strip /usr/local/bin/* && \
    rm -rf /src
 # Multistage build to reduce image size - https://docs.docker.com/engine/userguide/eng-image/multistage-build/#use-multi-stage-builds
 # Only the content below ends up in the image, this helps remove /src from the image (which is large)
 FROM alpine-mimalloc as runstage
 COPY --from=builder /usr/local /usr/local
 COPY --from=builder /opt /opt
 RUN apk add --no-cache \
    boost-program_options boost-date_time boost-iostreams boost-thread \
    expat lua5.4 onetbb && \
    ldconfig /usr/local/lib
 RUN /usr/local/bin/osrm-extract --help && \
    /usr/local/bin/osrm-routed --help && \
    /usr/local/bin/osrm-contract --help && \
    /usr/local/bin/osrm-partition --help && \
    /usr/local/bin/osrm-customize --help
 WORKDIR /opt
 EXPOSE 5000
@@ -0,0 +1,67 @@
 FROM debian:bookworm-slim as builder
 ARG DOCKER_TAG
 ARG BUILD_CONCURRENCY
 RUN mkdir -p /src  && mkdir -p /opt
 RUN apt-get update && \
    apt-get -y --no-install-recommends install ca-certificates cmake make git gcc g++ libbz2-dev libxml2-dev wget \
    libzip-dev libboost1.81-all-dev lua5.4 liblua5.4-dev pkg-config -o APT::Install-Suggests=0 -o APT::Install-Recommends=0
 RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
    ldconfig /usr/local/lib && \
    git clone --branch v2021.12.0 --single-branch https://github.com/oneapi-src/oneTBB.git && \
    cd oneTBB && \
    mkdir build && \
    cd build && \
    cmake -DTBB_TEST=OFF -DCMAKE_BUILD_TYPE=Release ..  && \
    cmake --build . && \
    cmake --install .
 COPY . /src
 WORKDIR /src
 RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
    export CXXFLAGS="-Wno-array-bounds -Wno-uninitialized" && \
    echo "Building OSRM ${DOCKER_TAG}" && \
    git show --format="%H" | head -n1 > /opt/OSRM_GITSHA && \
    echo "Building OSRM gitsha $(cat /opt/OSRM_GITSHA)" && \
    mkdir -p build && \
    cd build && \
    BUILD_TYPE="Release" && \
    ENABLE_ASSERTIONS="Off" && \
    BUILD_TOOLS="Off" && \
    case ${DOCKER_TAG} in *"-debug"*) BUILD_TYPE="Debug";; esac && \
    case ${DOCKER_TAG} in *"-assertions"*) BUILD_TYPE="RelWithDebInfo" && ENABLE_ASSERTIONS="On" && BUILD_TOOLS="On";; esac && \
    echo "Building ${BUILD_TYPE} with ENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} BUILD_TOOLS=${BUILD_TOOLS}" && \
    cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} -DBUILD_TOOLS=${BUILD_TOOLS} -DENABLE_LTO=On && \
    make -j${NPROC} install && \
    cd ../profiles && \
    cp -r * /opt && \
    strip /usr/local/bin/* && \
    rm -rf /src
 # Multistage build to reduce image size - https://docs.docker.com/engine/userguide/eng-image/multistage-build/#use-multi-stage-builds
 # Only the content below ends up in the image, this helps remove /src from the image (which is large)
 FROM debian:bookworm-slim as runstage
 COPY --from=builder /usr/local /usr/local
 COPY --from=builder /opt /opt
 RUN apt-get update && \
    apt-get install -y --no-install-recommends \
        libboost-program-options1.81.0 libboost-date-time1.81.0 libboost-iostreams1.81.0 libboost-thread1.81.0 \
        expat liblua5.4-0 && \
    rm -rf /var/lib/apt/lists/* && \
 # add /usr/local/lib to ldconfig to allow loading libraries from there
    ldconfig /usr/local/lib
 RUN /usr/local/bin/osrm-extract --help && \
    /usr/local/bin/osrm-routed --help && \
    /usr/local/bin/osrm-contract --help && \
    /usr/local/bin/osrm-partition --help && \
    /usr/local/bin/osrm-customize --help
 WORKDIR /opt
 EXPOSE 5000
@@ -6,4 +6,8 @@
 # ensure that "COPY . /src" is referring to the repo root, not the directory
 # that contains the Dockerfile.
 # This script gets executed with a pwd of wherever the Dockerfile is.
-docker build --build-arg BUILD_CONCURRENCY=${CONCURRENCY:-1} --build-arg DOCKER_TAG=${DOCKER_TAG} -t $IMAGE_NAME -f Dockerfile ..
+
 DOCKER_BUILD="docker build --build-arg BUILD_CONCURRENCY=${CONCURRENCY} --build-arg DOCKER_TAG=${DOCKER_TAG:?unset} -t ${IMAGE_NAME:?unset} -f"
 $DOCKER_BUILD Dockerfile ..
 $DOCKER_BUILD Dockerfile-alpine ..
@@ -32,9 +32,9 @@ For outputting data into our file (debug.geojson), we simply need to call the ma
 ### Possible Scopeguard Location
 Think of the scopeguard as you would do of any reference. If you wan't to access to logging during a call, the guard object must be alive and valid.
-As an example: a good location to create the a scopeguard to log decisions in the edge-based-graph-factory would be right before we run it ([here](https://github.com/Project-OSRM/osrm-backend/blob/a933b5d94943bf3edaf42c84a614a99650d23cba/src/extractor/extractor.cpp#L497)). If you put `util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString> geojson_guard( "debug.geojson", node_coordinate_vector);` at that location, you can then print `util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString>::Write(list_of_node_ids);` anywhere within the `edge-based-graph-factory`.
+As an example: a good location to create a scopeguard to log decisions in the edge-based-graph-factory would be right before we run it ([here](https://github.com/Project-OSRM/osrm-backend/blob/a933b5d94943bf3edaf42c84a614a99650d23cba/src/extractor/extractor.cpp#L497)). If you put `util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString> geojson_guard( "debug.geojson", node_coordinate_vector);` at that location, you can then print `util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString>::Write(list_of_node_ids);` anywhere within the `edge-based-graph-factory`.
-This location would enable call for all guidance related pre-processing which is called in the edge-based-graph-factory.
+This location would enable calls for all guidance related pre-processing which is called in the edge-based-graph-factory.
 Logging any turn-handler decisions, for example, would now be possible.
 ## Limitations
@@ -35,7 +35,7 @@ To pass parameters to each location some options support an array-like encoding:
 |radiuses        |`{radius};{radius}[;{radius} ...]`                      |Limits the search to given radius in meters.                                                                                                                                                               |
 |generate\_hints |`true` (default), `false`                               |Adds a Hint to the response which can be used in subsequent requests, see `hints` parameter.                                                                                                               |
 |hints           |`{hint};{hint}[;{hint} ...]`                            |Hint from previous request to derive position in street network.                                                                                                                                           |
-|approaches      |`{approach};{approach}[;{approach} ...]`                |Keep waypoints on curbside.                                                                                                                                                                               |
+|approaches      |`{approach};{approach}[;{approach} ...]`                |Restrict the direction on the road network at a waypoint, relative to the input coordinate.                                                                                                                    |
 |exclude         |`{class}[,{class}]`                                     |Additive list of classes to avoid, the order does not matter.                                                                                                                                                  |
 |snapping        |`default` (default), `any`                              |Default snapping avoids is_startpoint (see profile) edges, `any` will snap to any edge in the graph                                                                                                        |
 |skip_waypoints  |`true`, `false` (default)                               |Removes waypoints from the response. Waypoints are still calculated, but not serialized. Could be useful in case you are interested in some other part of the response and do not want to transfer waste data. |
@@ -47,7 +47,7 @@ Where the elements follow the following format:
 |bearing     |`{value},{range}` `integer 0 .. 360,integer 0 .. 180`   |
 |radius      |`double >= 0` or `unlimited` (default)                  |
 |hint        |Base64 `string`                                         |
-|approach    |`curb` or `unrestricted` (default)                      |
+|approach    |`curb`, `opposite` or `unrestricted` (default)          |
 |class       |A class name determined by the profile or `none`.       |
 ```
@@ -88,10 +88,11 @@ Every response object has a `code` property containing one of the strings below
 | `InvalidService`  | Service name is invalid.                                                         |
 | `InvalidVersion`  | Version is not found.                                                            |
 | `InvalidOptions`  | Options are invalid.                                                             |
-| `InvalidQuery`    | The query string is syntactically malformed.                                    |
+| `InvalidQuery`    | The query string is syntactically malformed.                                     |
 | `InvalidValue`    | The successfully parsed query parameters are invalid.                            |
-| `NoSegment`       | One of the supplied input coordinates could not snap to the street segment.          |
+| `NoSegment`       | One of the supplied input coordinates could not snap to the street segment.      |
 | `TooBig`          | The request size violates one of the service-specific request size restrictions. |
 | `DisabledDataset` | The request tried to access a disabled dataset.                                  |
 - `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`.
@@ -648,12 +649,12 @@ Represents a route between two waypoints.
 - `distance`: The distance traveled by this route leg, in `float` meters.
 - `duration`: The estimated travel time, in `float` number of seconds.
 - `weight`: The calculated weight of the route leg.
- `summary`: Summary of the route taken as `string`. Depends on the `summary` parameter:
+- `summary`: Summary of the route taken as `string`. Depends on the `steps` parameter:
-| summary      |                                                                       |
+| steps |                                                                       |
-|--------------|-----------------------------------------------------------------------|
+|-------|-----------------------------------------------------------------------|
-| true         | Names of the two major roads used. Can be empty if the route is too short.|
+| true  | Names of the two major roads used. Can be empty if the route is too short.|
-| false        | empty `string`                                                        |
+| false | empty `string`                                                        |
 - `steps`: Depends on the `steps` parameter.
@@ -21,7 +21,7 @@ var osrm = new OSRM('network.osrm');
 **Parameters**
 -   `options` **([Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object) \| [String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String))** Options for creating an OSRM object or string to the `.osrm` file. (optional, default `{shared_memory:true}`)
-    -   `options.algorithm` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** The algorithm to use for routing. Can be 'CH', 'CoreCH' or 'MLD'. Default is 'CH'.
+    -   `options.algorithm` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** The algorithm to use for routing. Can be 'CH', or 'MLD'. Default is 'CH'.
               Make sure you prepared the dataset with the correct toolchain.
    -   `options.shared_memory` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Connects to the persistent shared memory datastore.
               This requires you to run `osrm-datastore` prior to creating an `OSRM` object.
@@ -31,6 +31,7 @@ var osrm = new OSRM('network.osrm');
               Old behaviour: Path to a file on disk to store the memory using mmap.  Current behaviour: setting this value is the same as setting `mmap_memory: true`.
    -   `options.mmap_memory` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Map on-disk files to virtual memory addresses (mmap), rather than loading into RAM.
    -   `options.path` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** The path to the `.osrm` files. This is mutually exclusive with setting {options.shared_memory} to true.
    -   `options.disable_feature_dataset` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Disables a feature dataset from being loaded into memory if not needed. Options: `ROUTE_STEPS`, `ROUTE_GEOMETRY`.
    -   `options.max_locations_trip` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in trip query (default: unlimited).
    -   `options.max_locations_viaroute` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in viaroute query (default: unlimited).
    -   `options.max_locations_distance_table` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in distance table query (default: unlimited).
@@ -38,6 +39,7 @@ var osrm = new OSRM('network.osrm');
    -   `options.max_radius_map_matching` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. radius size supported in map matching query (default: 5).
    -   `options.max_results_nearest` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. results supported in nearest query (default: unlimited).
    -   `options.max_alternatives` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. number of alternatives supported in alternative routes query (default: 3).
    -   `options.default_radius` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Default radius for queries (default: unlimited).
 ### route
@@ -61,7 +63,7 @@ Returns the fastest route between two or more coordinates while visiting the way
    -   `options.geometries` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Returned route geometry format (influences overview and per step). Can also be `geojson`. (optional, default `polyline`)
    -   `options.overview` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Add overview geometry either `full`, `simplified` according to highest zoom level it could be display on, or not at all (`false`). (optional, default `simplified`)
    -   `options.continue_straight` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Forces the route to keep going straight at waypoints and don't do a uturn even if it would be faster. Default value depends on the profile.
-    -   `options.approaches` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
+    -   `options.approaches` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Restrict the direction on the road network at a waypoint, relative to the input coordinate. Can be `null` (unrestricted, default), `curb` or `opposite`.
                         `null`/`true`/`false`
    -   `options.waypoints` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Indices to coordinates to treat as waypoints. If not supplied, all coordinates are waypoints.  Must include first and last coordinate index.
    -   `options.format` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** Which output format to use, either `json`, or [`flatbuffers`](https://github.com/Project-OSRM/osrm-backend/tree/master/include/engine/api/flatbuffers).
@@ -99,7 +101,7 @@ Note: `coordinates` in the general options only supports a single `{longitude},{
    -   `options.generate_hints` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Whether or not adds a Hint to the response which can be used in subsequent requests. (optional, default `true`)
    -   `options.number` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)** Number of nearest segments that should be returned.
        Must be an integer greater than or equal to `1`. (optional, default `1`)
-    -   `options.approaches` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
+    -   `options.approaches` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Restrict the direction on the road network at a waypoint, relative to the input coordinate. Can be `null` (unrestricted, default), `curb` or `opposite`.
    -   `options.format` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** Which output format to use, either `json`, or [`flatbuffers`](https://github.com/Project-OSRM/osrm-backend/tree/master/include/engine/api/flatbuffers).
    -   `options.snapping` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** Which edges can be snapped to, either `default`, or `any`.  `default` only snaps to edges marked by the profile as `is_startpoint`, `any` will allow snapping to any edge in the routing graph.
 -   `callback` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)** 
@@ -139,7 +141,7 @@ Optionally returns distance table.
    -   `options.sources` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** An array of `index` elements (`0 <= integer < #coordinates`) to use
                                         location with given index as source. Default is to use all.
    -   `options.destinations` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** An array of `index` elements (`0 <= integer < #coordinates`) to use location with given index as destination. Default is to use all.
-    -   `options.approaches` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
+    -   `options.approaches` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Restrict the direction on the road network at a waypoint, relative to the input coordinate.. Can be `null` (unrestricted, default), `curb` or `opposite`.
    -   `options.fallback_speed` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Replace `null` responses in result with as-the-crow-flies estimates based on `fallback_speed`.  Value is in metres/second.
    -   `options.fallback_coordinate` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** Either `input` (default) or `snapped`.  If using a `fallback_speed`, use either the user-supplied coordinate (`input`), or the snapped coordinate (`snapped`) for calculating the as-the-crow-flies distance between two points.
    -   `options.scale_factor` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Multiply the table duration values in the table by this number for more controlled input into a route optimization solver.
@@ -248,7 +250,7 @@ osrm.match(options, function(err, response) {
 Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** containing `tracepoints` and `matchings`.
 **`tracepoints`** Array of [`Ẁaypoint`](#waypoint) 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.
+                  If the trace point was omitted by map matching because it is an outlier, the entry will be null.
                  Each `Waypoint` object has the following additional properties,
                  1) `matchings_index`: Index to the
                  [`Route`](#route) object in matchings the sub-trace was matched to,
@@ -296,7 +298,7 @@ Right now, the following combinations are possible:
    -   `options.roundtrip` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route is a roundtrip. (optional, default `true`)
    -   `options.source` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Return route starts at `any` or `first` coordinate. (optional, default `any`)
    -   `options.destination` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Return route ends at `any` or `last` coordinate. (optional, default `any`)
-    -   `options.approaches` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
+    -   `options.approaches` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Restrict the direction on the road network at a waypoint, relative to the input coordinate. Can be `null` (unrestricted, default), `curb` or `opposite`.
    -   `options.snapping` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** Which edges can be snapped to, either `default`, or `any`. `default` only snaps to edges marked by the profile as `is_startpoint`, `any` will allow snapping to any edge in the routing graph.
 -   `callback` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)** 
@@ -113,7 +113,7 @@ excludable                           | Sequence of Sets | Determines which class
 classes                              | Sequence         | Determines the allowed classes that can be referenced using `{forward,backward}_classes` on the way in the `process_way` function.
 restrictions                         | Sequence         | Determines which turn restrictions will be used for this profile.
 suffix_list                          | Set              | List of name suffixes needed for determining if "Highway 101 NW" the same road as "Highway 101 ES".
-relation_types                       | Sequence         | Determines wich relations should be cached for processing in this profile. It contains relations types
+relation_types                       | Sequence         | Determines which relations should be cached for processing in this profile. It contains relations types
 ### process_node(profile, node, result, relations)
 Process an OSM node to determine whether this node is a barrier or can be passed and whether passing it incurs a delay.
@@ -349,7 +349,7 @@ The input data must an ASCII file with rows of integers. e.g.:
 In your `segment_function` you can then access the raster source and use `raster:query()` to query to find the nearest data point, or `raster:interpolate()` to interpolate a value based on nearby data points.
-You must check whether the result is valid before use it.
+You must check whether the result is valid before using it.
 Example:
@@ -300,7 +300,7 @@ And the relations
 The setting looks perfectly fine at first glance. However, it is not well defined.
 The forbidden right turn could be either a superfluous addition, forbidding the turn `cb` to `be`, or actually refer to the turn `ab` to `bd` to say that a turn is forbidden here.
-To model turn-restrictions correctly and unique, we need to split segments that contribute to the restriction into the smallest possible parts.
+To model turn-restrictions correctly and uniquely, we need to split segments that contribute to the restriction into the smallest possible parts.
 E.g. the above scenario could correctly be expressed as:
 ```
@@ -360,7 +360,7 @@ When I route I should get
 And the test reports `turn right` for the route `a->e`, where before it said `slight right`.
-If you changed the turn angles, obviously you can expect changes in the distinction between `slight right` and `right`.
+If you change the turn angles, obviously you can expect changes in the distinction between `slight right` and `right`.
 In such a case it is, of course, reasonable to change the expected route to report `right` instead of `slight right`. You should consider inspecting the actual turn angles at `b` to see if you feel that change is justified.
 However, you should never adjust the test itself.
@@ -390,9 +390,9 @@ In this case we would see a very slight turn angle. If your change now reports d
 ### Consider Post-Processing Impacts
-Some changes you might see could look completely unrelated. To understand the impact of your changes, you can make use of the debugging utilities you can finde in `util/debug.hpp` (and potentially other related headers).
+Some changes you might see could look completely unrelated. To understand the impact of your changes, you can make use of the debugging utilities you can find in `util/debug.hpp` (and potentially other related headers).
-If your test is inspecting a series of turns (remember, a turn not necessarily equals an instruction), you could see interaction with post-processing.
+If your test is inspecting a series of turns (remember, a turn does not necessarily equals an instruction), you could see interaction with post-processing.
 To see the unprocessed turns, you should print the steps at the end of step assembly (`assembleSteps` in `engine/guidance/assemble_steps.hpp`).
 If you see unexpected changes, you can consider adding the `locations` field to your test to study what location a turn is reported at.
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.8)
+cmake_minimum_required(VERSION 3.18)
 if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR AND NOT MSVC_IDE)
  message(FATAL_ERROR "In-source builds are not allowed.
@@ -12,20 +12,18 @@ endif()
 project(osrm-example C CXX)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 set(bitness 32)
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
  set(bitness 64)
  message(STATUS "Building on a 64 bit system")
 else()
  message(STATUS "Building on a 32 bit system")
 endif()
 if(WIN32 AND MSVC_VERSION LESS 1900)
  message(FATAL_ERROR "Building with Microsoft compiler needs Latest Visual Studio 2015 (Community or better)")
 endif()
 link_directories(${LibOSRM_LIBRARY_DIRS})
 add_executable(osrm-example example.cpp)
@@ -57,15 +57,15 @@ int main(int argc, const char *argv[])
    // Execute routing request, this does the heavy lifting
    const auto status = osrm.Route(params, result);
-    auto &json_result = result.get<json::Object>();
+    auto &json_result = std::get<json::Object>(result);
    if (status == Status::Ok)
    {
-        auto &routes = json_result.values["routes"].get<json::Array>();
+        auto &routes = std::get<json::Array>(json_result.values["routes"]);
        // Let's just use the first route
-        auto &route = routes.values.at(0).get<json::Object>();
+        auto &route = std::get<json::Object>(routes.values.at(0));
-        const auto distance = route.values["distance"].get<json::Number>().value;
+        const auto distance = std::get<json::Number>(route.values["distance"]).value;
-        const auto duration = route.values["duration"].get<json::Number>().value;
+        const auto duration = std::get<json::Number>(route.values["duration"]).value;
        // Warn users if extract does not contain the default coordinates from above
        if (distance == 0 || duration == 0)
@@ -80,8 +80,8 @@ int main(int argc, const char *argv[])
    }
    else if (status == Status::Error)
    {
-        const auto code = json_result.values["code"].get<json::String>().value;
+        const auto code = std::get<json::String>(json_result.values["code"]).value;
-        const auto message = json_result.values["message"].get<json::String>().value;
+        const auto message = std::get<json::String>(json_result.values["message"]).value;
        std::cout << "Code: " << code << "\n";
        std::cout << "Message: " << code << "\n";
@@ -78,6 +78,15 @@ Feature: Bike - Accessability of different way types
            | construction | yes  |         |       |
            | construction |      | yes     |       |
    @proposed
    Scenario: Bike - Don't allow routing on ways still being proposed
        Then routability should be
            | highway  | foot | bicycle | proposed | bothw |
            | primary  |      |         |          | x     |
            | proposed |      |         |          |       |
            | proposed | yes  |         | yes      |       |
            | proposed |      | yes     | yes      |       |
    @roundabout
    Scenario: Bike - Don't push bikes against oneway flow on roundabouts
        Then routability should be
@@ -32,14 +32,14 @@ Feature: Car - Handle traffic lights
            | l    | traffic_signals |
        When I route I should get
-            | from | to | time   | # |
+            | from | to | time   | #                             |
            | 1    | 2  |  11.1s | no turn with no traffic light |
            | 3    | 4  |  13.1s | no turn with traffic light    |
            | g    | j  |  18.7s | turn with no traffic light    |
            | k    | n  |  20.7s | turn with traffic light       |
-    Scenario: Car - Traffic signal direction
+    Scenario: Car - Traffic signal direction straight
        Given the node map
            """
            a-1-b-2-c
@@ -66,25 +66,60 @@ Feature: Car - Handle traffic lights
            | k    | traffic_signals | backward                  |
        When I route I should get
-            | from | to | time   | #                             |
+            | from | to | time   | weight | #                             |
-            | 1    | 2  |  11.1s | no turn with no traffic light |
+            | 1    | 2  |  11.1s | 11.1   | no turn with no traffic light |
-            | 2    | 1  |  11.1s | no turn with no traffic light |
+            | 2    | 1  |  11.1s | 11.1   | no turn with no traffic light |
-            | 3    | 4  |  13.1s | no turn with traffic light    |
+            | 3    | 4  |  13.1s | 13.1   | no turn with traffic light    |
-            | 4    | 3  |  13.1s | no turn with traffic light    |
+            | 4    | 3  |  13.1s | 13.1   | no turn with traffic light    |
-            | 5    | 6  |  13.1s | no turn with traffic light    |
+            | 5    | 6  |  13.1s | 13.1   | no turn with traffic light    |
-            | 6    | 5  |  11.1s | no turn with no traffic light |
+            | 6    | 5  |  11.1s | 11.1   | no turn with no traffic light |
-            | 7    | 8  |  11.1s | no turn with no traffic light |
+            | 7    | 8  |  11.1s | 11.1   | no turn with no traffic light |
-            | 8    | 7  |  13.1s | no turn with traffic light    |
+            | 8    | 7  |  13.1s | 13.1   | no turn with traffic light    |
-    Scenario: Car - Encounters a traffic light
+    Scenario: Car - Traffic signal direction with distance weight
        Given the profile file "car" initialized with
        """
        profile.properties.weight_name = 'distance'
        profile.properties.traffic_light_penalty = 100000
        """
        Given the node map
            """
-              a      f      k
+            a---b---c
-              |      |      |
+            1       2
-            b-c-d  h-g-i  l-m-n
+            |       |
-              |      |      |
+            |       |
-              e      j      o
+            |       |
            |       |
            |       |
            d-------f
            """
        And the ways
            | nodes | highway |
            | abc   | primary |
            | adfc  | primary |
        And the nodes
            | node | highway         |
            | b    | traffic_signals |
        When I route I should get
            | from | to | time      | distances | weight | #                                     |
            | 1    | 2  | 100033.2s | 599.9m,0m | 599.8  | goes via the expensive traffic signal |
    Scenario: Car - Encounters a traffic light direction
        Given the node map
            """
              a      f      k      p
              |      |      |      |
            b-c-d  h-g-i  l-m-n  q-r-s
              |      |      |      |
              e      j      o      t
            """
@@ -96,53 +131,70 @@ Feature: Car - Handle traffic lights
            | fgj   | primary |
            | lmn   | primary |
            | kmo   | primary |
            | qrs   | primary |
            | prt   | primary |
        And the nodes
            | node | highway         | traffic_signals:direction |
-            | g    | traffic_signals | forward                   |
+            | g    | traffic_signals |                           |
-            | m    | traffic_signals | backward                  |
+            | m    | traffic_signals | forward                   |
            | r    | traffic_signals | backward                  |
        When I route I should get
            # Base case
            | from | to | time   | #                             |
            | a    | d  | 21.9s  | no turn with no traffic light |
            | a    | e  | 22.2s  | no turn with traffic light    |
            | a    | b  | 18.7s  | turn with no traffic light    |
-            | e    | b  | 21.9s  | no turn with no traffic light |
+            | a    | e  | 22.2s  | no turn with no traffic light |
-            | e    | a  | 22.2s  | no turn with traffic light    |
+            | a    | d  | 21.9s  | turn with no traffic light    |
            | e    | b  | 21.9s  | turn with no traffic light    |
            | e    | a  | 22.2s  | no turn with no traffic light |
            | e    | d  | 18.7s  | turn with no traffic light    |
-            | d    | e  | 21.9s  | no turn with no traffic light |
+            | d    | e  | 21.9s  | turn with no traffic light    |
-            | d    | b  | 11s    | no turn with traffic light    |
+            | d    | b  | 11s    | no turn with no traffic light |
            | d    | a  | 18.7s  | turn with no traffic light    |
-            | b    | a  | 21.9s  | no turn with no traffic light |
+            | b    | a  | 21.9s  | turn with no traffic light    |
-            | b    | d  | 11s    | no turn with traffic light    |
+            | b    | d  | 11s    | no turn with no traffic light |
            | b    | e  | 18.7s  | turn with no traffic light    |
-
+            # All have traffic lights - 2s penalty
-            | f    | i  | 23.9s  | no turn with no traffic light |
+            | f    | h  | 20.7s  | turn with traffic light       |
            | f    | j  | 24.2s  | no turn with traffic light    |
-            | f    | h  | 20.7s  | turn with no traffic light    |
+            | f    | i  | 23.9s  | turn with traffic light       |
-            | j    | h  | 21.9s  | no turn with no traffic light |
+            | j    | h  | 23.9s  | turn with traffic light       |
-            | j    | f  | 22.2s  | no turn with traffic light    |
+            | j    | f  | 24.2s  | no turn with traffic light    |
-            | j    | i  | 18.7s  | turn with no traffic light    |
+            | j    | i  | 20.7s  | turn with traffic light       |
-            | i    | j  | 21.9s  | no turn with no traffic light |
+            | i    | j  | 23.9s  | turn with traffic light       |
-            | i    | h  | 11s    | no turn with traffic light    |
+            | i    | h  | 13s    | no turn with traffic light    |
-            | i    | f  | 18.7s  | turn with no traffic light    |
+            | i    | f  | 20.7s  | turn with traffic light       |
-            | h    | f  | 23.9s  | no turn with no traffic light |
+            | h    | f  | 23.9s  | turn with traffic light       |
            | h    | i  | 13s    | no turn with traffic light    |
-            | h    | j  | 20.7s  | turn with no traffic light    |
+            | h    | j  | 20.7s  | turn with traffic light       |
-
+            # Front direction have traffic lights - 2s penalty
-            | k    | n  | 21.9s  | no turn with no traffic light |
+            | k    | l  | 20.7s  | turn with traffic light       |
-            | k    | o  | 22.2s  | no turn with traffic light    |
+            | k    | o  | 24.2s  | no turn with traffic light    |
-            | k    | l  | 18.7s  | turn with no traffic light    |
+            | k    | n  | 23.9s  | turn with traffic light       |
-            | o    | l  | 23.9s  | no turn with no traffic light |
+            | o    | l  | 21.9s  | turn with no traffic light    |
-            | o    | k  | 24.2s  | no turn with traffic light    |
+            | o    | k  | 22.2s  | no turn with no traffic light |
-            | o    | n  | 20.7s  | turn with no traffic light    |
+            | o    | n  | 18.7s  | turn with no traffic light    |
-            | n    | o  | 23.9s  | no turn with no traffic light |
+            | n    | o  | 21.9s  | turn with no traffic light    |
-            | n    | l  | 13s    | no turn with traffic light    |
+            | n    | l  | 11s    | no turn with no traffic light |
-            | n    | k  | 20.7s  | turn with no traffic light    |
+            | n    | k  | 18.7s  | turn with no traffic light    |
-            | l    | k  | 21.9s  | no turn with no traffic light |
+            | l    | k  | 23.9s  | turn with traffic light       |
-            | l    | n  | 11s    | no turn with traffic light    |
+            | l    | n  | 13s    | no turn with traffic light    |
-            | l    | o  | 18.7s  | turn with no traffic light    |
+            | l    | o  | 20.7s  | turn with traffic light       |
            # Reverse direction have traffic lights - 2s penalty
            | p    | q  | 18.7s  | turn with no traffic light    |
            | p    | t  | 22.2s  | no turn with no traffic light |
            | p    | s  | 21.9s  | turn with no traffic light    |
            | t    | q  | 23.9s  | turn with traffic light       |
            | t    | p  | 24.2s  | no turn with traffic light    |
            | t    | s  | 20.7s  | turn with traffic light       |
            | s    | t  | 23.9s  | turn with traffic light       |
            | s    | q  | 13s    | no turn with traffic light    |
            | s    | p  | 20.7s  | turn with traffic light       |
            | q    | p  | 21.9s  | turn with no traffic light    |
            | q    | s  | 11s    | no turn with no traffic light |
            | q    | t  | 18.7s  | turn with no traffic light    |
    Scenario: Traffic Signal Geometry
@@ -308,3 +360,106 @@ Feature: Car - Handle traffic lights
          | from | to | route   | speed   | weights | time  | distances | a:datasources | a:nodes | a:speed | a:duration |  a:weight |
          | a    | c  | abc,abc | 65 km/h | 22.2,0  | 22.2s | 400m,0m   |           1:0 |  1:2:3  |   18:18 |  11.1:11.1 | 11.1:11.1 |
          | c    | a  | abc,abc | 60 km/h | 24.2,0  | 24.2s | 400m,0m   |           0:1 |  3:2:1  |   18:18 |  11.1:11.1 | 11.1:11.1 |
    Scenario: Car - Traffic signal straight direction with edge compression
        Given the node map
            """
            a-1-b - c - d-2-e
            """
        And the ways
            | nodes | highway |
            | abcde | primary |
        And the nodes
            | node | highway         | traffic_signals:direction |
            | c    | traffic_signals | forward                   |
        When I route I should get
            | from | to | time   | weight | #                             |
            | 1    | 2  |  35.3s | 35.3   | no turn with traffic light    |
            | 2    | 1  |  33.3s | 33.3   | no turn with no traffic light |
    Scenario: Car - Traffic signal turn direction with edge compression
        Given the node map
            """
                        d
                        |
                        2
                        |
            a-1-b - c - f
                        |
                        e
                        j
                        |
                        4
                        |
            g-3-h - i - k
                        |
                        l
            """
        And the ways
            | nodes | highway |
            | abc   | primary |
            | cf    | primary |
            | fd    | primary |
            | fe    | primary |
            | ghi   | primary |
            | ik    | primary |
            | kj    | primary |
            | kl    | primary |
        And the nodes
            | node | highway         | traffic_signals:direction |
            | k    | traffic_signals | forward                   |
        When I route I should get
            | from | to | time   | weight | #                          |
            | 1    | 2  |  44.2s | 44.2   | turn with no traffic light |
            | 2    | 1  |  41s   | 41     | turn with no traffic light |
            | 3    | 4  |  46.2s | 46.2   | turn with traffic light    |
            | 4    | 3  |  41s   | 41     | turn with no traffic light |
    Scenario: Car - Traffic signal turn direction with turn restriction
        Given the node map
            """
                        d
                        |
                        2
                        |
            a-1-b - c - f
                        |
                        e
            """
        And the ways
            | nodes | highway |
            | abc   | primary |
            | cf    | primary |
            | fd    | primary |
            | fe    | primary |
        And the nodes
            | node | highway         | traffic_signals:direction |
            | f    | traffic_signals | forward                   |
        And the relations
            | type        | way:from | way:to | way:via  | restriction   |
            | restriction | abc      | fe     | cf       | no_right_turn |
        And the relations
            | type        | way:from | way:to | node:via | restriction     |
            | restriction | df       | fc     | f        | right_turn_only |
        When I route I should get
            | from | to | time   | weight | #                          |
            | 1    | 2  |  46.2s | 46.2   | turn with traffic light    |
            | 2    | 1  |  41s   | 41     | turn with no traffic light |
@@ -36,3 +36,9 @@ Feature: Foot - Accessability of different way types
            | highway | leisure  | forw |
            | (nil)   | track    |   x  |
    Scenario: Foot - Proposed ways
        Then routability should be
            | highway  | foot  | proposed | forw |
            | footway  |       |          | x    |
            | proposed |       |          |      |
            | proposed | yes   | yes      |      |
@@ -68,8 +68,9 @@ class OSRMDirectLoader extends OSRMBaseLoader {
        super(scope);
    }
-    load (inputFile, callback) {
+    load (ctx, callback) {
-        this.inputFile = inputFile;
+        this.inputFile = ctx.inputFile;
        this.loaderArgs = ctx.loaderArgs;
        this.shutdown(() => {
            this.launch(callback);
        });
@@ -78,7 +79,7 @@ class OSRMDirectLoader extends OSRMBaseLoader {
    osrmUp (callback) {
        if (this.osrmIsRunning()) return callback(new Error("osrm-routed already running!"));
-        const command_arguments = util.format('%s -p %d -i %s -a %s', this.inputFile, this.scope.OSRM_PORT, this.scope.OSRM_IP, this.scope.ROUTING_ALGORITHM);
+        const command_arguments = util.format('%s -p %d -i %s -a %s %s', this.inputFile, this.scope.OSRM_PORT, this.scope.OSRM_IP, this.scope.ROUTING_ALGORITHM, this.loaderArgs);
        this.child = this.scope.runBin('osrm-routed', command_arguments, this.scope.environment, (err) => {
            if (err && err.signal !== 'SIGINT') {
                this.child = null;
@@ -101,8 +102,9 @@ class OSRMmmapLoader extends OSRMBaseLoader {
        super(scope);
    }
-    load (inputFile, callback) {
+    load (ctx, callback) {
-        this.inputFile = inputFile;
+        this.inputFile = ctx.inputFile;
        this.loaderArgs = ctx.loaderArgs;
        this.shutdown(() => {
            this.launch(callback);
        });
@@ -111,7 +113,7 @@ class OSRMmmapLoader extends OSRMBaseLoader {
    osrmUp (callback) {
        if (this.osrmIsRunning()) return callback(new Error("osrm-routed already running!"));
-        const command_arguments = util.format('%s -p %d -i %s -a %s --mmap', this.inputFile, this.scope.OSRM_PORT, this.scope.OSRM_IP, this.scope.ROUTING_ALGORITHM);
+        const command_arguments = util.format('%s -p %d -i %s -a %s --mmap %s', this.inputFile, this.scope.OSRM_PORT, this.scope.OSRM_IP, this.scope.ROUTING_ALGORITHM, this.loaderArgs);
        this.child = this.scope.runBin('osrm-routed', command_arguments, this.scope.environment, (err) => {
            if (err && err.signal !== 'SIGINT') {
                this.child = null;
@@ -134,8 +136,9 @@ class OSRMDatastoreLoader extends OSRMBaseLoader {
        super(scope);
    }
-    load (inputFile, callback) {
+    load (ctx, callback) {
-        this.inputFile = inputFile;
+        this.inputFile = ctx.inputFile;
        this.loaderArgs = ctx.loaderArgs;
        this.loadData((err) => {
            if (err) return callback(err);
@@ -148,7 +151,7 @@ class OSRMDatastoreLoader extends OSRMBaseLoader {
    }
    loadData (callback) {
-        const command_arguments = util.format('--dataset-name=%s %s', this.scope.DATASET_NAME, this.inputFile);
+        const command_arguments = util.format('--dataset-name=%s %s %s', this.scope.DATASET_NAME, this.inputFile, this.loaderArgs);
        this.scope.runBin('osrm-datastore', command_arguments, this.scope.environment, (err) => {
            if (err) return callback(new Error('*** osrm-datastore exited with ' + err.code + ': ' + err));
            callback();
@@ -0,0 +1,141 @@
@routing @disable-feature-dataset
 Feature: disable-feature-dataset command line options
    Background:
        Given the profile "testbot"
        And the node map
            """
            0
            a b c
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
    Scenario: disable-feature-dataset - geometry disabled error
        Given the data load extra arguments "--disable-feature-dataset ROUTE_GEOMETRY"
        # The default values
        And the query options
          | overview       | simplified |
          | annotations    | false      |
          | steps          | false      |
          | skip_waypoints | false      |
        When I route I should get
            | from | to | code              |
            | a    | c  | DisabledDataset  |
        When I plan a trip I should get
            | waypoints | code             |
            | a,b,c     | DisabledDataset |
        When I match I should get
          | trace | code             |
          | abc   | DisabledDataset |
    Scenario: disable-feature-dataset - geometry disabled error table
        Given the data load extra arguments "--disable-feature-dataset ROUTE_GEOMETRY"
        When I request nearest I should get
            | in | code              |
            | 0  | DisabledDataset  |
        When I request a travel time matrix with these waypoints I should get the response code
            | waypoints  | code             |
            | a,b,c      | DisabledDataset |
    Scenario: disable-feature-dataset - geometry disabled success
        Given the data load extra arguments "--disable-feature-dataset ROUTE_GEOMETRY"
        # No geometry values returned
        And the query options
          | overview       | false |
          | annotations    | false |
          | steps          | false |
          | skip_waypoints | true  |
        When I route I should get
            | from | to | code     |
            | a    | c  | Ok       |
        When I plan a trip I should get
            | waypoints |  code |
            | a,b,c     |  Ok   |
        When I match I should get
          | trace | code |
          | abc   | Ok   |
    Scenario: disable-feature-dataset - geometry disabled error table
        Given the data load extra arguments "--disable-feature-dataset ROUTE_GEOMETRY"
        And the query options
          | skip_waypoints | true  |
        # You would never do this, but just to prove the point.
        When I request nearest I should get
            | in | code              |
            | 0  | Ok                |
        When I request a travel time matrix with these waypoints I should get the response code
            | waypoints  | code  |
            | a,b,c      | Ok    |
    Scenario: disable-feature-dataset - steps disabled error
        Given the data load extra arguments "--disable-feature-dataset ROUTE_STEPS"
        # Default + annotations, steps
 	And the query options
          | overview       | simplified |
          | annotations    | true       |
          | steps          | true       |
        When I route I should get
            | from | to | code               |
            | a    | c  | DisabledDataset   |
        When I plan a trip I should get
            | waypoints |  code            |
            | a,b,c     | DisabledDataset |
        When I match I should get
          | trace | code             |
          | abc   | DisabledDataset |
    Scenario: disable-feature-dataset - geometry disabled error table
        Given the data load extra arguments "--disable-feature-dataset ROUTE_STEPS"
        When I request nearest I should get
            | in | code |
            | 0  | Ok   |
        When I request a travel time matrix with these waypoints I should get the response code
            | waypoints  | code  |
            | a,b,c      | Ok    |
    Scenario: disable-feature-dataset - steps disabled success
        Given the data load extra arguments "--disable-feature-dataset ROUTE_STEPS"
        # Default + steps
        And the query options
          | overview       | simplified |
          | annotations    | true       |
          | steps          | false      |
        When I route I should get
            | from | to | code     |
            | a    | c  | Ok       |
        When I plan a trip I should get
            | waypoints |  code |
            | a,b,c     |  Ok   |
        When I match I should get
          | trace | code |
          | abc   | Ok   |
@@ -154,3 +154,27 @@ Feature: osrm-extract lua ways:get_nodes()
        Then it should exit successfully
        And stdout should contain "node 42"
        And stdout should contain "way 42"
    Scenario: osrm-extract flags accessible in process_segment function
        Given the profile file
        """
        functions = require('testbot')
        functions.process_segment = function (profile, segment)
            print('segment forward ' .. tostring(segment.flags.forward) .. ' backward ' .. tostring(segment.flags.backward))
        end
        return functions
        """
        And the node map
            """
            a b
            """
        And the ways
            | nodes | oneway |
            | ab    | yes    |
        And the data has been saved to disk
        When I run "osrm-extract --profile {profile_file} {osm_file}"
        Then it should exit successfully
        And stdout should contain "segment forward true backward false"
@@ -22,6 +22,8 @@ Feature: osrm-routed command line options: help
        And stdout should contain "--max-trip-size"
        And stdout should contain "--max-table-size"
        And stdout should contain "--max-matching-size"
        And stdout should contain "--default-radius"
        And stdout should contain "--keepalive-timeout"
        And it should exit successfully
    Scenario: osrm-routed - Help, short
@@ -42,6 +44,8 @@ Feature: osrm-routed command line options: help
        And stdout should contain "--max-trip-size"
        And stdout should contain "--max-table-size"
        And stdout should contain "--max-matching-size"
        And stdout should contain "--default-radius"
        And stdout should contain "--keepalive-timeout"
        And it should exit successfully
    Scenario: osrm-routed - Help, long
@@ -62,4 +66,6 @@ Feature: osrm-routed command line options: help
        And stdout should contain "--max-table-size"
        And stdout should contain "--max-table-size"
        And stdout should contain "--max-matching-size"
        And stdout should contain "--default-radius"
        And stdout should contain "--keepalive-timeout"
        And it should exit successfully
@@ -33,6 +33,11 @@ module.exports = function () {
        callback();
    });
    this.Given(/^the data load extra arguments "(.*?)"$/, (args, callback) => {
        this.loaderArgs = this.expandOptions(args);
        callback();
    });
    this.Given(/^a grid size of ([0-9.]+) meters$/, (meters, callback) => {
        this.setGridSize(meters);
        callback();
@@ -5,6 +5,7 @@ var FBResult = require('../support/fbresult_generated').osrm.engine.api.fbresult
 module.exports = function () {
    const durationsRegex = new RegExp(/^I request a travel time matrix I should get$/);
    const durationsCodeOnlyRegex = new RegExp(/^I request a travel time matrix with these waypoints I should get the response code$/);
    const distancesRegex = new RegExp(/^I request a travel distance matrix I should get$/);
    const estimatesRegex = new RegExp(/^I request a travel time matrix I should get estimates for$/);
    const durationsRegexFb = new RegExp(/^I request a travel time matrix with flatbuffers I should get$/);
@@ -17,6 +18,7 @@ module.exports = function () {
    const FORMAT_FB = 'flatbuffers';
    this.When(durationsRegex, function(table, callback) {tableParse.call(this, table, DURATIONS_NO_ROUTE, 'durations', FORMAT_JSON, callback);}.bind(this));
    this.When(durationsCodeOnlyRegex, function(table, callback) {tableCodeOnlyParse.call(this, table, 'durations', FORMAT_JSON, callback);}.bind(this));
    this.When(distancesRegex, function(table, callback) {tableParse.call(this, table, DISTANCES_NO_ROUTE, 'distances', FORMAT_JSON, callback);}.bind(this));
    this.When(estimatesRegex, function(table, callback) {tableParse.call(this, table, DISTANCES_NO_ROUTE, 'fallback_speed_cells', FORMAT_JSON, callback);}.bind(this));
    this.When(durationsRegexFb, function(table, callback) {tableParse.call(this, table, DURATIONS_NO_ROUTE, 'durations', FORMAT_FB, callback);}.bind(this));
@@ -27,6 +29,64 @@ const durationsParse = function(v) { return isNaN(parseInt(v)); };
 const distancesParse = function(v) { return isNaN(parseFloat(v)); };
 const estimatesParse = function(v) { return isNaN(parseFloat(v)); };
 function tableCodeOnlyParse(table, annotation, format, callback) {
    const params = this.queryParams;
    params.annotations = ['durations','fallback_speed_cells'].indexOf(annotation) !== -1 ? 'duration' : 'distance';
    params.output = format;
    var got;
    this.reprocessAndLoadData((e) => {
        if (e) return callback(e);
        var testRow = (row, ri, cb) => {
            var afterRequest = (err, res) => {
                if (err) return cb(err);
                for (var k in row) {
                    var match = k.match(/param:(.*)/);
                    if (match) {
                        if (row[k] === '(nil)') {
                            params[match[1]] = null;
                        } else if (row[k]) {
                            params[match[1]] = [row[k]];
                        }
                        got[k] = row[k];
                    }
                }
                var json;
                got.code = 'unknown';
                if (res.body.length) {
                    json = JSON.parse(res.body);
                    got.code = json.code;
                }
                cb(null, got);
            };
            var params = this.queryParams,
                waypoints = [];
            if (row.waypoints) {
                row.waypoints.split(',').forEach((n) => {
                    var node = this.findNodeByName(n);
                    if (!node) throw new Error(util.format('*** unknown waypoint node "%s"', n.trim()));
                    waypoints.push({ coord: node, type: 'loc' });
                });
                got = { waypoints: row.waypoints };
                this.requestTable(waypoints, params, afterRequest);
            } else {
                throw new Error('*** no waypoints');
            }
        };
        this.processRowsAndDiff(table, testRow, callback);
    });
 }
 function tableParse(table, noRoute, annotation, format, callback) {
    const parse = annotation == 'distances' ? distancesParse : (annotation == 'durations' ? durationsParse : estimatesParse);
@@ -62,9 +122,6 @@ function tableParse(table, noRoute, annotation, format, callback) {
        });
    }
    var actual = [];
    actual.push(table.headers);
    this.reprocessAndLoadData((e) => {
        if (e) return callback(e);
        // compute matrix
@@ -12,35 +12,43 @@ module.exports = function () {
                var inNode = this.findNodeByName(row.in);
                if (!inNode) throw new Error(util.format('*** unknown in-node "%s"', row.in));
                var outNode = this.findNodeByName(row.out);
                if (!outNode) throw new Error(util.format('*** unknown out-node "%s"', row.out));
                this.requestNearest(inNode, this.queryParams, (err, response) => {
                    if (err) return cb(err);
                    var coord;
                    var headers = new Set(table.raw()[0]);
-                    if (response.statusCode === 200 && response.body.length) {
+                    var got = { in: row.in};
                    if (response.body.length) {
                        var json = JSON.parse(response.body);
                        got.code = json.code;
-                        coord = json.waypoints[0].location;
+                        if (response.statusCode === 200) {
-                        var got = { in: row.in, out: row.out };
+                            if (headers.has('data_version')) {
-
+                                got.data_version = json.data_version || '';
                        if (headers.has('data_version')) {
                            got.data_version = json.data_version || '';
                        }
                        Object.keys(row).forEach((key) => {
                            if (key === 'out') {
                                if (this.FuzzyMatch.matchLocation(coord, outNode)) {
                                    got[key] = row[key];
                                } else {
                                    row[key] = util.format('%s [%d,%d]', row[key], outNode.lat, outNode.lon);
                                }
                            }
                        });
                            if (json.waypoints && json.waypoints.length && row.out) {
                                coord = json.waypoints[0].location;
                                got.out = row.out;
                                var outNode = this.findNodeByName(row.out);
                                if (!outNode) throw new Error(util.format('*** unknown out-node "%s"', row.out));
                                Object.keys(row).forEach((key) => {
                                    if (key === 'out') {
                                        if (this.FuzzyMatch.matchLocation(coord, outNode)) {
                                            got[key] = row[key];
                                        } else {
                                            row[key] = util.format('%s [%d,%d]', row[key], outNode.lat, outNode.lon);
                                        }
                                    }
                                });
                            }
                        }
                        cb(null, got);
                    }
                    else {
@@ -91,7 +91,7 @@ module.exports = function () {
                    var encodedResult = '';
-                    if (json.trips) row.trips.split(',').forEach((sub, si) => {
+                    if (json.trips && row.trips) row.trips.split(',').forEach((sub, si) => {
                        if (si >= subTrips.length) {
                            ok = false;
                        } else {
@@ -134,7 +134,6 @@ module.exports = function () {
                } else {
                    var params = this.queryParams,
                        waypoints = [];
                    params['steps'] = 'true';
                    if (row.from && row.to) {
                        var fromNode = this.findNodeByName(row.from);
                        if (!fromNode) throw new Error(util.format('*** unknown from-node "%s"', row.from));
@@ -280,10 +280,11 @@ module.exports = function () {
    };
    this.reprocessAndLoadData = (callback) => {
        let p = {loaderArgs: this.loaderArgs, inputFile: this.processedCacheFile};
        let queue = d3.queue(1);
        queue.defer(this.writeAndLinkOSM.bind(this));
        queue.defer(this.extractContractPartitionAndCustomize.bind(this));
-        queue.defer(this.osrmLoader.load.bind(this.osrmLoader), this.processedCacheFile);
+        queue.defer(this.osrmLoader.load.bind(this.osrmLoader), p);
        queue.awaitAll(callback);
    };
@@ -27,7 +27,8 @@ module.exports = function () {
        this.DEFAULT_ENVIRONMENT = process.env;
        this.DEFAULT_PROFILE = 'bicycle';
        this.DEFAULT_INPUT_FORMAT = 'osm';
-        this.DEFAULT_LOAD_METHOD = process.argv[process.argv.indexOf('-m') +1].match('mmap') ? 'mmap' : 'datastore';
+        let loadMethod = process.argv[process.argv.indexOf('-m') +1];
        this.DEFAULT_LOAD_METHOD = loadMethod.match('mmap') ? 'mmap' : loadMethod.match('directly') ? 'directly' : 'datastore';
        this.DEFAULT_ORIGIN = [1,1];
        this.OSM_USER = 'osrm';
        this.OSM_UID = 1;
@@ -41,7 +42,7 @@ module.exports = function () {
        this.OSRM_PORT = process.env.OSRM_PORT && parseInt(process.env.OSRM_PORT) || 5000;
        this.OSRM_IP = process.env.OSRM_IP || '127.0.0.1';
        this.OSRM_CONNECTION_RETRIES = process.env.OSRM_CONNECTION_RETRIES && parseInt(process.env.OSRM_CONNECTION_RETRIES) || 10;
-        this.OSRM_CONNECTION_EXP_BACKOFF_COEF = process.env.OSRM_CONNECTION_EXP_BACKOFF_COEF && parseFloat(process.env.OSRM_CONNECTION_EXP_BACKOFF_COEF) || 1.0;
+        this.OSRM_CONNECTION_EXP_BACKOFF_COEF = process.env.OSRM_CONNECTION_EXP_BACKOFF_COEF && parseFloat(process.env.OSRM_CONNECTION_EXP_BACKOFF_COEF) || 1.1;
        this.HOST = `http://${this.OSRM_IP}:${this.OSRM_PORT}`;
@@ -37,6 +37,7 @@ module.exports = function () {
        this.contractArgs = '';
        this.partitionArgs = '';
        this.customizeArgs = '';
        this.loaderArgs = '';
        this.environment = Object.assign(this.DEFAULT_ENVIRONMENT);
        this.resetOSM();
@@ -101,7 +101,8 @@ module.exports = function () {
    this.requestTrip = (waypoints, userParams, callback) => {
        var defaults = {
-                output: 'json'
+                output: 'json',
                steps: 'true'
            },
            params = this.overwriteParams(defaults, userParams);
@@ -40,7 +40,7 @@ Feature: Alternative route
            | 7    | 8  | ca,ab,bd,dc,ca,ca |             |
-    @mld-only
+    @mld
    Scenario: Alternative loop paths on a single node with an asymmetric circle
        # The test checks only MLD implementation, alternatives results are unpredictable for CH on windows (#4691, #4693)
        Given a grid size of 10 meters
@@ -115,4 +115,4 @@ Feature: Annotations
        When I route I should get
            | from | to | route    | a:speed | a:distance            | a:duration | a:nodes |
-            | a    | c  | abc,abc  | 10:10   | 249.987618946:299.962882039 | 25:30      | 1:2:3   |
+            | a    | c  | abc,abc  | 10:10   | 249.9876189:299.962882 | 25:30      | 1:2:3   |
@@ -38,7 +38,41 @@ Feature: Approach parameter
            | from | to | approaches        | route    |
            | s    | e  | unrestricted curb | ab,bc,bc |
-    Scenario: Start End opposite approach, option unrestricted for Start and End
+    Scenario: Start End same approach, option unrestricted for Start and opposite for End
        Given the profile "testbot"
        And the node map
            """
               s        e
            a------b------c
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
        When I route I should get
            | from | to | approaches            | route |
            | s    | e  | unrestricted opposite | ab,bc |
    Scenario: Start End same approach, option opposite for Start and curb for End
        Given the profile "testbot"
        And the node map
            """
               s        e
            a------b------c
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
        When I route I should get
            | from | to | approaches            | route    |
            | s    | e  | opposite curb         | ab,bc,bc |
    Scenario: Start End different approach, option unrestricted for Start and End
        Given the profile "testbot"
        And the node map
            """
@@ -56,7 +90,7 @@ Feature: Approach parameter
            | from | to | approaches                | route |
            | s    | e  | unrestricted unrestricted | ab,bc |
-    Scenario: Start End opposite approach, option unrestricted for Start and curb for End
+    Scenario: Start End different approach, option unrestricted for Start and curb for End
        Given the profile "testbot"
        And the node map
            """
@@ -74,6 +108,43 @@ Feature: Approach parameter
            | from | to | approaches        | route |
            | s    | e  | unrestricted curb | ab,bc |
    Scenario: Start End different approach, option unrestricted for Start and opposite for End
        Given the profile "testbot"
        And the node map
            """
               s
            a------b------c
                        e
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
        When I route I should get
            | from | to | approaches            | route    |
            | s    | e  | unrestricted opposite | ab,bc,bc |
    Scenario: Start End different approach, option curb for Start and opposite for End
        Given the profile "testbot"
        And the node map
            """
               e
            a------b------c-----------d
                              s
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
            | cd    |
        When I route I should get
            | from | to | approaches    | route       |
            | s    | e  | curb opposite | cd,cd,ab,ab |
    ###############
    # Oneway Test #
@@ -111,10 +182,44 @@ Feature: Approach parameter
            | bc    | yes    |
        When I route I should get
-            | from | to | approaches        | route    |
+            | from | to | approaches        | route |
            | s    | e  | unrestricted curb | ab,bc |
-    Scenario: Test on oneway segment, Start End opposite approach, option unrestricted for Start and End
+    Scenario: Test on oneway segment, Start End same approach, option unrestricted for Start and opposite for End
        Given the profile "testbot"
        And the node map
            """
               s        e
            a------b------c
            """
        And the ways
            | nodes | oneway |
            | ab    | yes    |
            | bc    | yes    |
        When I route I should get
            | from | to | approaches            | route |
            | s    | e  | unrestricted opposite | ab,bc |
    Scenario: Test on oneway segment, Start End same approach, option opposite for Start and curb for End
        Given the profile "testbot"
        And the node map
            """
               s        e
            a------b------c
            """
        And the ways
            | nodes | oneway |
            | ab    | yes    |
            | bc    | yes    |
        When I route I should get
            | from | to | approaches    | route |
            | s    | e  | opposite curb | ab,bc |
    Scenario: Test on oneway segment, Start End different approach, option unrestricted for Start and End
        Given the profile "testbot"
        And the node map
            """
@@ -132,7 +237,7 @@ Feature: Approach parameter
            | from | to | approaches                | route |
            | s    | e  | unrestricted unrestricted | ab,bc |
-    Scenario: Test on oneway segment, Start End opposite approach, option unrestricted for Start and curb for End
+    Scenario: Test on oneway segment, Start End different approach, option unrestricted for Start and curb for End
        Given the profile "testbot"
        And the node map
            """
@@ -150,6 +255,42 @@ Feature: Approach parameter
            | from | to | approaches        | route |
            | s    | e  | unrestricted curb | ab,bc |
    Scenario: Test on oneway segment, Start End different approach, option unrestricted for Start and opposite for End
        Given the profile "testbot"
        And the node map
            """
               s
            a------b------c
                        e
            """
        And the ways
            | nodes | oneway |
            | ab    | yes    |
            | bc    | yes    |
        When I route I should get
            | from | to | approaches            | route |
            | s    | e  | unrestricted opposite | ab,bc |
    Scenario: Test on oneway segment, Start End different approach, option curb for Start and opposite for End
        Given the profile "testbot"
        And the node map
            """
               s
            a------b------c
                        e
            """
        And the ways
            | nodes | oneway |
            | ab    | yes    |
            | bc    | yes    |
        When I route I should get
            | from | to | approaches    | route |
            | s    | e  | curb opposite | ab,bc |
    ##############
    # UTurn Test #
    ##############
@@ -175,6 +316,27 @@ Feature: Approach parameter
            | from | to | approaches        | route |
            | s    | e  | unrestricted curb |       |
    Scenario: UTurn test, router can find a route because uturn authorized to reach opposite side
        Given the profile "testbot"
        And the node map
            """
               e        s
            a------b------c
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
        And the relations
            | type        | way:from | way:to | node:via | restriction |
            | restriction | bc       | bc     | c        | no_u_turn   |
        When I route I should get
            | from | to | approaches    | route     |
            | s    | e  | curb opposite | bc,ab,ab  |
    Scenario: UTurn test, router can find a route because he can use the roundabout
        Given the profile "testbot"
@@ -198,8 +360,9 @@ Feature: Approach parameter
            | restriction | bc       | bc     | c        | no_u_turn   |
        When I route I should get
-            | from | to | approaches        | route    |
+            | from | to | approaches         | route    |
-            | s    | e  | unrestricted curb | ab,bc,bc |
+            | s    | e  | unrestricted curb  | ab,bc,bc |
            | s    | e  | opposite curb      | ab,bc,bc |
    Scenario: Start End same approach, option unrestricted for Start and curb for End, left-hand driving
@@ -228,6 +391,32 @@ Feature: Approach parameter
            | from | to | approaches        | route |
            | s    | e  | unrestricted curb | ab,bc |
    Scenario: Start End same approach, option unrestricted for Start and opposite for End, left-hand driving
        Given the profile file
        """
        local functions = require('testbot')
        local testbot_process_way = functions.process_way
        functions.process_way = function(profile, way, result)
          testbot_process_way(profile, way, result)
          result.is_left_hand_driving = true
        end
        return functions
        """
        And the node map
            """
               s        e
            a------b------c
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
        When I route I should get
            | from | to | approaches            | route    |
            | s    | e  | unrestricted opposite | ab,bc,bc |
    #######################
    # Left-side countries #
@@ -260,9 +449,8 @@ Feature: Approach parameter
        """
        And the node map
            """
-               s
+               s       e
            a------b------c
                       e
            """
        And the ways
@@ -271,10 +459,50 @@ Feature: Approach parameter
            | bc    |
        When I route I should get
-            | from | to | approaches        | route    |
+            | from | to | approaches        | route |
-            | s    | e  | unrestricted curb | ab,bc,bc |
+            | s    | e  | unrestricted curb | ab,bc |
-    Scenario: [Left-hand-side] Start End opposite approach, option unrestricted for Start and End
+    Scenario: [Left-hand-side] Start End same approach, option unrestricted for Start and opposite for End
        Given the profile file "car" initialized with
        """
        profile.properties.left_hand_driving = true
        """
        And the node map
            """
               s       e
            a------b------c
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
        When I route I should get
            | from | to | approaches             | route    |
            | s    | e  | unrestricted opposite  | ab,bc,bc |
    Scenario: [Left-hand-side] Start End same approach, option opposite for Start and curb for End
        Given the profile file "car" initialized with
        """
        profile.properties.left_hand_driving = true
        """
        And the node map
            """
               e      s
            a------b------c
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
        When I route I should get
            | from | to | approaches     | route    |
            | s    | e  | opposite curb  | bc,ab,ab |
    Scenario: [Left-hand-side] Start End different approach, option unrestricted for Start and End
        Given the profile file "car" initialized with
        """
        profile.properties.left_hand_driving = true
@@ -295,15 +523,16 @@ Feature: Approach parameter
            | from | to | approaches                | route |
            | s    | e  | unrestricted unrestricted | ab,bc |
-    Scenario: [Left-hand-side] Start End opposite approach, option unrestricted for Start and curb for End
+    Scenario: [Left-hand-side] Start End different approach, option unrestricted for Start and curb for End
        Given the profile file "car" initialized with
        """
        profile.properties.left_hand_driving = true
        """
        And the node map
            """
-               s      e
+               s
            a------b------c
                      e
            """
        And the ways
@@ -312,5 +541,122 @@ Feature: Approach parameter
            | bc    |
        When I route I should get
-            | from | to | approaches        | route |
+            | from | to | approaches        | route    |
-            | s    | e  | unrestricted curb | ab,bc |
+            | s    | e  | unrestricted curb | ab,bc,bc |
    Scenario: [Left-hand-side] Start End different approach, option unrestricted for Start and opposite for End
        Given the profile file "car" initialized with
        """
        profile.properties.left_hand_driving = true
        """
        And the node map
            """
               s
            a------b------c
                      e
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
        When I route I should get
            | from | to | approaches            | route |
            | s    | e  | unrestricted opposite | ab,bc |
    Scenario: [Left-hand-side] Start End different approach, option curb for Start and opposite for End
        Given the profile file "car" initialized with
        """
        profile.properties.left_hand_driving = true
        """
        And the node map
            """
               s
            a------b------c
                      e
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
        When I route I should get
            | from | to | approaches       | route |
            | s    | e  | curb opposite    | ab,bc |
    Scenario: Routes with more than two waypoints - uturns allowed
        Given the profile "testbot"
        And the node map
            """
               2                 1
            a------b------c-----------d
                   |
               3   |             4
            e------f------g-----------h
            |
            |
            i
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
            | cd    |
            | bf    |
            | ef    |
            | fg    |
            | gh    |
            | ei    |
        And the query options
            | continue_straight | false |
        When I route I should get
            | waypoints | approaches                                  | locations             | #                                                   |
            | 1,2,3,4   | curb curb curb curb                         | _,_,_,a,b,f,_,_,i,h,_ | 1,2,2,a,b,f,3,3,i,h,4 (Only u-turn at end of roads) |
            | 1,2,3,4   | curb unrestricted unrestricted curb         | _,_,_,b,f,_,_,h,_     | 1,2,2,b,f,3,3,h,4     (Can u-turn at 2 and 3)       |
            | 1,2,3,4   | opposite opposite opposite opposite         | _,d,a,_,_,b,f,i,_,_,_ | 1,d,a,2,2,b,f,i,3,3,4 (Only u-turn at end of roads) |
            | 1,2,3,4   | opposite unrestricted unrestricted opposite | _,d,_,_,b,f,_,_,_     | 1,d,2,2,b,f,3,3,4     (Can u-turn at 2 and 3)       |
    Scenario: Routes with more than two waypoints - uturns forbidden
        Given the profile "testbot"
        And the node map
            """
               2                 1
            a------b------c-----------d
                   |
               3   |             4
            e------f------g-----------h
            |
            |
            i
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
            | cd    |
            | bf    |
            | ef    |
            | fg    |
            | gh    |
            | ei    |
        And the query options
            | continue_straight | true |
        When I route I should get
            | waypoints | approaches                                  |  locations            | #                                                   |
            | 1,2,3,4   | curb curb curb curb                         | _,_,_,a,b,f,_,_,i,h,_ | 1,2,2,a,b,f,3,3,i,h,4 (Only u-turn at end of roads) |
            | 1,2,3,4   | curb opposite opposite curb                 | _,a,_,_,b,f,i,_,_,h,_ | 1,a,2,2,b,f,i,3,3,h,4 (switches stops with u-turns) |
            | 1,2,3,4   | opposite opposite opposite opposite         | _,d,a,_,_,b,f,i,_,_,_ | 1,d,a,2,2,b,f,i,3,3,4 (Only u-turn at end of roads) |
            | 1,2,3,4   | opposite curb curb opposite                 | _,d,_,_,a,b,f,_,_,i,_ | 1,d,2,2,a,b,f,3,3,i,4 (switches stops with u-turns) |
@@ -0,0 +1,101 @@
@routing @testbot @via
 Feature: Force routing steps
    Background:
        Given the profile "testbot"
    Scenario: Direct routes with waypoints on same edge
        Given the node map
            """
              1   2
            a-------b
            |       |
            d-------c
            |       |
            e-------f
              3   4
            """
        And the ways
            | nodes | oneway |
            | ab    | no     |
            | ad    | no     |
            | bc    | no     |
            | cf    | no     |
            | dc    | no     |
            | de    | no     |
            | ef    | yes    |
        When I route I should get
            | waypoints | approaches        | weight | route          |
            | 1,2       |                   | 20     | ab,ab          |
            | 1,2       | curb curb         | 100    | ab,ad,dc,bc,ab |
            | 2,1       |                   | 20     | ab,ab          |
            | 2,1       | opposite opposite | 100    | ab,bc,dc,ad,ab |
            | 3,4       |                   | 20     | ef,ef          |
            | 4,3       |                   | 100    | ef,cf,dc,de,ef |
    Scenario: Via routes with waypoints on same edge
        Given the node map
            """
              1   2
            a-------b
            |       |
            d-5-----c
            |       |
            e-------f
              3   4
            """
        And the ways
            | nodes | oneway |
            | ab    | no     |
            | ad    | no     |
            | bc    | no     |
            | cf    | no     |
            | dc    | no     |
            | de    | no     |
            | ef    | yes    |
        When I route I should get
            | waypoints | approaches                     | weight | route                      |
            | 5,1,2     |                                | 59.8   | dc,ad,ab,ab,ab             |
            | 5,1,2     | unrestricted curb curb         | 180.2  | dc,bc,ab,ab,ab,ad,dc,bc,ab |
            | 5,2,1     |                                | 80.2   | dc,bc,ab,ab,ab             |
            | 5,2,1     | unrestricted opposite opposite | 159.8  | dc,ad,ab,ab,ab,bc,dc,ad,ab |
            | 5,3,4     |                                | 59.8   | dc,de,ef,ef,ef             |
            | 5,4,3     |                                | 159.8  | dc,de,ef,ef,ef,cf,dc,de,ef |
    Scenario: [U-turns allowed] Via routes with waypoints on same edge
        Given the node map
            """
              1   2
            a-------b
            |       |
            d-5-----c
            |       |
            e-------f
              3   4
            """
        And the ways
            | nodes | oneway |
            | ab    | no     |
            | ad    | no     |
            | bc    | no     |
            | cf    | no     |
            | dc    | no     |
            | de    | no     |
            | ef    | yes    |
        And the query options
            | continue_straight | false |
        When I route I should get
            | waypoints | approaches                     | weight | route                      |
            | 5,1,2     |                                | 59.8   | dc,ad,ab,ab,ab             |
            | 5,1,2     | unrestricted curb curb         | 180.2  | dc,bc,ab,ab,ab,ad,dc,bc,ab |
            | 5,2,1     |                                | 79.8   | dc,ad,ab,ab,ab,ab          |
            | 5,2,1     | unrestricted opposite opposite | 159.8  | dc,ad,ab,ab,ab,bc,dc,ad,ab |
            | 5,3,4     |                                | 59.8   | dc,de,ef,ef,ef             |
            | 5,4,3     |                                | 159.8  | dc,de,ef,ef,ef,cf,dc,de,ef |
@@ -810,6 +810,6 @@ Feature: Basic Map Matching
        # These should have the same weights/duration in either direction
        When I match I should get
          | trace | geometry             | a:distance    | a:duration | a:weight | duration |
-          | 2345  | 1.00018,1,1.000314,1 | 14.914666491  | 1.4        | 1.4      | 1.4      |
+          | 2345  | 1.00018,1,1.000314,1 | 14.91466649  | 1.4        | 1.4      | 1.4      |
-          | 4321  | 1.00027,1,1.000135,1 | 15.025969972  | 1.5        | 1.5      | 1.5      |
+          | 4321  | 1.00027,1,1.000135,1 | 15.02596997  | 1.5        | 1.5      | 1.5      |
@@ -570,7 +570,7 @@ Feature: Snapping at intersections
            | a,f,k     | ac,cf,cf,fj,kj,kj     | 132.8s | 132.8  |
            | k,f       | ik,fi,fi              | 54.3s  | 54.3   |
            | f,a       | ef,ae,ae              | 66.6s  | 66.6   |
-            | k,f,a     | kj,fj,fj,ef,ae,ae     | 141.399999999s | 141.399999999  |
+            | k,f,a     | kj,fj,fj,ef,ae,ae     | 141.4s | 141.4  |
        When I request a travel time matrix I should get
            |   |  a    |   f  |     k |
@@ -626,4 +626,4 @@ Feature: Snapping at intersections
            | a,f,k     | ad,df,df,fj,kj,kj    | 105.6s | 105.6  |
            | k,f       | ik,fi,fi             | 54.3s  | 54.3   |
            | f,a       | ef,ae,ae             | 66.6s  | 66.6   |
-            | k,f,a     | ik,fi,fi,ef,ae,ae    | 120.899999999s | 120.899999999  |
+            | k,f,a     | ik,fi,fi,ef,ae,ae    | 120.9s | 120.9  |
@@ -53,10 +53,10 @@ Feature: Weight tests
        When I route I should get
            | waypoints | route   | distances | weights | times   | a:distance                | a:duration | a:weight | a:speed |
-            | s,t       | abc,abc | 20m,0m    | 2,0     | 2s,0s   | 20.034626629              | 2          | 2        | 10      |
+            | s,t       | abc,abc | 20m,0m    | 2,0     | 2s,0s   | 20.03462663              | 2          | 2        | 10      |
-            | t,s       | abc,abc | 20m,0m    | 2,0     | 2s,0s   | 20.034626629              | 2          | 2        | 10      |
+            | t,s       | abc,abc | 20m,0m    | 2,0     | 2s,0s   | 20.03462663              | 2          | 2        | 10      |
-            | s,e       | abc,abc | 40m,0m    | 3.9,0   | 3.9s,0s | 29.940636463:10.017313314 | 3:0.9      | 3:0.9    | 10:11.1  |
+            | s,e       | abc,abc | 40m,0m    | 3.9,0   | 3.9s,0s | 29.94063646:10.01731331 | 3:0.9      | 3:0.9    | 10:11.1  |
-            | e,s       | abc,abc | 40m,0m    | 3.9,0   | 3.9s,0s | 10.017313314:29.940636463 | 0.9:3      | 0.9:3    | 11.1:10  |
+            | e,s       | abc,abc | 40m,0m    | 3.9,0   | 3.9s,0s | 10.01731331:29.94063646 | 0.9:3      | 0.9:3    | 11.1:10  |
    Scenario: Step weights -- way_function: fail if no weight or weight_per_meter property
@@ -7,9 +7,7 @@
 #include "contractor/graph_contractor_adaptors.hpp"
 #include "contractor/query_graph.hpp"
-namespace osrm
+namespace osrm::contractor
 {
 namespace contractor
 {
 using GraphAndFilter = std::tuple<QueryGraph, std::vector<std::vector<bool>>>;
@@ -63,10 +61,12 @@ inline auto contractExcludableGraph(ContractorGraph contractor_graph_,
        // Add all non-core edges to container
        {
            auto non_core_edges = toEdges<QueryEdge>(contractor_graph);
-            auto new_end =
+            auto new_end = std::remove_if(non_core_edges.begin(),
-                std::remove_if(non_core_edges.begin(), non_core_edges.end(), [&](const auto &edge) {
+                                          non_core_edges.end(),
-                    return is_shared_core[edge.source] && is_shared_core[edge.target];
+                                          [&](const auto &edge) {
-                });
+                                              return is_shared_core[edge.source] &&
                                                     is_shared_core[edge.target];
                                          });
            non_core_edges.resize(new_end - non_core_edges.begin());
            edge_container.Insert(std::move(non_core_edges));
@@ -77,8 +77,8 @@ inline auto contractExcludableGraph(ContractorGraph contractor_graph_,
        }
        // Extract core graph for further contraction
-        shared_core_graph = contractor_graph.Filter(
+        shared_core_graph = contractor_graph.Filter([&is_shared_core](const NodeID node)
-            [&is_shared_core](const NodeID node) { return is_shared_core[node]; });
+                                                    { return is_shared_core[node]; });
    }
    for (const auto &filter : filters)
@@ -94,7 +94,6 @@ inline auto contractExcludableGraph(ContractorGraph contractor_graph_,
    return GraphAndFilter{QueryGraph{num_nodes, edge_container.edges},
                          edge_container.MakeEdgeFilters()};
 }
-} // namespace contractor
+} // namespace osrm::contractor
 } // namespace osrm
 #endif
@@ -14,9 +14,7 @@
 #include <numeric>
 #include <vector>
-namespace osrm
+namespace osrm::contractor
 {
 namespace contractor
 {
 struct ContractedEdgeContainer
@@ -91,37 +89,40 @@ struct ContractedEdgeContainer
        // Remove all edges that are contained in the old set of edges and set the appropriate flag.
        auto new_end =
-            std::remove_if(new_edges.begin(), new_edges.end(), [&](const QueryEdge &edge) {
+            std::remove_if(new_edges.begin(),
-                // check if the new edge would be sorted before the currend old edge
+                           new_edges.end(),
-                // if so it is not contained yet in the set of old edges
+                           [&](const QueryEdge &edge)
-                if (edge_iter == edge_end || mergeCompare(edge, *edge_iter))
+                           {
-                {
+                               // check if the new edge would be sorted before the currend old edge
-                    return false;
+                               // if so it is not contained yet in the set of old edges
-                }
+                               if (edge_iter == edge_end || mergeCompare(edge, *edge_iter))
                               {
                                   return false;
                               }
-                // find the first old edge that is equal or greater then the new edge
+                               // find the first old edge that is equal or greater then the new edge
-                while (edge_iter != edge_end && mergeCompare(*edge_iter, edge))
+                               while (edge_iter != edge_end && mergeCompare(*edge_iter, edge))
-                {
+                               {
-                    BOOST_ASSERT(flags_iter != flags.end());
+                                   BOOST_ASSERT(flags_iter != flags.end());
-                    edge_iter++;
+                                   edge_iter++;
-                    flags_iter++;
+                                   flags_iter++;
-                }
+                               }
-                // all new edges will be sorted after the old edges
+                               // all new edges will be sorted after the old edges
-                if (edge_iter == edge_end)
+                               if (edge_iter == edge_end)
-                {
+                               {
-                    return false;
+                                   return false;
-                }
+                               }
-                BOOST_ASSERT(edge_iter != edge_end);
+                               BOOST_ASSERT(edge_iter != edge_end);
-                if (mergable(edge, *edge_iter))
+                               if (mergable(edge, *edge_iter))
-                {
+                               {
-                    *flags_iter = *flags_iter | flag;
+                                   *flags_iter = *flags_iter | flag;
-                    return true;
+                                   return true;
-                }
+                               }
-                BOOST_ASSERT(mergeCompare(edge, *edge_iter));
+                               BOOST_ASSERT(mergeCompare(edge, *edge_iter));
-                return false;
+                               return false;
-            });
+                           });
        // append new edges
        edges.insert(edges.end(), new_edges.begin(), new_end);
@@ -134,10 +135,10 @@ struct ContractedEdgeContainer
        // enforce sorting for next merge step
        std::vector<unsigned> ordering(edges_size);
        std::iota(ordering.begin(), ordering.end(), 0);
-        tbb::parallel_sort(
+        tbb::parallel_sort(ordering.begin(),
-            ordering.begin(), ordering.end(), [&](const auto lhs_idx, const auto rhs_idx) {
+                           ordering.end(),
-                return mergeCompare(edges[lhs_idx], edges[rhs_idx]);
+                           [&](const auto lhs_idx, const auto rhs_idx)
-            });
+                           { return mergeCompare(edges[lhs_idx], edges[rhs_idx]); });
        auto permutation = util::orderingToPermutation(ordering);
        util::inplacePermutation(edges.begin(), edges.end(), permutation);
@@ -164,7 +165,6 @@ struct ContractedEdgeContainer
    std::vector<MergedFlags> flags;
    std::vector<QueryEdge> edges;
 };
-} // namespace contractor
+} // namespace osrm::contractor
 } // namespace osrm
 #endif
@@ -3,9 +3,7 @@
 #include "contractor/query_graph.hpp"
-namespace osrm
+namespace osrm::contractor
 {
 namespace contractor
 {
 namespace detail
@@ -19,7 +17,6 @@ template <storage::Ownership Ownership> struct ContractedMetric
 using ContractedMetric = detail::ContractedMetric<storage::Ownership::Container>;
 using ContractedMetricView = detail::ContractedMetric<storage::Ownership::View>;
-} // namespace contractor
+} // namespace osrm::contractor
 } // namespace osrm
 #endif
@@ -30,9 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "contractor/contractor_config.hpp"
-namespace osrm
+namespace osrm::contractor
 {
 namespace contractor
 {
 /// Base class of osrm-contract
@@ -49,7 +47,6 @@ class Contractor
  private:
    ContractorConfig config;
 };
-} // namespace contractor
+} // namespace osrm::contractor
 } // namespace osrm
 #endif // PROCESSING_CHAIN_HPP
@@ -31,13 +31,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "storage/io_config.hpp"
 #include "updater/updater_config.hpp"
-#include <boost/filesystem/path.hpp>
+#include <filesystem>
 #include <string>
-namespace osrm
+namespace osrm::contractor
 {
 namespace contractor
 {
 struct ContractorConfig final : storage::IOConfig
@@ -49,7 +46,7 @@ struct ContractorConfig final : storage::IOConfig
    }
    // Infer the output names from the path of the .osrm file
-    void UseDefaultOutputNames(const boost::filesystem::path &base)
+    void UseDefaultOutputNames(const std::filesystem::path &base)
    {
        IOConfig::UseDefaultOutputNames(base);
        updater_config.UseDefaultOutputNames(base);
@@ -71,7 +68,6 @@ struct ContractorConfig final : storage::IOConfig
    //(e.g. 0.8 contracts 80 percent of the hierarchy, leaving a core of 20%)
    double core_factor = 1.0;
 };
-} // namespace contractor
+} // namespace osrm::contractor
 } // namespace osrm
 #endif // EXTRACTOR_OPTIONS_HPP
@@ -4,20 +4,18 @@
 #include "util/dynamic_graph.hpp"
 #include <algorithm>
-namespace osrm
+namespace osrm::contractor
 {
 namespace contractor
 {
 struct ContractorEdgeData
 {
    ContractorEdgeData()
-        : weight(0), duration(0), distance(0), id(0), originalEdges(0), shortcut(0), forward(0),
+        : weight{0}, duration{0}, distance{0}, id(0), originalEdges(0), shortcut(0), forward(0),
          backward(0)
    {
    }
    ContractorEdgeData(EdgeWeight weight,
-                       EdgeWeight duration,
+                       EdgeDuration duration,
                       EdgeDistance distance,
                       unsigned original_edges,
                       unsigned id,
@@ -30,7 +28,7 @@ struct ContractorEdgeData
    {
    }
    EdgeWeight weight;
-    EdgeWeight duration;
+    EdgeDuration duration;
    EdgeDistance distance;
    unsigned id;
    unsigned originalEdges : 29;
@@ -42,7 +40,6 @@ struct ContractorEdgeData
 using ContractorGraph = util::DynamicGraph<ContractorEdgeData>;
 using ContractorEdge = ContractorGraph::InputEdge;
-} // namespace contractor
+} // namespace osrm::contractor
 } // namespace osrm
 #endif // OSRM_CONTRACTOR_CONTRACTOR_GRAPH_HPP_
@@ -5,9 +5,7 @@
 #include "util/typedefs.hpp"
 #include "util/xor_fast_hash_storage.hpp"
-namespace osrm
+namespace osrm::contractor
 {
 namespace contractor
 {
 struct ContractorHeapData
 {
@@ -24,7 +22,6 @@ using ContractorHeap = util::QueryHeap<NodeID,
                                       ContractorHeapData,
                                       util::XORFastHashStorage<NodeID, NodeID>>;
-} // namespace contractor
+} // namespace osrm::contractor
 } // namespace osrm
 #endif // OSRM_CONTRACTOR_CONTRACTOR_HEAP_HPP_
@@ -8,9 +8,7 @@
 #include <cstddef>
-namespace osrm
+namespace osrm::contractor
 {
 namespace contractor
 {
 void search(ContractorHeap &heap,
@@ -20,7 +18,6 @@ void search(ContractorHeap &heap,
            const EdgeWeight weight_limit,
            const NodeID forbidden_node);
-} // namespace contractor
+} // namespace osrm::contractor
 } // namespace osrm
 #endif // OSRM_CONTRACTOR_DIJKSTRA_HPP
@@ -1,131 +0,0 @@
 #ifndef ITERATOR_BASED_CRC32_H
 #define ITERATOR_BASED_CRC32_H
 #if defined(__x86_64__) && !defined(__MINGW64__)
 #include <cpuid.h>
 #endif
 #include <boost/crc.hpp> // for boost::crc_32_type
 #include <iterator>
 namespace osrm
 {
 namespace contractor
 {
 class IteratorbasedCRC32
 {
  public:
    bool UsingHardware() const { return use_hardware_implementation; }
    IteratorbasedCRC32() : crc(0) { use_hardware_implementation = DetectHardwareSupport(); }
    template <class Iterator> unsigned operator()(Iterator iter, const Iterator end)
    {
        unsigned crc = 0;
        while (iter != end)
        {
            using value_type = typename std::iterator_traits<Iterator>::value_type;
            const char *data = reinterpret_cast<const char *>(&(*iter));
            if (use_hardware_implementation)
            {
                crc = ComputeInHardware(data, sizeof(value_type));
            }
            else
            {
                crc = ComputeInSoftware(data, sizeof(value_type));
            }
            ++iter;
        }
        return crc;
    }
  private:
    bool DetectHardwareSupport() const
    {
        static const int sse42_bit = 0x00100000;
        const unsigned ecx = cpuid();
        const bool sse42_found = (ecx & sse42_bit) != 0;
        return sse42_found;
    }
    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 ComputeInHardware(const char *str, unsigned len)
    {
 #if defined(__x86_64__)
        unsigned q = len / sizeof(unsigned);
        unsigned r = len % sizeof(unsigned);
        unsigned *p = (unsigned *)str;
        // crc=0;
        while (q--)
        {
            __asm__ __volatile__(".byte 0xf2, 0xf, 0x38, 0xf1, 0xf1;"
                                 : "=S"(crc)
                                 : "0"(crc), "c"(*p));
            ++p;
        }
        str = reinterpret_cast<char *>(p);
        while (r--)
        {
            __asm__ __volatile__(".byte 0xf2, 0xf, 0x38, 0xf1, 0xf1;"
                                 : "=S"(crc)
                                 : "0"(crc), "c"(*str));
            ++str;
        }
 #else
        (void)str;
        (void)len;
 #endif
        return crc;
    }
    inline unsigned cpuid() const
    {
        unsigned eax = 0, ebx = 0, ecx = 0, edx = 0;
        // on X64 this calls hardware cpuid(.) instr. otherwise a dummy impl.
        __get_cpuid(1, &eax, &ebx, &ecx, &edx);
        return ecx;
    }
 #if defined(__MINGW64__) || defined(_MSC_VER) || !defined(__x86_64__)
    inline void __get_cpuid(int /*param*/,
                            unsigned * /*eax*/,
                            unsigned * /*ebx*/,
                            unsigned *ecx,
                            unsigned * /*edx*/) const
    {
        *ecx = 0;
    }
 #endif
    boost::crc_optimal<32, 0x1EDC6F41, 0x0, 0x0, true, true> crc_processor;
    unsigned crc;
    bool use_hardware_implementation;
 };
 struct RangebasedCRC32
 {
    template <typename Iteratable> unsigned operator()(const Iteratable &iterable)
    {
        return crc32(std::begin(iterable), std::end(iterable));
    }
    bool UsingHardware() const { return crc32.UsingHardware(); }
  private:
    IteratorbasedCRC32 crc32;
 };
 } // namespace contractor
 } // namespace osrm
 #endif /* ITERATOR_BASED_CRC32_H */
@@ -5,15 +5,11 @@
 #include <unordered_map>
-namespace osrm
+namespace osrm::contractor::files
 {
 namespace contractor
 {
 namespace files
 {
 // reads .osrm.hsgr file
 template <typename ContractedMetricT>
-inline void readGraph(const boost::filesystem::path &path,
+inline void readGraph(const std::filesystem::path &path,
                      std::unordered_map<std::string, ContractedMetricT> &metrics,
                      std::uint32_t &connectivity_checksum)
 {
@@ -34,7 +30,7 @@ inline void readGraph(const boost::filesystem::path &path,
 // writes .osrm.hsgr file
 template <typename ContractedMetricT>
-inline void writeGraph(const boost::filesystem::path &path,
+inline void writeGraph(const std::filesystem::path &path,
                       const std::unordered_map<std::string, ContractedMetricT> &metrics,
                       const std::uint32_t connectivity_checksum)
 {
@@ -52,8 +48,6 @@ inline void writeGraph(const boost::filesystem::path &path,
        serialization::write(writer, "/ch/metrics/" + pair.first, pair.second);
    }
 }
-} // namespace files
+} // namespace osrm::contractor::files
 } // namespace contractor
 } // namespace osrm
 #endif
@@ -8,9 +8,7 @@
 #include <tuple>
 #include <vector>
-namespace osrm
+namespace osrm::contractor
 {
 namespace contractor
 {
 std::vector<bool> contractGraph(ContractorGraph &graph,
@@ -37,7 +35,6 @@ inline auto contractGraph(ContractorGraph &graph,
        graph, {}, std::move(node_is_contractable), std::move(node_weights), core_factor);
 }
-} // namespace contractor
+} // namespace osrm::contractor
 } // namespace osrm
 #endif // OSRM_CONTRACTOR_GRAPH_CONTRACTOR_HPP
@@ -10,9 +10,7 @@
 #include <vector>
-namespace osrm
+namespace osrm::contractor
 {
 namespace contractor
 {
 // Make sure to move in the input edge list!
@@ -29,18 +27,20 @@ ContractorGraph toContractorGraph(NodeID number_of_nodes, InputEdgeContainer inp
 #ifndef NDEBUG
        const unsigned int constexpr DAY_IN_DECI_SECONDS = 24 * 60 * 60 * 10;
-        if (static_cast<unsigned int>(std::max(input_edge.data.weight, 1)) > DAY_IN_DECI_SECONDS)
+        if (from_alias<unsigned int>(std::max(input_edge.data.weight, EdgeWeight{1})) >
            DAY_IN_DECI_SECONDS)
        {
            util::Log(logWARNING) << "Edge weight large -> "
-                                  << static_cast<unsigned int>(std::max(input_edge.data.weight, 1))
+                                  << from_alias<unsigned int>(
                                         std::max(input_edge.data.weight, EdgeWeight{1}))
                                  << " : " << static_cast<unsigned int>(input_edge.source) << " -> "
                                  << static_cast<unsigned int>(input_edge.target);
        }
 #endif
        edges.emplace_back(input_edge.source,
                           input_edge.target,
-                           std::max(input_edge.data.weight, 1),
+                           std::max(input_edge.data.weight, {1}),
-                           input_edge.data.duration,
+                           to_alias<EdgeDuration>(input_edge.data.duration),
                           input_edge.data.distance,
                           1,
                           input_edge.data.turn_id,
@@ -50,8 +50,8 @@ ContractorGraph toContractorGraph(NodeID number_of_nodes, InputEdgeContainer inp
        edges.emplace_back(input_edge.target,
                           input_edge.source,
-                           std::max(input_edge.data.weight, 1),
+                           std::max(input_edge.data.weight, {1}),
-                           input_edge.data.duration,
+                           to_alias<EdgeDuration>(input_edge.data.duration),
                           input_edge.data.distance,
                           1,
                           input_edge.data.turn_id,
@@ -109,7 +109,7 @@ ContractorGraph toContractorGraph(NodeID number_of_nodes, InputEdgeContainer inp
        // merge edges (s,t) and (t,s) into bidirectional edge
        if (forward_edge.data.weight == reverse_edge.data.weight)
        {
-            if ((int)forward_edge.data.weight != INVALID_EDGE_WEIGHT)
+            if (forward_edge.data.weight != INVALID_EDGE_WEIGHT)
            {
                forward_edge.data.backward = true;
                edges[edge++] = forward_edge;
@@ -117,11 +117,11 @@ ContractorGraph toContractorGraph(NodeID number_of_nodes, InputEdgeContainer inp
        }
        else
        { // insert seperate edges
-            if (((int)forward_edge.data.weight) != INVALID_EDGE_WEIGHT)
+            if (forward_edge.data.weight != INVALID_EDGE_WEIGHT)
            {
                edges[edge++] = forward_edge;
            }
-            if ((int)reverse_edge.data.weight != INVALID_EDGE_WEIGHT)
+            if (reverse_edge.data.weight != INVALID_EDGE_WEIGHT)
            {
                edges[edge++] = reverse_edge;
            }
@@ -157,7 +157,7 @@ template <class Edge, typename GraphT> inline std::vector<Edge> toEdges(GraphT g
                new_edge.target = target;
                BOOST_ASSERT_MSG(SPECIAL_NODEID != new_edge.target, "Target id invalid");
                new_edge.data.weight = data.weight;
-                new_edge.data.duration = data.duration;
+                new_edge.data.duration = from_alias<EdgeDuration::value_type>(data.duration);
                new_edge.data.distance = data.distance;
                new_edge.data.shortcut = data.shortcut;
                new_edge.data.turn_id = data.id;
@@ -175,7 +175,6 @@ template <class Edge, typename GraphT> inline std::vector<Edge> toEdges(GraphT g
    return edges;
 }
-} // namespace contractor
+} // namespace osrm::contractor
 } // namespace osrm
 #endif // OSRM_CONTRACTOR_GRAPH_CONTRACTION_ADAPTORS_HPP_
@@ -5,9 +5,7 @@
 #include <tuple>
-namespace osrm
+namespace osrm::contractor
 {
 namespace contractor
 {
 struct QueryEdge
@@ -17,15 +15,15 @@ struct QueryEdge
    struct EdgeData
    {
        explicit EdgeData()
-            : turn_id(0), shortcut(false), weight(0), duration(0), forward(false), backward(false),
+            : turn_id(0), shortcut(false), weight{0}, duration(0), forward(false),
-              distance(0)
+              backward(false), distance{0}
        {
        }
        EdgeData(const NodeID turn_id,
                 const bool shortcut,
                 const EdgeWeight weight,
-                 const EdgeWeight duration,
+                 const EdgeDuration duration,
                 const EdgeDistance distance,
                 const bool forward,
                 const bool backward)
@@ -50,7 +48,7 @@ struct QueryEdge
        NodeID turn_id : 31;
        bool shortcut : 1;
        EdgeWeight weight;
-        EdgeWeight duration : 30;
+        EdgeDuration::value_type duration : 30;
        std::uint32_t forward : 1;
        std::uint32_t backward : 1;
        EdgeDistance distance;
@@ -77,7 +75,6 @@ struct QueryEdge
                data.distance == right.data.distance);
    }
 };
-} // namespace contractor
+} // namespace osrm::contractor
 } // namespace osrm
 #endif // QUERYEDGE_HPP
@@ -6,9 +6,7 @@
 #include "util/static_graph.hpp"
 #include "util/typedefs.hpp"
-namespace osrm
+namespace osrm::contractor
 {
 namespace contractor
 {
 namespace detail
@@ -19,7 +17,6 @@ using QueryGraph = util::StaticGraph<typename QueryEdge::EdgeData, Ownership>;
 using QueryGraph = detail::QueryGraph<storage::Ownership::Container>;
 using QueryGraphView = detail::QueryGraph<storage::Ownership::View>;
-} // namespace contractor
+} // namespace osrm::contractor
 } // namespace osrm
 #endif // QUERYEDGE_HPP
@@ -8,11 +8,7 @@
 #include "storage/serialization.hpp"
 #include "storage/tar.hpp"
-namespace osrm
+namespace osrm::contractor::serialization
 {
 namespace contractor
 {
 namespace serialization
 {
 template <storage::Ownership Ownership>
@@ -46,8 +42,6 @@ void read(storage::tar::FileReader &reader,
                                     metric.edge_filter[index]);
    }
 }
-} // namespace serialization
+} // namespace osrm::contractor::serialization
 } // namespace contractor
 } // namespace osrm
 #endif
@@ -10,9 +10,7 @@
 #include <unordered_set>
-namespace osrm
+namespace osrm::customizer
 {
 namespace customizer
 {
 class CellCustomizer
@@ -61,7 +59,7 @@ class CellCustomizer
                }
            }
            heap.Clear();
-            heap.Insert(source, 0, {false, 0, 0});
+            heap.Insert(source, {0}, {false, {0}, {0}});
            // explore search space
            while (!heap.Empty() && !destinations_set.empty())
@@ -124,7 +122,8 @@ class CellCustomizer
        for (std::size_t level = 1; level < partition.GetNumberOfLevels(); ++level)
        {
            tbb::parallel_for(tbb::blocked_range<std::size_t>(0, partition.GetNumberOfCells(level)),
-                              [&](const tbb::blocked_range<std::size_t> &range) {
+                              [&](const tbb::blocked_range<std::size_t> &range)
                              {
                                  auto &heap = heaps.local();
                                  for (auto id = range.begin(), end = range.end(); id != end; ++id)
                                  {
@@ -216,12 +215,11 @@ class CellCustomizer
                                                    partition.GetCell(level - 1, to)))
            {
                const EdgeWeight to_weight = weight + data.weight;
-                const EdgeDuration to_duration = duration + data.duration;
+                const EdgeDuration to_duration = duration + to_alias<EdgeDuration>(data.duration);
                const EdgeDistance to_distance = distance + data.distance;
                if (!heap.WasInserted(to))
                {
-                    heap.Insert(
+                    heap.Insert(to, to_weight, {false, to_duration, to_distance});
                        to, to_weight, {false, duration + data.duration, distance + data.distance});
                }
                else if (std::tie(to_weight, to_duration, to_distance) <
                         std::tie(
@@ -236,7 +234,6 @@ class CellCustomizer
    const partitioner::MultiLevelPartition &partition;
 };
-} // namespace customizer
+} // namespace osrm::customizer
 } // namespace osrm
 #endif // OSRM_CELLS_CUSTOMIZER_HPP
@@ -7,9 +7,7 @@
 #include "util/typedefs.hpp"
 #include "util/vector_view.hpp"
-namespace osrm
+namespace osrm::customizer
 {
 namespace customizer
 {
 namespace detail
 {
@@ -26,7 +24,6 @@ template <storage::Ownership Ownership> struct CellMetricImpl
 using CellMetric = detail::CellMetricImpl<storage::Ownership::Container>;
 using CellMetricView = detail::CellMetricImpl<storage::Ownership::View>;
-} // namespace customizer
+} // namespace osrm::customizer
 } // namespace osrm
 #endif
@@ -3,9 +3,7 @@
 #include "customizer/customizer_config.hpp"
-namespace osrm
+namespace osrm::customizer
 {
 namespace customizer
 {
 class Customizer
@@ -14,7 +12,6 @@ class Customizer
    int Run(const CustomizationConfig &config);
 };
-} // namespace customizer
+} // namespace osrm::customizer
 } // namespace osrm
 #endif // OSRM_CUSTOMIZE_CUSTOMIZER_HPP
@@ -1,17 +1,14 @@
 #ifndef OSRM_CUSTOMIZE_CUSTOMIZER_CONFIG_HPP
 #define OSRM_CUSTOMIZE_CUSTOMIZER_CONFIG_HPP
 #include <boost/filesystem/path.hpp>
 #include <array>
 #include <filesystem>
 #include <string>
 #include "storage/io_config.hpp"
 #include "updater/updater_config.hpp"
-namespace osrm
+namespace osrm::customizer
 {
 namespace customizer
 {
 struct CustomizationConfig final : storage::IOConfig
@@ -29,7 +26,7 @@ struct CustomizationConfig final : storage::IOConfig
    {
    }
-    void UseDefaultOutputNames(const boost::filesystem::path &base)
+    void UseDefaultOutputNames(const std::filesystem::path &base)
    {
        IOConfig::UseDefaultOutputNames(base);
        updater_config.UseDefaultOutputNames(base);
@@ -39,7 +36,6 @@ struct CustomizationConfig final : storage::IOConfig
    updater::UpdaterConfig updater_config;
 };
-} // namespace customizer
+} // namespace osrm::customizer
 } // namespace osrm
 #endif // OSRM_CUSTOMIZE_CUSTOMIZER_CONFIG_HPP
@@ -9,11 +9,9 @@
 #include "storage/shared_memory_ownership.hpp"
-#include <boost/filesystem/path.hpp>
+#include <filesystem>
-namespace osrm
+namespace osrm::customizer
 {
 namespace customizer
 {
 struct EdgeBasedGraphEdgeData
@@ -97,7 +95,7 @@ class MultiLevelGraph : public partitioner::MultiLevelGraph<EdgeDataT, Ownership
    EdgeWeight GetNodeWeight(NodeID node) const { return node_weights[node]; }
-    EdgeWeight GetNodeDuration(NodeID node) const { return node_durations[node]; }
+    EdgeDuration GetNodeDuration(NodeID node) const { return node_durations[node]; }
    EdgeDistance GetNodeDistance(NodeID node) const { return node_distances[node]; }
@@ -126,7 +124,6 @@ using MultiLevelEdgeBasedGraph =
    MultiLevelGraph<EdgeBasedGraphEdgeData, storage::Ownership::Container>;
 using MultiLevelEdgeBasedGraphView =
    MultiLevelGraph<EdgeBasedGraphEdgeData, storage::Ownership::View>;
-} // namespace customizer
+} // namespace osrm::customizer
 } // namespace osrm
 #endif
@@ -9,16 +9,12 @@
 #include <unordered_map>
-namespace osrm
+namespace osrm::customizer::files
 {
 namespace customizer
 {
 namespace files
 {
 // reads .osrm.cell_metrics file
 template <typename CellMetricT>
-inline void readCellMetrics(const boost::filesystem::path &path,
+inline void readCellMetrics(const std::filesystem::path &path,
                            std::unordered_map<std::string, std::vector<CellMetricT>> &metrics)
 {
    static_assert(std::is_same<CellMetricView, CellMetricT>::value ||
@@ -48,7 +44,7 @@ inline void readCellMetrics(const boost::filesystem::path &path,
 // writes .osrm.cell_metrics file
 template <typename CellMetricT>
 inline void
-writeCellMetrics(const boost::filesystem::path &path,
+writeCellMetrics(const std::filesystem::path &path,
                 const std::unordered_map<std::string, std::vector<CellMetricT>> &metrics)
 {
    static_assert(std::is_same<CellMetricView, CellMetricT>::value ||
@@ -76,7 +72,7 @@ writeCellMetrics(const boost::filesystem::path &path,
 // reads .osrm.mldgr file
 template <typename MultiLevelGraphT>
-inline void readGraph(const boost::filesystem::path &path,
+inline void readGraph(const std::filesystem::path &path,
                      MultiLevelGraphT &graph,
                      std::uint32_t &connectivity_checksum)
 {
@@ -92,7 +88,7 @@ inline void readGraph(const boost::filesystem::path &path,
 // writes .osrm.mldgr file
 template <typename MultiLevelGraphT>
-inline void writeGraph(const boost::filesystem::path &path,
+inline void writeGraph(const std::filesystem::path &path,
                       const MultiLevelGraphT &graph,
                       const std::uint32_t connectivity_checksum)
 {
@@ -106,8 +102,6 @@ inline void writeGraph(const boost::filesystem::path &path,
    writer.WriteFrom("/mld/connectivity_checksum", connectivity_checksum);
    serialization::write(writer, "/mld/multilevelgraph", graph);
 }
-} // namespace files
+} // namespace osrm::customizer::files
 } // namespace customizer
 } // namespace osrm
 #endif
@@ -9,11 +9,7 @@
 #include "storage/shared_memory_ownership.hpp"
 #include "storage/tar.hpp"
-namespace osrm
+namespace osrm::customizer::serialization
 {
 namespace customizer
 {
 namespace serialization
 {
 template <storage::Ownership Ownership>
@@ -65,8 +61,6 @@ inline void write(storage::tar::FileWriter &writer,
    storage::serialization::write(writer, name + "/is_backward_edge", graph.is_backward_edge);
    storage::serialization::write(writer, name + "/node_to_edge_offset", graph.node_to_edge_offset);
 }
-} // namespace serialization
+} // namespace osrm::customizer::serialization
 } // namespace customizer
 } // namespace osrm
 #endif
@@ -3,11 +3,7 @@
 #include <type_traits>
-namespace osrm
+namespace osrm::engine::routing_algorithms
 {
 namespace engine
 {
 namespace routing_algorithms
 {
 // Contraction Hiearchy
@@ -111,8 +107,6 @@ template <> struct HasGetTileTurns<mld::Algorithm> final : std::true_type
 template <> struct HasExcludeFlags<mld::Algorithm> final : std::true_type
 {
 };
-} // namespace routing_algorithms
+} // namespace osrm::engine::routing_algorithms
 } // namespace engine
 } // namespace osrm
 #endif
@@ -18,11 +18,7 @@
 #include <memory>
 #include <vector>
-namespace osrm
+namespace osrm::engine::api
 {
 namespace engine
 {
 namespace api
 {
 static const constexpr char *INTERSECTION_DELIMITER = " / ";
@@ -44,10 +40,10 @@ class BaseAPI
        util::json::Array waypoints;
        waypoints.values.resize(parameters.coordinates.size());
-        boost::range::transform(
+        boost::range::transform(waypoint_candidates,
-            waypoint_candidates,
+                                waypoints.values.begin(),
-            waypoints.values.begin(),
+                                [this](const PhantomNodeCandidates &candidates)
-            [this](const PhantomNodeCandidates &candidates) { return MakeWaypoint(candidates); });
+                                { return MakeWaypoint(candidates); });
        return waypoints;
    }
@@ -57,8 +53,8 @@ class BaseAPI
    {
        // TODO: check forward/reverse
        const auto toName = [this](const auto &phantom) {
-            return facade.GetNameForID(facade.GetNameIndex(phantom.forward_segment_id.id))
+            return std::string(
-                .to_string();
+                facade.GetNameForID(facade.GetNameIndex(phantom.forward_segment_id.id)));
        };
        const auto noEmpty = [](const auto &name) { return !name.empty(); };
@@ -108,9 +104,8 @@ class BaseAPI
        std::transform(waypoint_candidates.begin(),
                       waypoint_candidates.end(),
                       waypoints.begin(),
-                       [this, builder](const PhantomNodeCandidates &candidates) {
+                       [this, builder](const PhantomNodeCandidates &candidates)
-                           return MakeWaypoint(builder, candidates)->Finish();
+                       { return MakeWaypoint(builder, candidates)->Finish(); });
                       });
        return builder->CreateVector(waypoints);
    }
@@ -128,8 +123,8 @@ class BaseAPI
            static_cast<float>(static_cast<double>(util::toFloating(snapped_location.lat))));
        const auto toName = [this](const auto &phantom) {
-            return facade.GetNameForID(facade.GetNameIndex(phantom.forward_segment_id.id))
+            return std::string(
-                .to_string();
+                facade.GetNameForID(facade.GetNameIndex(phantom.forward_segment_id.id)));
        };
        const auto noEmpty = [](const auto &name) { return !name.empty(); };
@@ -170,8 +165,6 @@ class BaseAPI
    const BaseParameters &parameters;
 };
-} // namespace api
+} // namespace osrm::engine::api
 } // namespace engine
 } // namespace osrm
 #endif
@@ -38,11 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <algorithm>
 #include <vector>
-namespace osrm
+namespace osrm::engine::api
 {
 namespace engine
 {
 namespace api
 {
 /**
@@ -56,7 +52,8 @@ namespace api
 *              optional per coordinate
 *  - bearings: limits the search for segments in the road network to given bearing(s) in degree
 *              towards true north in clockwise direction, optional per coordinate
- *  - approaches: force the phantom node to start towards the node with the road country side.
+ *  - approaches: force the phantom node to start towards the node with the road country side or
 *                its opposite
 *
 * \see OSRM, Coordinate, Hint, Bearing, RouteParameters, TableParameters,
 *      NearestParameters, TripParameters, MatchParameters and TileParameters
@@ -115,7 +112,8 @@ struct BaseParameters
               (approaches.empty() || approaches.size() == coordinates.size()) &&
               std::all_of(bearings.begin(),
                           bearings.end(),
-                           [](const boost::optional<Bearing> &bearing_and_range) {
+                           [](const boost::optional<Bearing> &bearing_and_range)
                           {
                               if (bearing_and_range)
                               {
                                   return bearing_and_range->IsValid();
@@ -124,8 +122,6 @@ struct BaseParameters
                           });
    }
 };
-} // namespace api
+} // namespace osrm::engine::api
 } // namespace engine
 } // namespace osrm
 #endif // ROUTE_PARAMETERS_HPP
@@ -2,22 +2,15 @@
 #define ENGINE_API_BASE_RESULT_HPP
 #include <flatbuffers/flatbuffers.h>
-#include <mapbox/variant.hpp>
+#include <variant>
 #include <string>
 #include "util/json_container.hpp"
-namespace osrm
+namespace osrm::engine::api
 {
-namespace engine
+using ResultT = std::variant<util::json::Object, std::string, flatbuffers::FlatBufferBuilder>;
-{
+} // namespace osrm::engine::api
 namespace api
 {
 using ResultT =
    mapbox::util::variant<util::json::Object, std::string, flatbuffers::FlatBufferBuilder>;
 } // namespace api
 } // namespace engine
 } // namespace osrm
 #endif
@@ -6,10 +6,7 @@
 #include "flatbuffers/flatbuffers.h"
-namespace osrm {
+namespace osrm::engine::api::fbresult {
 namespace engine {
 namespace api {
 namespace fbresult {
 struct Position;
@@ -219,7 +216,7 @@ FLATBUFFERS_MANUALLY_ALIGNED_STRUCT(8) Uint64Pair FLATBUFFERS_FINAL_CLASS {
 FLATBUFFERS_STRUCT_END(Uint64Pair, 16);
 struct WaypointT : public flatbuffers::NativeTable {
-  typedef Waypoint TableType;
+  using TableType = Waypoint;
  std::string hint;
  float distance;
  std::string name;
@@ -239,7 +236,7 @@ struct WaypointT : public flatbuffers::NativeTable {
 };
 struct Waypoint FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  typedef WaypointT NativeTableType;
+  using NativeTableType = WaypointT;
  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
    VT_HINT = 4,
    VT_DISTANCE = 6,
@@ -393,14 +390,14 @@ inline flatbuffers::Offset<Waypoint> CreateWaypointDirect(
 flatbuffers::Offset<Waypoint> CreateWaypoint(flatbuffers::FlatBufferBuilder &_fbb, const WaypointT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr);
 struct MetadataT : public flatbuffers::NativeTable {
-  typedef Metadata TableType;
+  using TableType = Metadata;
  std::vector<std::string> datasource_names;
  MetadataT() {
  }
 };
 struct Metadata FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  typedef MetadataT NativeTableType;
+  using NativeTableType = MetadataT;
  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
    VT_DATASOURCE_NAMES = 4
  };
@@ -457,7 +454,7 @@ inline flatbuffers::Offset<Metadata> CreateMetadataDirect(
 flatbuffers::Offset<Metadata> CreateMetadata(flatbuffers::FlatBufferBuilder &_fbb, const MetadataT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr);
 struct AnnotationT : public flatbuffers::NativeTable {
-  typedef Annotation TableType;
+  using TableType = Annotation;
  std::vector<uint32_t> distance;
  std::vector<uint32_t> duration;
  std::vector<uint32_t> datasources;
@@ -470,7 +467,7 @@ struct AnnotationT : public flatbuffers::NativeTable {
 };
 struct Annotation FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  typedef AnnotationT NativeTableType;
+  using NativeTableType = AnnotationT;
  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
    VT_DISTANCE = 4,
    VT_DURATION = 6,
@@ -609,7 +606,7 @@ inline flatbuffers::Offset<Annotation> CreateAnnotationDirect(
 flatbuffers::Offset<Annotation> CreateAnnotation(flatbuffers::FlatBufferBuilder &_fbb, const AnnotationT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr);
 struct StepManeuverT : public flatbuffers::NativeTable {
-  typedef StepManeuver TableType;
+  using TableType = StepManeuver;
  std::unique_ptr<osrm::engine::api::fbresult::Position> location;
  uint16_t bearing_before;
  uint16_t bearing_after;
@@ -626,7 +623,7 @@ struct StepManeuverT : public flatbuffers::NativeTable {
 };
 struct StepManeuver FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  typedef StepManeuverT NativeTableType;
+  using NativeTableType = StepManeuverT;
  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
    VT_LOCATION = 4,
    VT_BEARING_BEFORE = 6,
@@ -722,7 +719,7 @@ inline flatbuffers::Offset<StepManeuver> CreateStepManeuver(
 flatbuffers::Offset<StepManeuver> CreateStepManeuver(flatbuffers::FlatBufferBuilder &_fbb, const StepManeuverT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr);
 struct LaneT : public flatbuffers::NativeTable {
-  typedef Lane TableType;
+  using TableType = Lane;
  std::vector<osrm::engine::api::fbresult::Turn> indications;
  bool valid;
  LaneT()
@@ -731,7 +728,7 @@ struct LaneT : public flatbuffers::NativeTable {
 };
 struct Lane FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  typedef LaneT NativeTableType;
+  using NativeTableType = LaneT;
  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
    VT_INDICATIONS = 4,
    VT_VALID = 6
@@ -799,7 +796,7 @@ inline flatbuffers::Offset<Lane> CreateLaneDirect(
 flatbuffers::Offset<Lane> CreateLane(flatbuffers::FlatBufferBuilder &_fbb, const LaneT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr);
 struct IntersectionT : public flatbuffers::NativeTable {
-  typedef Intersection TableType;
+  using TableType = Intersection;
  std::unique_ptr<osrm::engine::api::fbresult::Position> location;
  std::vector<int16_t> bearings;
  std::vector<std::string> classes;
@@ -814,7 +811,7 @@ struct IntersectionT : public flatbuffers::NativeTable {
 };
 struct Intersection FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  typedef IntersectionT NativeTableType;
+  using NativeTableType = IntersectionT;
  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
    VT_LOCATION = 4,
    VT_BEARINGS = 6,
@@ -950,7 +947,7 @@ inline flatbuffers::Offset<Intersection> CreateIntersectionDirect(
 flatbuffers::Offset<Intersection> CreateIntersection(flatbuffers::FlatBufferBuilder &_fbb, const IntersectionT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr);
 struct StepT : public flatbuffers::NativeTable {
-  typedef Step TableType;
+  using TableType = Step;
  float distance;
  float duration;
  std::string polyline;
@@ -976,7 +973,7 @@ struct StepT : public flatbuffers::NativeTable {
 };
 struct Step FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  typedef StepT NativeTableType;
+  using NativeTableType = StepT;
  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
    VT_DISTANCE = 4,
    VT_DURATION = 6,
@@ -1234,7 +1231,7 @@ inline flatbuffers::Offset<Step> CreateStepDirect(
 flatbuffers::Offset<Step> CreateStep(flatbuffers::FlatBufferBuilder &_fbb, const StepT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr);
 struct LegT : public flatbuffers::NativeTable {
-  typedef Leg TableType;
+  using TableType = Leg;
  double distance;
  double duration;
  double weight;
@@ -1249,7 +1246,7 @@ struct LegT : public flatbuffers::NativeTable {
 };
 struct Leg FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  typedef LegT NativeTableType;
+  using NativeTableType = LegT;
  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
    VT_DISTANCE = 4,
    VT_DURATION = 6,
@@ -1369,7 +1366,7 @@ inline flatbuffers::Offset<Leg> CreateLegDirect(
 flatbuffers::Offset<Leg> CreateLeg(flatbuffers::FlatBufferBuilder &_fbb, const LegT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr);
 struct RouteObjectT : public flatbuffers::NativeTable {
-  typedef RouteObject TableType;
+  using TableType = RouteObject;
  float distance;
  float duration;
  float weight;
@@ -1387,7 +1384,7 @@ struct RouteObjectT : public flatbuffers::NativeTable {
 };
 struct RouteObject FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  typedef RouteObjectT NativeTableType;
+  using NativeTableType = RouteObjectT;
  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
    VT_DISTANCE = 4,
    VT_DURATION = 6,
@@ -1534,7 +1531,7 @@ inline flatbuffers::Offset<RouteObject> CreateRouteObjectDirect(
 flatbuffers::Offset<RouteObject> CreateRouteObject(flatbuffers::FlatBufferBuilder &_fbb, const RouteObjectT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr);
 struct TableT : public flatbuffers::NativeTable {
-  typedef Table TableType;
+  using TableType = Table;
  std::vector<float> durations;
  uint16_t rows;
  uint16_t cols;
@@ -1548,7 +1545,7 @@ struct TableT : public flatbuffers::NativeTable {
 };
 struct Table FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  typedef TableT NativeTableType;
+  using NativeTableType = TableT;
  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
    VT_DURATIONS = 4,
    VT_ROWS = 6,
@@ -1671,7 +1668,7 @@ inline flatbuffers::Offset<Table> CreateTableDirect(
 flatbuffers::Offset<Table> CreateTable(flatbuffers::FlatBufferBuilder &_fbb, const TableT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr);
 struct ErrorT : public flatbuffers::NativeTable {
-  typedef Error TableType;
+  using TableType = Error;
  std::string code;
  std::string message;
  ErrorT() {
@@ -1679,7 +1676,7 @@ struct ErrorT : public flatbuffers::NativeTable {
 };
 struct Error FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  typedef ErrorT NativeTableType;
+  using NativeTableType = ErrorT;
  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
    VT_CODE = 4,
    VT_MESSAGE = 6
@@ -1749,7 +1746,7 @@ inline flatbuffers::Offset<Error> CreateErrorDirect(
 flatbuffers::Offset<Error> CreateError(flatbuffers::FlatBufferBuilder &_fbb, const ErrorT *_o, const flatbuffers::rehasher_function_t *_rehasher = nullptr);
 struct FBResultT : public flatbuffers::NativeTable {
-  typedef FBResult TableType;
+  using TableType = FBResult;
  bool error;
  std::unique_ptr<osrm::engine::api::fbresult::ErrorT> code;
  std::string data_version;
@@ -1762,7 +1759,7 @@ struct FBResultT : public flatbuffers::NativeTable {
 };
 struct FBResult FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
-  typedef FBResultT NativeTableType;
+  using NativeTableType = FBResultT;
  enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
    VT_ERROR = 4,
    VT_CODE = 6,
@@ -2431,9 +2428,6 @@ inline std::unique_ptr<osrm::engine::api::fbresult::FBResultT> UnPackSizePrefixe
  return std::unique_ptr<osrm::engine::api::fbresult::FBResultT>(GetSizePrefixedFBResult(buf)->UnPack(res));
 }
 }  // namespace fbresult
 }  // namespace api
 }  // namespace engine
 }  // namespace osrm
 #endif  // FLATBUFFERS_GENERATED_FBRESULT_OSRM_ENGINE_API_FBRESULT_H_
@@ -19,16 +19,12 @@
 #include <string>
 #include <vector>
-namespace osrm
+namespace osrm::engine
 {
 namespace engine
 {
 struct Hint;
-namespace api
+namespace api::json
 {
 namespace json
 {
 namespace detail
 {
@@ -45,7 +41,7 @@ inline bool hasValidLanes(const guidance::IntermediateIntersection &intersection
    return intersection.lanes.lanes_in_turn > 0;
 }
-util::json::Array coordinateToLonLat(const util::Coordinate &coordinate);
+util::json::Value coordinateToLonLat(const util::Coordinate &coordinate);
 /**
 * Ensures that a bearing value is a whole number, and clamped to the range 0-359
@@ -83,7 +79,7 @@ util::json::Object makeGeoJSONGeometry(ForwardIter begin, ForwardIter end)
        coordinates.values.push_back(location);
        coordinates.values.push_back(location);
    }
-    geojson.values["coordinates"] = std::move(coordinates);
+    geojson.values["coordinates"] = util::json::Value{std::move(coordinates)};
    return geojson;
 }
@@ -112,9 +108,7 @@ util::json::Object makeRouteLeg(guidance::RouteLeg leg, util::json::Array steps)
 util::json::Array makeRouteLegs(std::vector<guidance::RouteLeg> legs,
                                std::vector<util::json::Value> step_geometries,
                                std::vector<util::json::Object> annotations);
-} // namespace json
+} // namespace api::json
-} // namespace api
+} // namespace osrm::engine
 } // namespace engine
 } // namespace osrm
 #endif // ENGINE_GUIDANCE_API_RESPONSE_GENERATOR_HPP_
@@ -12,11 +12,7 @@
 #include "util/integer_range.hpp"
-namespace osrm
+namespace osrm::engine::api
 {
 namespace engine
 {
 namespace api
 {
 class MatchAPI final : public RouteAPI
@@ -34,14 +30,14 @@ class MatchAPI final : public RouteAPI
                      osrm::engine::api::ResultT &response) const
    {
        BOOST_ASSERT(sub_matchings.size() == sub_routes.size());
-        if (response.is<flatbuffers::FlatBufferBuilder>())
+        if (std::holds_alternative<flatbuffers::FlatBufferBuilder>(response))
        {
-            auto &fb_result = response.get<flatbuffers::FlatBufferBuilder>();
+            auto &fb_result = std::get<flatbuffers::FlatBufferBuilder>(response);
            MakeResponse(sub_matchings, sub_routes, fb_result);
        }
        else
        {
-            auto &json_result = response.get<util::json::Object>();
+            auto &json_result = std::get<util::json::Object>(response);
            MakeResponse(sub_matchings, sub_routes, json_result);
        }
    }
@@ -56,9 +52,10 @@ class MatchAPI final : public RouteAPI
            data_version_string = fb_result.CreateString(data_timestamp);
        }
-        auto response = MakeFBResponse(sub_routes, fb_result, [this, &fb_result, &sub_matchings]() {
+        auto response = MakeFBResponse(sub_routes,
-            return MakeTracepoints(fb_result, sub_matchings);
+                                       fb_result,
-        });
+                                       [this, &fb_result, &sub_matchings]()
                                       { return MakeTracepoints(fb_result, sub_matchings); });
        if (!data_timestamp.empty())
        {
@@ -80,19 +77,19 @@ class MatchAPI final : public RouteAPI
                                   sub_routes[index].unpacked_path_segments,
                                   sub_routes[index].source_traversed_in_reverse,
                                   sub_routes[index].target_traversed_in_reverse);
-            route.values["confidence"] = sub_matchings[index].confidence;
+            route.values.emplace("confidence", sub_matchings[index].confidence);
-            routes.values.push_back(std::move(route));
+            routes.values.emplace_back(std::move(route));
        }
        if (!parameters.skip_waypoints)
        {
-            response.values["tracepoints"] = MakeTracepoints(sub_matchings);
+            response.values.emplace("tracepoints", MakeTracepoints(sub_matchings));
        }
-        response.values["matchings"] = std::move(routes);
+        response.values.emplace("matchings", std::move(routes));
-        response.values["code"] = "Ok";
+        response.values.emplace("code", "Ok");
        auto data_timestamp = facade.GetTimestamp();
        if (!data_timestamp.empty())
        {
-            response.values["data_version"] = data_timestamp;
+            response.values.emplace("data_version", data_timestamp);
        }
    }
@@ -135,13 +132,13 @@ class MatchAPI final : public RouteAPI
            if (tidy_result.can_be_removed[trace_index])
            {
-                waypoints.push_back(fbresult::WaypointBuilder(fb_result).Finish());
+                waypoints.emplace_back(fbresult::WaypointBuilder(fb_result).Finish());
                continue;
            }
            auto matching_index = trace_idx_to_matching_idx[trace_index];
            if (matching_index.NotMatched())
            {
-                waypoints.push_back(fbresult::WaypointBuilder(fb_result).Finish());
+                waypoints.emplace_back(fbresult::WaypointBuilder(fb_result).Finish());
                continue;
            }
            const auto &phantom =
@@ -168,7 +165,7 @@ class MatchAPI final : public RouteAPI
            {
                waypoint->add_waypoint_index(matching_index.point_index);
            }
-            waypoints.push_back(waypoint->Finish());
+            waypoints.emplace_back(waypoint->Finish());
        }
        return fb_result.CreateVector(waypoints);
@@ -189,23 +186,23 @@ class MatchAPI final : public RouteAPI
        {
            if (tidy_result.can_be_removed[trace_index])
            {
-                waypoints.values.push_back(util::json::Null());
+                waypoints.values.emplace_back(util::json::Null());
                continue;
            }
            auto matching_index = trace_idx_to_matching_idx[trace_index];
            if (matching_index.NotMatched())
            {
-                waypoints.values.push_back(util::json::Null());
+                waypoints.values.emplace_back(util::json::Null());
                continue;
            }
            const auto &phantom =
                sub_matchings[matching_index.sub_matching_index].nodes[matching_index.point_index];
            auto waypoint = BaseAPI::MakeWaypoint({phantom});
-            waypoint.values["matchings_index"] = matching_index.sub_matching_index;
+            waypoint.values.emplace("matchings_index", matching_index.sub_matching_index);
-            waypoint.values["waypoint_index"] = matching_index.point_index;
+            waypoint.values.emplace("waypoint_index", matching_index.point_index);
-            waypoint.values["alternatives_count"] =
+            waypoint.values.emplace("alternatives_count",
-                sub_matchings[matching_index.sub_matching_index]
+                                    sub_matchings[matching_index.sub_matching_index]
-                    .alternatives_count[matching_index.point_index];
+                                        .alternatives_count[matching_index.point_index]);
            // waypoint indices need to be adjusted if route legs were collapsed
            // waypoint parameter assumes there is only one match object
            if (!parameters.waypoints.empty())
@@ -220,7 +217,7 @@ class MatchAPI final : public RouteAPI
                    waypoint.values["waypoint_index"] = util::json::Null();
                }
            }
-            waypoints.values.push_back(std::move(waypoint));
+            waypoints.values.emplace_back(std::move(waypoint));
        }
        return waypoints;
@@ -253,8 +250,6 @@ class MatchAPI final : public RouteAPI
    const tidy::Result &tidy_result;
 };
-} // namespace api
+} // namespace osrm::engine::api
 } // namespace engine
 } // namespace osrm
 #endif
@@ -32,11 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
-namespace osrm
+namespace osrm::engine::api
 {
 namespace engine
 {
 namespace api
 {
 /**
@@ -71,7 +67,7 @@ struct MatchParameters : public RouteParameters
    MatchParameters(const std::vector<unsigned> &timestamps_,
                    GapsType gaps_,
                    bool tidy_,
-                    Args &&... args_)
+                    Args &&...args_)
        : MatchParameters(timestamps_, gaps_, tidy_, {}, std::forward<Args>(args_)...)
    {
    }
@@ -81,7 +77,7 @@ struct MatchParameters : public RouteParameters
                    GapsType gaps_,
                    bool tidy_,
                    const std::vector<std::size_t> &waypoints_,
-                    Args &&... args_)
+                    Args &&...args_)
        : RouteParameters{std::forward<Args>(args_)..., waypoints_}, timestamps{std::move(
                                                                         timestamps_)},
          gaps(gaps_), tidy(tidy_)
@@ -98,8 +94,6 @@ struct MatchParameters : public RouteParameters
               (timestamps.empty() || timestamps.size() == coordinates.size());
    }
 };
-} // namespace api
+} // namespace osrm::engine::api
 } // namespace engine
 } // namespace osrm
 #endif
@@ -11,13 +11,7 @@
 #include <boost/assert.hpp>
 #include <boost/dynamic_bitset.hpp>
-namespace osrm
+namespace osrm::engine::api::tidy
 {
 namespace engine
 {
 namespace api
 {
 namespace tidy
 {
 struct Thresholds
@@ -200,9 +194,6 @@ inline Result tidy(const MatchParameters &params, Thresholds cfg = {15., 5})
    return result;
 }
-} // namespace tidy
+} // namespace osrm::engine::api::tidy
 } // namespace api
 } // namespace engine
 } // namespace osrm
 #endif
@@ -12,11 +12,7 @@
 #include <vector>
-namespace osrm
+namespace osrm::engine::api
 {
 namespace engine
 {
 namespace api
 {
 class NearestAPI final : public BaseAPI
@@ -33,14 +29,14 @@ class NearestAPI final : public BaseAPI
        BOOST_ASSERT(phantom_nodes.size() == 1);
        BOOST_ASSERT(parameters.coordinates.size() == 1);
-        if (response.is<flatbuffers::FlatBufferBuilder>())
+        if (std::holds_alternative<flatbuffers::FlatBufferBuilder>(response))
        {
-            auto &fb_result = response.get<flatbuffers::FlatBufferBuilder>();
+            auto &fb_result = std::get<flatbuffers::FlatBufferBuilder>(response);
            MakeResponse(phantom_nodes, fb_result);
        }
        else
        {
-            auto &json_result = response.get<util::json::Object>();
+            auto &json_result = std::get<util::json::Object>(response);
            MakeResponse(phantom_nodes, json_result);
        }
    }
@@ -61,20 +57,20 @@ class NearestAPI final : public BaseAPI
        {
            std::vector<flatbuffers::Offset<fbresult::Waypoint>> waypoints;
            waypoints.resize(phantom_nodes.front().size());
-            std::transform(
+            std::transform(phantom_nodes.front().begin(),
-                phantom_nodes.front().begin(),
+                           phantom_nodes.front().end(),
-                phantom_nodes.front().end(),
+                           waypoints.begin(),
-                waypoints.begin(),
+                           [this, &fb_result](const PhantomNodeWithDistance &phantom_with_distance)
-                [this, &fb_result](const PhantomNodeWithDistance &phantom_with_distance) {
+                           {
-                    auto &phantom_node = phantom_with_distance.phantom_node;
+                               auto &phantom_node = phantom_with_distance.phantom_node;
-                    auto node_values = MakeNodes(phantom_node);
+                               auto node_values = MakeNodes(phantom_node);
-                    fbresult::Uint64Pair nodes{node_values.first, node_values.second};
+                               fbresult::Uint64Pair nodes{node_values.first, node_values.second};
-                    auto waypoint = MakeWaypoint(&fb_result, {phantom_node});
+                               auto waypoint = MakeWaypoint(&fb_result, {phantom_node});
-                    waypoint->add_nodes(&nodes);
+                               waypoint->add_nodes(&nodes);
-                    return waypoint->Finish();
+                               return waypoint->Finish();
-                });
+                           });
            waypoints_vector = fb_result.CreateVector(waypoints);
        }
@@ -98,28 +94,29 @@ class NearestAPI final : public BaseAPI
            std::transform(phantom_nodes.front().begin(),
                           phantom_nodes.front().end(),
                           waypoints.values.begin(),
-                           [this](const PhantomNodeWithDistance &phantom_with_distance) {
+                           [this](const PhantomNodeWithDistance &phantom_with_distance)
                           {
                               auto &phantom_node = phantom_with_distance.phantom_node;
                               auto waypoint = MakeWaypoint({phantom_node});
                               util::json::Array nodes;
                               nodes.values.reserve(2);
                               auto node_values = MakeNodes(phantom_node);
-                               nodes.values.push_back(node_values.first);
+                               nodes.values.emplace_back(node_values.first);
-                               nodes.values.push_back(node_values.second);
+                               nodes.values.emplace_back(node_values.second);
-                               waypoint.values["nodes"] = std::move(nodes);
+                               waypoint.values.emplace("nodes", std::move(nodes));
                               return waypoint;
                           });
-            response.values["waypoints"] = std::move(waypoints);
+            response.values.emplace("waypoints", std::move(waypoints));
        }
-        response.values["code"] = "Ok";
+        response.values.emplace("code", "Ok");
        auto data_timestamp = facade.GetTimestamp();
        if (!data_timestamp.empty())
        {
-            response.values["data_version"] = data_timestamp;
+            response.values.emplace("data_version", data_timestamp);
        }
    }
@@ -164,8 +161,6 @@ class NearestAPI final : public BaseAPI
    }
 };
-} // namespace api
+} // namespace osrm::engine::api
 } // namespace engine
 } // namespace osrm
 #endif
@@ -30,11 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "engine/api/base_parameters.hpp"
-namespace osrm
+namespace osrm::engine::api
 {
 namespace engine
 {
 namespace api
 {
 /**
@@ -52,8 +48,6 @@ struct NearestParameters : public BaseParameters
    bool IsValid() const { return BaseParameters::IsValid() && number_of_results >= 1; }
 };
-} // namespace api
+} // namespace osrm::engine::api
 } // namespace engine
 } // namespace osrm
 #endif // ENGINE_API_NEAREST_PARAMETERS_HPP
@@ -31,11 +31,7 @@
 #include <map>
 #include <vector>
-namespace osrm
+namespace osrm::engine::api
 {
 namespace engine
 {
 namespace api
 {
 class RouteAPI : public BaseAPI
@@ -54,14 +50,14 @@ class RouteAPI : public BaseAPI
    {
        BOOST_ASSERT(!raw_routes.routes.empty());
-        if (response.is<flatbuffers::FlatBufferBuilder>())
+        if (std::holds_alternative<flatbuffers::FlatBufferBuilder>(response))
        {
-            auto &fb_result = response.get<flatbuffers::FlatBufferBuilder>();
+            auto &fb_result = std::get<flatbuffers::FlatBufferBuilder>(response);
            MakeResponse(raw_routes, waypoint_candidates, fb_result);
        }
        else
        {
-            auto &json_result = response.get<util::json::Object>();
+            auto &json_result = std::get<util::json::Object>(response);
            MakeResponse(raw_routes, waypoint_candidates, json_result);
        }
    }
@@ -81,9 +77,10 @@ class RouteAPI : public BaseAPI
        }
        auto response =
-            MakeFBResponse(raw_routes, fb_result, [this, &waypoint_candidates, &fb_result]() {
+            MakeFBResponse(raw_routes,
-                return BaseAPI::MakeWaypoints(&fb_result, waypoint_candidates);
+                           fb_result,
-            });
+                           [this, &waypoint_candidates, &fb_result]()
                           { return BaseAPI::MakeWaypoints(&fb_result, waypoint_candidates); });
        if (!data_timestamp.empty())
        {
@@ -113,14 +110,14 @@ class RouteAPI : public BaseAPI
        if (!parameters.skip_waypoints)
        {
-            response.values["waypoints"] = BaseAPI::MakeWaypoints(waypoint_candidates);
+            response.values.emplace("waypoints", BaseAPI::MakeWaypoints(waypoint_candidates));
        }
-        response.values["routes"] = std::move(jsRoutes);
+        response.values.emplace("routes", std::move(jsRoutes));
-        response.values["code"] = "Ok";
+        response.values.emplace("code", "Ok");
        auto data_timestamp = facade.GetTimestamp();
        if (!data_timestamp.empty())
        {
-            response.values["data_version"] = data_timestamp;
+            response.values.emplace("data_version", data_timestamp);
        }
    }
@@ -161,8 +158,8 @@ class RouteAPI : public BaseAPI
    }
    template <typename ForwardIter>
-    mapbox::util::variant<flatbuffers::Offset<flatbuffers::String>,
+    std::variant<flatbuffers::Offset<flatbuffers::String>,
-                          flatbuffers::Offset<flatbuffers::Vector<const fbresult::Position *>>>
+                 flatbuffers::Offset<flatbuffers::Vector<const fbresult::Position *>>>
    MakeGeometry(flatbuffers::FlatBufferBuilder &builder, ForwardIter begin, ForwardIter end) const
    {
        if (parameters.geometries == RouteParameters::GeometriesType::Polyline)
@@ -175,10 +172,15 @@ class RouteAPI : public BaseAPI
        }
        std::vector<fbresult::Position> coordinates;
        coordinates.resize(std::distance(begin, end));
-        std::transform(begin, end, coordinates.begin(), [](const Coordinate &c) {
+        std::transform(begin,
-            return fbresult::Position{static_cast<float>(util::toFloating(c.lon).__value),
+                       end,
-                                      static_cast<float>(util::toFloating(c.lat).__value)};
+                       coordinates.begin(),
-        });
+                       [](const Coordinate &c)
                       {
                           return fbresult::Position{
                               static_cast<float>(util::toFloating(c.lon).__value),
                               static_cast<float>(util::toFloating(c.lat).__value)};
                       });
        return builder.CreateVectorOfStructs(coordinates);
    }
@@ -338,8 +340,8 @@ class RouteAPI : public BaseAPI
                                  unpacked_path_segments,
                                  source_traversed_in_reverse,
                                  target_traversed_in_reverse);
-        std::vector<guidance::RouteLeg> legs = legs_info.first;
+        std::vector<guidance::RouteLeg> &legs = legs_info.first;
-        std::vector<guidance::LegGeometry> leg_geometries = legs_info.second;
+        std::vector<guidance::LegGeometry> &leg_geometries = legs_info.second;
        auto route = guidance::assembleRoute(legs);
        // Fill legs
@@ -358,9 +360,8 @@ class RouteAPI : public BaseAPI
                std::transform(leg.steps.begin(),
                               leg.steps.end(),
                               legSteps.begin(),
-                               [this, &fb_result, &leg_geometry](auto &step) {
+                               [this, &fb_result, &leg_geometry](auto &step)
-                                   return this->MakeFBStep(fb_result, leg_geometry, step);
+                               { return this->MakeFBStep(fb_result, leg_geometry, step); });
                               });
            }
            auto steps_vector = fb_result.CreateVector(legSteps);
@@ -407,8 +408,8 @@ class RouteAPI : public BaseAPI
        // Fill geometry
        auto overview = MakeOverview(leg_geometries);
-        mapbox::util::variant<flatbuffers::Offset<flatbuffers::String>,
+        std::variant<flatbuffers::Offset<flatbuffers::String>,
-                              flatbuffers::Offset<flatbuffers::Vector<const fbresult::Position *>>>
+                     flatbuffers::Offset<flatbuffers::Vector<const fbresult::Position *>>>
            geometry;
        if (overview)
        {
@@ -425,8 +426,7 @@ class RouteAPI : public BaseAPI
        routeObject.add_legs(legs_vector);
        if (overview)
        {
-            mapbox::util::apply_visitor(GeometryVisitor<fbresult::RouteObjectBuilder>(routeObject),
+            std::visit(GeometryVisitor<fbresult::RouteObjectBuilder>(routeObject), geometry);
                                        geometry);
        }
        return routeObject.Finish();
@@ -439,61 +439,61 @@ class RouteAPI : public BaseAPI
    {
        // AnnotationsType uses bit flags, & operator checks if a property is set
        flatbuffers::Offset<flatbuffers::Vector<float>> speed;
-        if (parameters.annotations_type & RouteParameters::AnnotationsType::Speed)
+        if (requested_annotations & RouteParameters::AnnotationsType::Speed)
        {
            double prev_speed = 0;
-            speed =
+            speed = GetAnnotations<float>(
-                GetAnnotations<float>(fb_result,
+                fb_result,
-                                      leg_geometry,
+                leg_geometry,
-                                      [&prev_speed](const guidance::LegGeometry::Annotation &anno) {
+                [&prev_speed](const guidance::LegGeometry::Annotation &anno)
-                                          if (anno.duration < std::numeric_limits<float>::min())
+                {
-                                          {
+                    if (anno.duration < std::numeric_limits<float>::min())
-                                              return prev_speed;
+                    {
-                                          }
+                        return prev_speed;
-                                          else
+                    }
-                                          {
+                    else
-                                              auto speed =
+                    {
-                                                  round(anno.distance / anno.duration * 10.) / 10.;
+                        auto speed = std::round(anno.distance / anno.duration * 10.) / 10.;
-                                              prev_speed = speed;
+                        prev_speed = speed;
-                                              return util::json::clamp_float(speed);
+                        return util::json::clamp_float(speed);
-                                          }
+                    }
-                                      });
+                });
        }
        flatbuffers::Offset<flatbuffers::Vector<uint32_t>> duration;
        if (requested_annotations & RouteParameters::AnnotationsType::Duration)
        {
-            duration = GetAnnotations<uint32_t>(
+            duration = GetAnnotations<uint32_t>(fb_result,
-                fb_result, leg_geometry, [](const guidance::LegGeometry::Annotation &anno) {
+                                                leg_geometry,
-                    return anno.duration;
+                                                [](const guidance::LegGeometry::Annotation &anno)
-                });
+                                                { return anno.duration; });
        }
        flatbuffers::Offset<flatbuffers::Vector<uint32_t>> distance;
        if (requested_annotations & RouteParameters::AnnotationsType::Distance)
        {
-            distance = GetAnnotations<uint32_t>(
+            distance = GetAnnotations<uint32_t>(fb_result,
-                fb_result, leg_geometry, [](const guidance::LegGeometry::Annotation &anno) {
+                                                leg_geometry,
-                    return anno.distance;
+                                                [](const guidance::LegGeometry::Annotation &anno)
-                });
+                                                { return anno.distance; });
        }
        flatbuffers::Offset<flatbuffers::Vector<uint32_t>> weight;
        if (requested_annotations & RouteParameters::AnnotationsType::Weight)
        {
-            weight = GetAnnotations<uint32_t>(
+            weight = GetAnnotations<uint32_t>(fb_result,
-                fb_result, leg_geometry, [](const guidance::LegGeometry::Annotation &anno) {
+                                              leg_geometry,
-                    return anno.weight;
+                                              [](const guidance::LegGeometry::Annotation &anno)
-                });
+                                              { return anno.weight; });
        }
        flatbuffers::Offset<flatbuffers::Vector<uint32_t>> datasources;
        if (requested_annotations & RouteParameters::AnnotationsType::Datasources)
        {
-            datasources = GetAnnotations<uint32_t>(
+            datasources = GetAnnotations<uint32_t>(fb_result,
-                fb_result, leg_geometry, [](const guidance::LegGeometry::Annotation &anno) {
+                                                   leg_geometry,
-                    return anno.datasource;
+                                                   [](const guidance::LegGeometry::Annotation &anno)
-                });
+                                                   { return anno.datasource; });
        }
        std::vector<uint32_t> nodes;
        if (requested_annotations & RouteParameters::AnnotationsType::Nodes)
@@ -643,7 +643,7 @@ class RouteAPI : public BaseAPI
        stepBuilder.add_rotary_pronunciation(rotary_pronunciation_string);
        stepBuilder.add_intersections(intersections_vector);
        stepBuilder.add_maneuver(maneuver_buffer);
-        mapbox::util::apply_visitor(GeometryVisitor<fbresult::StepBuilder>(stepBuilder), geometry);
+        std::visit(GeometryVisitor<fbresult::StepBuilder>(stepBuilder), geometry);
        return stepBuilder.Finish();
    };
@@ -657,7 +657,8 @@ class RouteAPI : public BaseAPI
            step.intersections.begin(),
            step.intersections.end(),
            intersections.begin(),
-            [&fb_result, this](const guidance::IntermediateIntersection &intersection) {
+            [&fb_result, this](const guidance::IntermediateIntersection &intersection)
            {
                std::vector<flatbuffers::Offset<fbresult::Lane>> lanes;
                if (json::detail::hasValidLanes(intersection))
                {
@@ -685,11 +686,11 @@ class RouteAPI : public BaseAPI
                auto bearings_vector = fb_result.CreateVector(intersection.bearings);
                std::vector<flatbuffers::Offset<flatbuffers::String>> classes;
                classes.resize(intersection.classes.size());
-                std::transform(
+                std::transform(intersection.classes.begin(),
-                    intersection.classes.begin(),
+                               intersection.classes.end(),
-                    intersection.classes.end(),
+                               classes.begin(),
-                    classes.begin(),
+                               [&fb_result](const std::string &cls)
-                    [&fb_result](const std::string &cls) { return fb_result.CreateString(cls); });
+                               { return fb_result.CreateString(cls); });
                auto classes_vector = fb_result.CreateVector(classes);
                auto entry_vector = fb_result.CreateVector(intersection.entry);
@@ -715,8 +716,8 @@ class RouteAPI : public BaseAPI
                                  unpacked_path_segments,
                                  source_traversed_in_reverse,
                                  target_traversed_in_reverse);
-        std::vector<guidance::RouteLeg> legs = legs_info.first;
+        std::vector<guidance::RouteLeg> &legs = legs_info.first;
-        std::vector<guidance::LegGeometry> leg_geometries = legs_info.second;
+        std::vector<guidance::LegGeometry> &leg_geometries = legs_info.second;
        auto route = guidance::assembleRoute(legs);
        boost::optional<util::json::Value> json_overview =
@@ -724,9 +725,10 @@ class RouteAPI : public BaseAPI
        std::vector<util::json::Value> step_geometries;
        const auto total_step_count =
-            std::accumulate(legs.begin(), legs.end(), 0, [](const auto &v, const auto &leg) {
+            std::accumulate(legs.begin(),
-                return v + leg.steps.size();
+                            legs.end(),
-            });
+                            0,
                            [](const auto &v, const auto &leg) { return v + leg.steps.size(); });
        step_geometries.reserve(total_step_count);
        for (const auto idx : util::irange<std::size_t>(0UL, legs.size()))
@@ -737,7 +739,8 @@ class RouteAPI : public BaseAPI
                legs[idx].steps.begin(),
                legs[idx].steps.end(),
                std::back_inserter(step_geometries),
-                [this, &leg_geometry](const guidance::RouteStep &step) {
+                [this, &leg_geometry](const guidance::RouteStep &step)
                {
                    if (parameters.geometries == RouteParameters::GeometriesType::Polyline)
                    {
                        return static_cast<util::json::Value>(json::makePolyline<100000>(
@@ -778,50 +781,60 @@ class RouteAPI : public BaseAPI
                util::json::Object annotation;
                // AnnotationsType uses bit flags, & operator checks if a property is set
-                if (parameters.annotations_type & RouteParameters::AnnotationsType::Speed)
+                if (requested_annotations & RouteParameters::AnnotationsType::Speed)
                {
                    double prev_speed = 0;
-                    annotation.values["speed"] = GetAnnotations(
+                    annotation.values.emplace(
-                        leg_geometry, [&prev_speed](const guidance::LegGeometry::Annotation &anno) {
+                        "speed",
-                            if (anno.duration < std::numeric_limits<double>::min())
+                        GetAnnotations(leg_geometry,
-                            {
+                                       [&prev_speed](const guidance::LegGeometry::Annotation &anno)
-                                return prev_speed;
+                                       {
-                            }
+                                           if (anno.duration < std::numeric_limits<double>::min())
-                            else
+                                           {
-                            {
+                                               return prev_speed;
-                                auto speed = std::round(anno.distance / anno.duration * 10.) / 10.;
+                                           }
-                                prev_speed = speed;
+                                           else
-                                return util::json::clamp_float(speed);
+                                           {
-                            }
+                                               auto speed =
-                        });
+                                                   std::round(anno.distance / anno.duration * 10.) /
                                                   10.;
                                               prev_speed = speed;
                                               return util::json::clamp_float(speed);
                                           }
                                       }));
                }
                if (requested_annotations & RouteParameters::AnnotationsType::Duration)
                {
-                    annotation.values["duration"] = GetAnnotations(
+                    annotation.values.emplace(
-                        leg_geometry, [](const guidance::LegGeometry::Annotation &anno) {
+                        "duration",
-                            return anno.duration;
+                        GetAnnotations(leg_geometry,
-                        });
+                                       [](const guidance::LegGeometry::Annotation &anno)
                                       { return anno.duration; }));
                }
                if (requested_annotations & RouteParameters::AnnotationsType::Distance)
                {
-                    annotation.values["distance"] = GetAnnotations(
+                    annotation.values.emplace(
-                        leg_geometry, [](const guidance::LegGeometry::Annotation &anno) {
+                        "distance",
-                            return anno.distance;
+                        GetAnnotations(leg_geometry,
-                        });
+                                       [](const guidance::LegGeometry::Annotation &anno)
                                       { return anno.distance; }));
                }
                if (requested_annotations & RouteParameters::AnnotationsType::Weight)
                {
-                    annotation.values["weight"] = GetAnnotations(
+                    annotation.values.emplace(
-                        leg_geometry,
+                        "weight",
-                        [](const guidance::LegGeometry::Annotation &anno) { return anno.weight; });
+                        GetAnnotations(leg_geometry,
                                       [](const guidance::LegGeometry::Annotation &anno)
                                       { return anno.weight; }));
                }
                if (requested_annotations & RouteParameters::AnnotationsType::Datasources)
                {
-                    annotation.values["datasources"] = GetAnnotations(
+                    annotation.values.emplace(
-                        leg_geometry, [](const guidance::LegGeometry::Annotation &anno) {
+                        "datasources",
-                            return anno.datasource;
+                        GetAnnotations(leg_geometry,
-                        });
+                                       [](const guidance::LegGeometry::Annotation &anno)
                                       { return anno.datasource; }));
                }
                if (requested_annotations & RouteParameters::AnnotationsType::Nodes)
                {
@@ -832,7 +845,7 @@ class RouteAPI : public BaseAPI
                        nodes.values.push_back(
                            static_cast<std::uint64_t>(facade.GetOSMNodeIDOfNode(node_id)));
                    }
-                    annotation.values["nodes"] = std::move(nodes);
+                    annotation.values.emplace("nodes", std::move(nodes));
                }
                // Add any supporting metadata, if needed
                if (requested_annotations & RouteParameters::AnnotationsType::Datasources)
@@ -848,8 +861,8 @@ class RouteAPI : public BaseAPI
                            break;
                        datasource_names.values.push_back(std::string(facade.GetDatasourceName(i)));
                    }
-                    metadata.values["datasource_names"] = datasource_names;
+                    metadata.values.emplace("datasource_names", datasource_names);
-                    annotation.values["metadata"] = metadata;
+                    annotation.values.emplace("metadata", metadata);
                }
                annotations.push_back(std::move(annotation));
@@ -1001,8 +1014,6 @@ class RouteAPI : public BaseAPI
    }
 };
-} // namespace api
+} // namespace osrm::engine::api
 } // namespace engine
 } // namespace osrm
 #endif
@@ -32,11 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <vector>
-namespace osrm
+namespace osrm::engine::api
 {
 namespace engine
 {
 namespace api
 {
 /**
@@ -87,7 +83,7 @@ struct RouteParameters : public BaseParameters
                    const GeometriesType geometries_,
                    const OverviewType overview_,
                    const boost::optional<bool> continue_straight_,
-                    Args &&... args_)
+                    Args &&...args_)
        // Once we perfectly-forward `args` (see #2990) this constructor can delegate to the one
        // below.
        : BaseParameters{std::forward<Args>(args_)...}, steps{steps_}, alternatives{alternatives_},
@@ -105,7 +101,7 @@ struct RouteParameters : public BaseParameters
                    const GeometriesType geometries_,
                    const OverviewType overview_,
                    const boost::optional<bool> continue_straight_,
-                    Args &&... args_)
+                    Args &&...args_)
        : BaseParameters{std::forward<Args>(args_)...}, steps{steps_}, alternatives{alternatives_},
          number_of_alternatives{alternatives_ ? 1u : 0u}, annotations{annotations_},
          annotations_type{annotations_ ? AnnotationsType::All : AnnotationsType::None},
@@ -123,7 +119,7 @@ struct RouteParameters : public BaseParameters
                    const GeometriesType geometries_,
                    const OverviewType overview_,
                    const boost::optional<bool> continue_straight_,
-                    Args &&... args_)
+                    Args &&...args_)
        : BaseParameters{std::forward<Args>(args_)...}, steps{steps_}, alternatives{alternatives_},
          number_of_alternatives{alternatives_ ? 1u : 0u},
          annotations{annotations_ != AnnotationsType::None}, annotations_type{annotations_},
@@ -141,7 +137,7 @@ struct RouteParameters : public BaseParameters
                    const OverviewType overview_,
                    const boost::optional<bool> continue_straight_,
                    std::vector<std::size_t> waypoints_,
-                    const Args &&... args_)
+                    const Args &&...args_)
        : BaseParameters{std::forward<Args>(args_)...}, steps{steps_}, alternatives{alternatives_},
          number_of_alternatives{alternatives_ ? 1u : 0u}, annotations{annotations_},
          annotations_type{annotations_ ? AnnotationsType::All : AnnotationsType::None},
@@ -159,7 +155,7 @@ struct RouteParameters : public BaseParameters
                    const OverviewType overview_,
                    const boost::optional<bool> continue_straight_,
                    std::vector<std::size_t> waypoints_,
-                    Args &&... args_)
+                    Args &&...args_)
        : BaseParameters{std::forward<Args>(args_)...}, steps{steps_}, alternatives{alternatives_},
          number_of_alternatives{alternatives_ ? 1u : 0u}, annotations{annotations_ !=
                                                                       AnnotationsType::None},
@@ -184,9 +180,9 @@ struct RouteParameters : public BaseParameters
        const auto coordinates_ok = coordinates.size() >= 2;
        const auto base_params_ok = BaseParameters::IsValid();
        const auto valid_waypoints =
-            std::all_of(waypoints.begin(), waypoints.end(), [this](const auto &w) {
+            std::all_of(waypoints.begin(),
-                return w < coordinates.size();
+                        waypoints.end(),
-            });
+                        [this](const auto &w) { return w < coordinates.size(); });
        return coordinates_ok && base_params_ok && valid_waypoints;
    }
 };
@@ -206,13 +202,11 @@ inline RouteParameters::AnnotationsType operator|(RouteParameters::AnnotationsTy
        static_cast<std::underlying_type_t<RouteParameters::AnnotationsType>>(rhs));
 }
-inline RouteParameters::AnnotationsType operator|=(RouteParameters::AnnotationsType lhs,
+inline RouteParameters::AnnotationsType &operator|=(RouteParameters::AnnotationsType &lhs,
-                                                   RouteParameters::AnnotationsType rhs)
+                                                    RouteParameters::AnnotationsType rhs)
 {
    return lhs = lhs | rhs;
 }
-} // namespace api
+} // namespace osrm::engine::api
 } // namespace engine
 } // namespace osrm
 #endif
@@ -22,11 +22,7 @@
 #include <iterator>
-namespace osrm
+namespace osrm::engine::api
 {
 namespace engine
 {
 namespace api
 {
 class TableAPI final : public BaseAPI
@@ -54,14 +50,14 @@ class TableAPI final : public BaseAPI
                 const std::vector<TableCellRef> &fallback_speed_cells,
                 osrm::engine::api::ResultT &response) const
    {
-        if (response.is<flatbuffers::FlatBufferBuilder>())
+        if (std::holds_alternative<flatbuffers::FlatBufferBuilder>(response))
        {
-            auto &fb_result = response.get<flatbuffers::FlatBufferBuilder>();
+            auto &fb_result = std::get<flatbuffers::FlatBufferBuilder>(response);
            MakeResponse(tables, candidates, fallback_speed_cells, fb_result);
        }
        else
        {
-            auto &json_result = response.get<util::json::Object>();
+            auto &json_result = std::get<util::json::Object>(response);
            MakeResponse(tables, candidates, fallback_speed_cells, json_result);
        }
    }
@@ -133,7 +129,8 @@ class TableAPI final : public BaseAPI
        }
        bool have_speed_cells =
-            parameters.fallback_speed != INVALID_FALLBACK_SPEED && parameters.fallback_speed > 0;
+            parameters.fallback_speed != from_alias<double>(INVALID_FALLBACK_SPEED) &&
            parameters.fallback_speed > 0;
        flatbuffers::Offset<flatbuffers::Vector<uint32_t>> speed_cells;
        if (have_speed_cells)
        {
@@ -182,7 +179,7 @@ class TableAPI final : public BaseAPI
        {
            if (!parameters.skip_waypoints)
            {
-                response.values["sources"] = MakeWaypoints(candidates);
+                response.values.emplace("sources", MakeWaypoints(candidates));
            }
            number_of_sources = candidates.size();
        }
@@ -190,7 +187,7 @@ class TableAPI final : public BaseAPI
        {
            if (!parameters.skip_waypoints)
            {
-                response.values["sources"] = MakeWaypoints(candidates, parameters.sources);
+                response.values.emplace("sources", MakeWaypoints(candidates, parameters.sources));
            }
        }
@@ -198,7 +195,7 @@ class TableAPI final : public BaseAPI
        {
            if (!parameters.skip_waypoints)
            {
-                response.values["destinations"] = MakeWaypoints(candidates);
+                response.values.emplace("destinations", MakeWaypoints(candidates));
            }
            number_of_destinations = candidates.size();
        }
@@ -206,33 +203,37 @@ class TableAPI final : public BaseAPI
        {
            if (!parameters.skip_waypoints)
            {
-                response.values["destinations"] =
+                response.values.emplace("destinations",
-                    MakeWaypoints(candidates, parameters.destinations);
+                                        MakeWaypoints(candidates, parameters.destinations));
            }
        }
        if (parameters.annotations & TableParameters::AnnotationsType::Duration)
        {
-            response.values["durations"] =
+            response.values.emplace(
-                MakeDurationTable(tables.first, number_of_sources, number_of_destinations);
+                "durations",
                MakeDurationTable(tables.first, number_of_sources, number_of_destinations));
        }
        if (parameters.annotations & TableParameters::AnnotationsType::Distance)
        {
-            response.values["distances"] =
+            response.values.emplace(
-                MakeDistanceTable(tables.second, number_of_sources, number_of_destinations);
+                "distances",
                MakeDistanceTable(tables.second, number_of_sources, number_of_destinations));
        }
-        if (parameters.fallback_speed != INVALID_FALLBACK_SPEED && parameters.fallback_speed > 0)
+        if (parameters.fallback_speed != from_alias<double>(INVALID_FALLBACK_SPEED) &&
            parameters.fallback_speed > 0)
        {
-            response.values["fallback_speed_cells"] = MakeEstimatesTable(fallback_speed_cells);
+            response.values.emplace("fallback_speed_cells",
                                    MakeEstimatesTable(fallback_speed_cells));
        }
-        response.values["code"] = "Ok";
+        response.values.emplace("code", "Ok");
        auto data_timestamp = facade.GetTimestamp();
        if (!data_timestamp.empty())
        {
-            response.values["data_version"] = data_timestamp;
+            response.values.emplace("data_version", data_timestamp);
        }
    }
@@ -247,9 +248,8 @@ class TableAPI final : public BaseAPI
        boost::range::transform(candidates,
                                std::back_inserter(waypoints),
-                                [this, &builder](const PhantomNodeCandidates &candidates) {
+                                [this, &builder](const PhantomNodeCandidates &candidates)
-                                    return BaseAPI::MakeWaypoint(&builder, candidates)->Finish();
+                                { return BaseAPI::MakeWaypoint(&builder, candidates)->Finish(); });
                                });
        return builder.CreateVector(waypoints);
    }
@@ -263,7 +263,8 @@ class TableAPI final : public BaseAPI
        boost::range::transform(
            indices,
            std::back_inserter(waypoints),
-            [this, &builder, &candidates](const std::size_t idx) {
+            [this, &builder, &candidates](const std::size_t idx)
            {
                BOOST_ASSERT(idx < candidates.size());
                return BaseAPI::MakeWaypoint(&builder, candidates[idx])->Finish();
            });
@@ -272,18 +273,21 @@ class TableAPI final : public BaseAPI
    virtual flatbuffers::Offset<flatbuffers::Vector<float>>
    MakeDurationTable(flatbuffers::FlatBufferBuilder &builder,
-                      const std::vector<EdgeWeight> &values) const
+                      const std::vector<EdgeDuration> &values) const
    {
        std::vector<float> distance_table;
        distance_table.resize(values.size());
-        std::transform(
+        std::transform(values.begin(),
-            values.begin(), values.end(), distance_table.begin(), [](const EdgeWeight duration) {
+                       values.end(),
-                if (duration == MAXIMAL_EDGE_DURATION)
+                       distance_table.begin(),
-                {
+                       [](const EdgeDuration duration)
-                    return 0.;
+                       {
-                }
+                           if (duration == MAXIMAL_EDGE_DURATION)
-                return duration / 10.;
+                           {
-            });
+                               return 0.;
                           }
                           return from_alias<double>(duration) / 10.;
                       });
        return builder.CreateVector(distance_table);
    }
@@ -293,14 +297,17 @@ class TableAPI final : public BaseAPI
    {
        std::vector<float> duration_table;
        duration_table.resize(values.size());
-        std::transform(
+        std::transform(values.begin(),
-            values.begin(), values.end(), duration_table.begin(), [](const EdgeDistance distance) {
+                       values.end(),
-                if (distance == INVALID_EDGE_DISTANCE)
+                       duration_table.begin(),
-                {
+                       [](const EdgeDistance distance)
-                    return 0.;
+                       {
-                }
+                           if (distance == INVALID_EDGE_DISTANCE)
-                return std::round(distance * 10) / 10.;
+                           {
-            });
+                               return 0.;
                           }
                           return std::round(from_alias<double>(distance) * 10) / 10.;
                       });
        return builder.CreateVector(duration_table);
    }
@@ -310,11 +317,13 @@ class TableAPI final : public BaseAPI
    {
        std::vector<uint32_t> fb_table;
        fb_table.reserve(fallback_speed_cells.size());
-        std::for_each(
+        std::for_each(fallback_speed_cells.begin(),
-            fallback_speed_cells.begin(), fallback_speed_cells.end(), [&](const auto &cell) {
+                      fallback_speed_cells.end(),
-                fb_table.push_back(cell.row);
+                      [&](const auto &cell)
-                fb_table.push_back(cell.column);
+                      {
-            });
+                          fb_table.push_back(cell.row);
                          fb_table.push_back(cell.column);
                      });
        return builder.CreateVector(fb_table);
    }
@@ -327,9 +336,8 @@ class TableAPI final : public BaseAPI
        boost::range::transform(candidates,
                                std::back_inserter(json_waypoints.values),
-                                [this](const PhantomNodeCandidates &candidates) {
+                                [this](const PhantomNodeCandidates &candidates)
-                                    return BaseAPI::MakeWaypoint(candidates);
+                                { return BaseAPI::MakeWaypoint(candidates); });
                                });
        return json_waypoints;
    }
@@ -340,14 +348,15 @@ class TableAPI final : public BaseAPI
        json_waypoints.values.reserve(indices.size());
        boost::range::transform(indices,
                                std::back_inserter(json_waypoints.values),
-                                [this, &candidates](const std::size_t idx) {
+                                [this, &candidates](const std::size_t idx)
                                {
                                    BOOST_ASSERT(idx < candidates.size());
                                    return BaseAPI::MakeWaypoint(candidates[idx]);
                                });
        return json_waypoints;
    }
-    virtual util::json::Array MakeDurationTable(const std::vector<EdgeWeight> &values,
+    virtual util::json::Array MakeDurationTable(const std::vector<EdgeDuration> &values,
                                                std::size_t number_of_rows,
                                                std::size_t number_of_columns) const
    {
@@ -361,15 +370,18 @@ class TableAPI final : public BaseAPI
            std::transform(row_begin_iterator,
                           row_end_iterator,
                           json_row.values.begin(),
-                           [](const EdgeWeight duration) {
+                           [](const EdgeDuration duration)
                           {
                               if (duration == MAXIMAL_EDGE_DURATION)
                               {
                                   return util::json::Value(util::json::Null());
                               }
                               // division by 10 because the duration is in deciseconds (10s)
-                               return util::json::Value(util::json::Number(duration / 10.));
+                               return util::json::Value(
                                   util::json::Number(from_alias<double>(duration) / 10.));
                           });
-            json_table.values.push_back(std::move(json_row));
+
            json_table.values.push_back(util::json::Value{json_row});
        }
        return json_table;
    }
@@ -388,16 +400,17 @@ class TableAPI final : public BaseAPI
            std::transform(row_begin_iterator,
                           row_end_iterator,
                           json_row.values.begin(),
-                           [](const EdgeDistance distance) {
+                           [](const EdgeDistance distance)
                           {
                               if (distance == INVALID_EDGE_DISTANCE)
                               {
                                   return util::json::Value(util::json::Null());
                               }
                               // round to single decimal place
-                               return util::json::Value(
+                               return util::json::Value(util::json::Number(
-                                   util::json::Number(std::round(distance * 10) / 10.));
+                                   std::round(from_alias<double>(distance) * 10) / 10.));
                           });
-            json_table.values.push_back(std::move(json_row));
+            json_table.values.push_back(util::json::Value{json_row});
        }
        return json_table;
    }
@@ -407,11 +420,16 @@ class TableAPI final : public BaseAPI
    {
        util::json::Array json_table;
        std::for_each(
-            fallback_speed_cells.begin(), fallback_speed_cells.end(), [&](const auto &cell) {
+            fallback_speed_cells.begin(),
            fallback_speed_cells.end(),
            [&](const auto &cell)
            {
                util::json::Array row;
-                row.values.push_back(util::json::Number(cell.row));
+                util::json::Value jCellRow{util::json::Number(static_cast<double>(cell.row))};
-                row.values.push_back(util::json::Number(cell.column));
+                util::json::Value jCellColumn{util::json::Number(static_cast<double>(cell.column))};
-                json_table.values.push_back(std::move(row));
+                row.values.push_back(jCellRow);
                row.values.push_back(jCellColumn);
                json_table.values.push_back(util::json::Value{row});
            });
        return json_table;
    }
@@ -419,8 +437,6 @@ class TableAPI final : public BaseAPI
    const TableParameters &parameters;
 };
-} // namespace api
+} // namespace osrm::engine::api
 } // namespace engine
 } // namespace osrm
 #endif
@@ -36,11 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <iterator>
 #include <vector>
-namespace osrm
+namespace osrm::engine::api
 {
 namespace engine
 {
 namespace api
 {
 /**
@@ -59,7 +55,7 @@ struct TableParameters : public BaseParameters
 {
    std::vector<std::size_t> sources;
    std::vector<std::size_t> destinations;
-    double fallback_speed = INVALID_FALLBACK_SPEED;
+    double fallback_speed = from_alias<double>(INVALID_FALLBACK_SPEED);
    enum class FallbackCoordinateType
    {
@@ -85,7 +81,7 @@ struct TableParameters : public BaseParameters
    template <typename... Args>
    TableParameters(std::vector<std::size_t> sources_,
                    std::vector<std::size_t> destinations_,
-                    Args &&... args_)
+                    Args &&...args_)
        : BaseParameters{std::forward<Args>(args_)...}, sources{std::move(sources_)},
          destinations{std::move(destinations_)}
    {
@@ -95,7 +91,7 @@ struct TableParameters : public BaseParameters
    TableParameters(std::vector<std::size_t> sources_,
                    std::vector<std::size_t> destinations_,
                    const AnnotationsType annotations_,
-                    Args &&... args_)
+                    Args &&...args_)
        : BaseParameters{std::forward<Args>(args_)...}, sources{std::move(sources_)},
          destinations{std::move(destinations_)}, annotations{annotations_}
    {
@@ -108,7 +104,7 @@ struct TableParameters : public BaseParameters
                    double fallback_speed_,
                    FallbackCoordinateType fallback_coordinate_type_,
                    double scale_factor_,
-                    Args &&... args_)
+                    Args &&...args_)
        : BaseParameters{std::forward<Args>(args_)...}, sources{std::move(sources_)},
          destinations{std::move(destinations_)}, fallback_speed{fallback_speed_},
          fallback_coordinate_type{fallback_coordinate_type_}, annotations{annotations_},
@@ -166,8 +162,6 @@ inline TableParameters::AnnotationsType &operator|=(TableParameters::Annotations
 {
    return lhs = lhs | rhs;
 }
-} // namespace api
+} // namespace osrm::engine::api
 } // namespace engine
 } // namespace osrm
 #endif // ENGINE_API_TABLE_PARAMETERS_HPP
@@ -30,11 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <cmath>
-namespace osrm
+namespace osrm::engine::api
 {
 namespace engine
 {
 namespace api
 {
 /**
@@ -70,8 +66,6 @@ struct TileParameters final
        return valid_x && valid_y && valid_z;
    }
 };
-} // namespace api
+} // namespace osrm::engine::api
 } // namespace engine
 } // namespace osrm
 #endif
@@ -10,11 +10,7 @@
 #include "util/integer_range.hpp"
-namespace osrm
+namespace osrm::engine::api
 {
 namespace engine
 {
 namespace api
 {
 class TripAPI final : public RouteAPI
@@ -31,14 +27,14 @@ class TripAPI final : public RouteAPI
    {
        BOOST_ASSERT(sub_trips.size() == sub_routes.size());
-        if (response.is<flatbuffers::FlatBufferBuilder>())
+        if (std::holds_alternative<flatbuffers::FlatBufferBuilder>(response))
        {
-            auto &fb_result = response.get<flatbuffers::FlatBufferBuilder>();
+            auto &fb_result = std::get<flatbuffers::FlatBufferBuilder>(response);
            MakeResponse(sub_trips, sub_routes, candidates, fb_result);
        }
        else
        {
-            auto &json_result = response.get<util::json::Object>();
+            auto &json_result = std::get<util::json::Object>(response);
            MakeResponse(sub_trips, sub_routes, candidates, json_result);
        }
    }
@@ -54,10 +50,10 @@ class TripAPI final : public RouteAPI
            data_version_string = fb_result.CreateString(data_timestamp);
        }
-        auto response =
+        auto response = MakeFBResponse(sub_routes,
-            MakeFBResponse(sub_routes, fb_result, [this, &fb_result, &sub_trips, &candidates]() {
+                                       fb_result,
-                return MakeWaypoints(fb_result, sub_trips, candidates);
+                                       [this, &fb_result, &sub_trips, &candidates]()
-            });
+                                       { return MakeWaypoints(fb_result, sub_trips, candidates); });
        if (!data_timestamp.empty())
        {
@@ -83,14 +79,14 @@ class TripAPI final : public RouteAPI
        }
        if (!parameters.skip_waypoints)
        {
-            response.values["waypoints"] = MakeWaypoints(sub_trips, candidates);
+            response.values.emplace("waypoints", MakeWaypoints(sub_trips, candidates));
        }
-        response.values["trips"] = std::move(routes);
+        response.values.emplace("trips", std::move(routes));
-        response.values["code"] = "Ok";
+        response.values.emplace("code", "Ok");
        auto data_timestamp = facade.GetTimestamp();
        if (!data_timestamp.empty())
        {
-            response.values["data_version"] = data_timestamp;
+            response.values.emplace("data_version", data_timestamp);
        }
    }
@@ -155,8 +151,8 @@ class TripAPI final : public RouteAPI
            BOOST_ASSERT(!trip_index.NotUsed());
            auto waypoint = BaseAPI::MakeWaypoint(candidates[input_index]);
-            waypoint.values["trips_index"] = trip_index.sub_trip_index;
+            waypoint.values.emplace("trips_index", trip_index.sub_trip_index);
-            waypoint.values["waypoint_index"] = trip_index.point_index;
+            waypoint.values.emplace("waypoint_index", trip_index.point_index);
            waypoints.values.push_back(std::move(waypoint));
        }
@@ -180,8 +176,6 @@ class TripAPI final : public RouteAPI
    const TripParameters &parameters;
 };
-} // namespace api
+} // namespace osrm::engine::api
 } // namespace engine
 } // namespace osrm
 #endif
@@ -33,11 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <boost/optional.hpp>
 #include <vector>
-namespace osrm
+namespace osrm::engine::api
 {
 namespace engine
 {
 namespace api
 {
 /**
@@ -64,7 +60,7 @@ struct TripParameters : public RouteParameters
    TripParameters(SourceType source_,
                   DestinationType destination_,
                   bool roundtrip_,
-                   Args &&... args_)
+                   Args &&...args_)
        : RouteParameters{std::forward<Args>(args_)...}, source{source_},
          destination{destination_}, roundtrip{roundtrip_}
    {
@@ -76,8 +72,6 @@ struct TripParameters : public RouteParameters
    bool IsValid() const { return RouteParameters::IsValid(); }
 };
-} // namespace api
+} // namespace osrm::engine::api
 } // namespace engine
 } // namespace osrm
 #endif
@@ -30,17 +30,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <cstdint>
-namespace osrm
+namespace osrm::engine
 {
 namespace engine
 {
 enum class Approach : std::uint8_t
 {
    CURB = 0,
-    UNRESTRICTED = 1
+    UNRESTRICTED = 1,
    OPPOSITE = 2
 };
-}
+} // namespace osrm::engine
 } // namespace osrm
 #endif
@@ -28,9 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef OSRM_ENGINE_BEARING_HPP
 #define OSRM_ENGINE_BEARING_HPP
-namespace osrm
+namespace osrm::engine
 {
 namespace engine
 {
 struct Bearing
@@ -46,7 +44,6 @@ inline bool operator==(const Bearing lhs, const Bearing rhs)
    return lhs.bearing == rhs.bearing && lhs.range == rhs.range;
 }
 inline bool operator!=(const Bearing lhs, const Bearing rhs) { return !(lhs == rhs); }
-} // namespace engine
+} // namespace osrm::engine
 } // namespace osrm
 #endif
@@ -17,9 +17,7 @@
 #include <memory>
 #include <thread>
-namespace osrm
+namespace osrm::engine
 {
 namespace engine
 {
 namespace detail
@@ -149,7 +147,6 @@ class DataWatchdogImpl<AlgorithmT, datafacade::ContiguousInternalMemoryDataFacad
 // once a new dataset arrives.
 template <typename AlgorithmT, template <typename A> class FacadeT>
 using DataWatchdog = detail::DataWatchdogImpl<AlgorithmT, FacadeT<AlgorithmT>>;
-} // namespace engine
+} // namespace osrm::engine
 } // namespace osrm
 #endif
@@ -3,15 +3,12 @@
 #include "engine/datafacade/contiguous_internalmem_datafacade.hpp"
-namespace osrm
+namespace osrm::engine
 {
 namespace engine
 {
 using DataFacadeBase = datafacade::ContiguousInternalMemoryDataFacadeBase;
 template <typename AlgorithmT>
 using DataFacade = datafacade::ContiguousInternalMemoryDataFacade<AlgorithmT>;
-} // namespace engine
+} // namespace osrm::engine
 } // namespace osrm
 #endif
@@ -12,11 +12,7 @@
 #include "util/filtered_graph.hpp"
 #include "util/integer_range.hpp"
-namespace osrm
+namespace osrm::engine::datafacade
 {
 namespace engine
 {
 namespace datafacade
 {
 // Namespace local aliases for algorithms
@@ -59,7 +55,7 @@ template <> class AlgorithmDataFacade<CH>
    virtual EdgeID FindSmallestEdge(const NodeID edge_based_node_from,
                                    const NodeID edge_based_node_to,
-                                    const std::function<bool(EdgeData)> filter) const = 0;
+                                    const std::function<bool(const EdgeData &)> &filter) const = 0;
 };
 template <> class AlgorithmDataFacade<MLD>
@@ -83,7 +79,7 @@ template <> class AlgorithmDataFacade<MLD>
    virtual EdgeWeight GetNodeWeight(const NodeID edge_based_node_id) const = 0;
-    virtual EdgeWeight
+    virtual EdgeDuration
    GetNodeDuration(const NodeID edge_based_node_id) const = 0; // TODO: to be removed
    virtual EdgeDistance GetNodeDistance(const NodeID edge_based_node_id) const = 0;
@@ -109,8 +105,6 @@ template <> class AlgorithmDataFacade<MLD>
    virtual EdgeID FindEdge(const NodeID edge_based_node_from,
                            const NodeID edge_based_node_to) const = 0;
 };
-} // namespace datafacade
+} // namespace osrm::engine::datafacade
 } // namespace engine
 } // namespace osrm
 #endif
@@ -3,11 +3,7 @@
 #include "storage/shared_data_index.hpp"
-namespace osrm
+namespace osrm::engine::datafacade
 {
 namespace engine
 {
 namespace datafacade
 {
 class ContiguousBlockAllocator
@@ -19,8 +15,6 @@ class ContiguousBlockAllocator
    virtual const storage::SharedDataIndex &GetIndex() = 0;
 };
-} // namespace datafacade
+} // namespace osrm::engine::datafacade
 } // namespace engine
 } // namespace osrm
 #endif // OSRM_ENGINE_DATAFACADE_CONTIGUOUS_BLOCK_ALLOCATOR_HPP_
--- a/Show More
+++ b/Show More
`@@ -105,3 +105,4 @@ debug.lua`

	`# node-osrm artifacts`	`# node-osrm artifacts`
	`lib/binding`	`lib/binding`