wip

.clang-tidy

@@ -13,10 +13,6 @@ 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,
@@ -53,13 +49,11 @@ Checks: >
     -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,
@@ -88,10 +82,6 @@ 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: '*'

.github/workflows/osrm-backend-docker.yml

@@ -6,9 +6,6 @@ on:
 
 jobs:
   publish:
-    strategy:
-      matrix:
-        docker-base-image: ["debian", "alpine"]
     runs-on: ubuntu-latest
     steps:       
       - name: Check out the repo
@@ -56,10 +53,10 @@ jobs:
         with:
           push: true
           platforms: linux/amd64,linux/arm64
-          file: ./docker/Dockerfile-${{ matrix.docker-base-image }}
+          file: ./docker/Dockerfile
           tags: ${{ steps.metadebug.outputs.tags  }}
           build-args: |
-            DOCKER_TAG=${{ join(steps.metadebug.outputs.tags ) }}-${{ matrix.docker-base-image }}
+            DOCKER_TAG=${{ join(steps.metadebug.outputs.tags ) }}
 
 
       - name: Build container image - assertions
@@ -67,10 +64,10 @@ jobs:
         with:
           push: true
           platforms: linux/amd64,linux/arm64
-          file: ./docker/Dockerfile-${{ matrix.docker-base-image }}
+          file: ./docker/Dockerfile
           tags: ${{ steps.metaassertions.outputs.tags  }}
           build-args: |
-            DOCKER_TAG=${{ join(steps.metaassertions.outputs.tags ) }}-${{ matrix.docker-base-image }}
+            DOCKER_TAG=${{ join(steps.metaassertions.outputs.tags ) }}
 
       # build and publish "normal" image as last to get it listed on top
       - name: Build container image - normal
@@ -78,7 +75,10 @@ jobs:
         with:
           push: true
           platforms: linux/amd64,linux/arm64
-          file: ./docker/Dockerfile-${{ matrix.docker-base-image }}
+          file: ./docker/Dockerfile
-          tags: ${{ steps.meta.outputs.tags  }}
+          tags:  ${{ steps.meta.outputs.tags  }}
           build-args: |
-            DOCKER_TAG=${{ join(steps.meta.outputs.tags ) }}-${{ matrix.docker-base-image }}
+            DOCKER_TAG=${{ join(steps.meta.outputs.tags ) }}            
+
+
+            

.github/workflows/stale.yml

@@ -1,24 +0,0 @@
-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'
-
-  
-

CHANGELOG.md

@@ -1,17 +1,12 @@
 # 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)
@@ -24,30 +19,7 @@
     - NodeJS:
       - CHANGED: Use node-api instead of NAN. [#6452](https://github.com/Project-OSRM/osrm-backend/pull/6452)
     - Misc:
-      - CHANGED: Optimise encodePolyline function. [#6940](https://github.com/Project-OSRM/osrm-backend/pull/6940)
-      - CHANGED: Avoid reallocations in base64 encoding. [#6951](https://github.com/Project-OSRM/osrm-backend/pull/6951)
-      - 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)
@@ -77,7 +49,6 @@
       - 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:

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.18)
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
@@ -120,9 +120,10 @@ 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/include)
+include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/sol2-3.3.0/include)
+include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/variant/include)
 
-set(BOOST_COMPONENTS date_time iostreams program_options thread unit_test_framework)
+set(BOOST_COMPONENTS date_time chrono filesystem iostreams program_options regex system thread unit_test_framework)
 
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/include/util/version.hpp.in
@@ -266,6 +267,7 @@ 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)
@@ -330,12 +332,20 @@ if(ENABLE_CONAN)
 
   set(CONAN_BOOST_VERSION "1.85.0@#14265ec82b25d91305bbb3b30d3357f8")
   set(CONAN_BZIP2_VERSION "1.0.8@#d1b2d5816f25865acf978501dff1f897")
-  set(CONAN_EXPAT_VERSION "2.6.2@#2d385d0d50eb5561006a7ff9e356656b")
+  set(CONAN_EXPAT_VERSION "2.2.10@#916908d4a570ad839edd25322c3268cd")
-  set(CONAN_LUA_VERSION "5.4.6@#658d6089093cf01992c2737ab2e96763")
+  set(CONAN_LUA_VERSION "5.4.4@#3ec62efc37cd0a5d80b9e5cb35277360")
-  set(CONAN_TBB_VERSION "2021.12.0@#e56e5b44be8d690530585dd3634c0106")
+  set(CONAN_TBB_VERSION "2021.3.0@#507ec17cbd51a84167e143b20d170eea")
 
   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
@@ -348,7 +358,9 @@ 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:without_stacktrace=True # Apple Silicon cross-compilation fails without it
+    OPTIONS boost:filesystem_version=3 # https://stackoverflow.com/questions/73392648/error-with-boost-filesystem-version-in-cmake
+            # onetbb:shared=${TBB_SHARED}
+            boost:without_stacktrace=True # Apple Silicon cross-compilation fails without it
     BUILD missing
   )
 
@@ -377,10 +389,14 @@ 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}")
 
 
@@ -453,6 +469,7 @@ 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_)
@@ -462,8 +479,11 @@ 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}
@@ -482,6 +502,7 @@ endif()
 
 set(EXTRACTOR_LIBRARIES
     ${BZIP2_LIBRARIES}
+    ${Boost_REGEX_LIBRARY}
     ${BOOST_BASE_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
     ${EXPAT_LIBRARIES}
@@ -586,6 +607,7 @@ 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)
@@ -605,6 +627,7 @@ 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)

cmake/conan.cmake

@@ -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 1950)
+    elseif(NOT MSVC_VERSION VERSION_LESS 1930 AND MSVC_VERSION VERSION_LESS 1940)
         set(${result} 17 PARENT_SCOPE)
     else()
         message(FATAL_ERROR "Conan: Unknown MSVC compiler version [${MSVC_VERSION}]")

cmake/warnings.cmake

@@ -50,7 +50,9 @@ add_warning(all)
 add_warning(extra)
 add_warning(pedantic)
 add_warning(error) # treat all warnings as errors
-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    add_warning(strict-overflow=2)
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     add_warning(strict-overflow=1)
 endif()
 add_warning(suggest-override)
@@ -77,10 +79,15 @@ add_warning(sizeof-array-argument)
 add_warning(switch-bool)
 add_warning(tautological-compare)
 add_warning(trampolines)
-# these warnings are not enabled by default
+no_warning(c++17-extensions)
-# no_warning(name-of-warning)
+# TODO: these warnings are not enabled by default, but we consider them as useful and good to enable in the future
-no_warning(deprecated-comma-subscript)
+no_warning(implicit-int-conversion)
-no_warning(comma-subscript)
+no_warning(implicit-float-conversion)
-no_warning(ambiguous-reversed-operator)
+no_warning(unused-member-function)
-no_warning(restrict)
+no_warning(old-style-cast)
-no_warning(free-nonheap-object)
+no_warning(non-virtual-dtor)
+no_warning(float-conversion)
+no_warning(sign-conversion)
+no_warning(shorten-64-to-32)
+no_warning(padded)
+no_warning(missing-noreturn)

docker/Dockerfile

@@ -1 +0,0 @@
-Dockerfile-debian

docker/Dockerfile

@@ -0,0 +1,67 @@
+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 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.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
+
+
+# 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

docker/Dockerfile-alpine

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

docker/Dockerfile-debian

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

docker/hooks/build

@@ -6,8 +6,4 @@
 # 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 ..

docs/nodejs/api.md

@@ -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', 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', 'CoreCH' 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.

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 = std::get<json::Object>(result);
+    auto &json_result = result.get<json::Object>();
     if (status == Status::Ok)
     {
-        auto &routes = std::get<json::Array>(json_result.values["routes"]);
+        auto &routes = json_result.values["routes"].get<json::Array>();
 
         // Let's just use the first route
-        auto &route = std::get<json::Object>(routes.values.at(0));
+        auto &route = routes.values.at(0).get<json::Object>();
-        const auto distance = std::get<json::Number>(route.values["distance"]).value;
+        const auto distance = route.values["distance"].get<json::Number>().value;
-        const auto duration = std::get<json::Number>(route.values["duration"]).value;
+        const auto duration = route.values["duration"].get<json::Number>().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 = std::get<json::String>(json_result.values["code"]).value;
+        const auto code = json_result.values["code"].get<json::String>().value;
-        const auto message = std::get<json::String>(json_result.values["message"]).value;
+        const auto message = json_result.values["message"].get<json::String>().value;
 
         std::cout << "Code: " << code << "\n";
         std::cout << "Message: " << code << "\n";

features/support/env.js

@@ -42,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.1;
+        this.OSRM_CONNECTION_EXP_BACKOFF_COEF = process.env.OSRM_CONNECTION_EXP_BACKOFF_COEF && parseFloat(process.env.OSRM_CONNECTION_EXP_BACKOFF_COEF) || 1.0;
 
         this.HOST = `http://${this.OSRM_IP}:${this.OSRM_PORT}`;
 

include/contractor/contractor_config.hpp

@@ -31,7 +31,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "storage/io_config.hpp"
 #include "updater/updater_config.hpp"
 
-#include <filesystem>
+#include <boost/filesystem/path.hpp>
+
 #include <string>
 
 namespace osrm::contractor
@@ -46,7 +47,7 @@ struct ContractorConfig final : storage::IOConfig
     }
 
     // Infer the output names from the path of the .osrm file
-    void UseDefaultOutputNames(const std::filesystem::path &base)
+    void UseDefaultOutputNames(const boost::filesystem::path &base)
     {
         IOConfig::UseDefaultOutputNames(base);
         updater_config.UseDefaultOutputNames(base);

include/contractor/crc32_processor.hpp

@@ -0,0 +1,128 @@
+#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::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 osrm::contractor
+
+#endif /* ITERATOR_BASED_CRC32_H */

include/contractor/files.hpp

@@ -9,7 +9,7 @@ namespace osrm::contractor::files
 {
 // reads .osrm.hsgr file
 template <typename ContractedMetricT>
-inline void readGraph(const std::filesystem::path &path,
+inline void readGraph(const boost::filesystem::path &path,
                       std::unordered_map<std::string, ContractedMetricT> &metrics,
                       std::uint32_t &connectivity_checksum)
 {
@@ -30,7 +30,7 @@ inline void readGraph(const std::filesystem::path &path,
 
 // writes .osrm.hsgr file
 template <typename ContractedMetricT>
-inline void writeGraph(const std::filesystem::path &path,
+inline void writeGraph(const boost::filesystem::path &path,
                        const std::unordered_map<std::string, ContractedMetricT> &metrics,
                        const std::uint32_t connectivity_checksum)
 {

include/customizer/customizer_config.hpp

@@ -1,8 +1,9 @@
 #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"
@@ -26,7 +27,7 @@ struct CustomizationConfig final : storage::IOConfig
     {
     }
 
-    void UseDefaultOutputNames(const std::filesystem::path &base)
+    void UseDefaultOutputNames(const boost::filesystem::path &base)
     {
         IOConfig::UseDefaultOutputNames(base);
         updater_config.UseDefaultOutputNames(base);

include/customizer/edge_based_graph.hpp

@@ -9,7 +9,7 @@
 
 #include "storage/shared_memory_ownership.hpp"
 
-#include <filesystem>
+#include <boost/filesystem/path.hpp>
 
 namespace osrm::customizer
 {

include/customizer/files.hpp

@@ -14,7 +14,7 @@ namespace osrm::customizer::files
 
 // reads .osrm.cell_metrics file
 template <typename CellMetricT>
-inline void readCellMetrics(const std::filesystem::path &path,
+inline void readCellMetrics(const boost::filesystem::path &path,
                             std::unordered_map<std::string, std::vector<CellMetricT>> &metrics)
 {
     static_assert(std::is_same<CellMetricView, CellMetricT>::value ||
@@ -44,7 +44,7 @@ inline void readCellMetrics(const std::filesystem::path &path,
 // writes .osrm.cell_metrics file
 template <typename CellMetricT>
 inline void
-writeCellMetrics(const std::filesystem::path &path,
+writeCellMetrics(const boost::filesystem::path &path,
                  const std::unordered_map<std::string, std::vector<CellMetricT>> &metrics)
 {
     static_assert(std::is_same<CellMetricView, CellMetricT>::value ||
@@ -72,7 +72,7 @@ writeCellMetrics(const std::filesystem::path &path,
 
 // reads .osrm.mldgr file
 template <typename MultiLevelGraphT>
-inline void readGraph(const std::filesystem::path &path,
+inline void readGraph(const boost::filesystem::path &path,
                       MultiLevelGraphT &graph,
                       std::uint32_t &connectivity_checksum)
 {
@@ -88,7 +88,7 @@ inline void readGraph(const std::filesystem::path &path,
 
 // writes .osrm.mldgr file
 template <typename MultiLevelGraphT>
-inline void writeGraph(const std::filesystem::path &path,
+inline void writeGraph(const boost::filesystem::path &path,
                        const MultiLevelGraphT &graph,
                        const std::uint32_t connectivity_checksum)
 {

include/engine/api/base_result.hpp

@@ -2,7 +2,7 @@
 #define ENGINE_API_BASE_RESULT_HPP
 
 #include <flatbuffers/flatbuffers.h>
-#include <variant>
+#include <mapbox/variant.hpp>
 
 #include <string>
 
@@ -10,7 +10,8 @@
 
 namespace osrm::engine::api
 {
-using ResultT = std::variant<util::json::Object, std::string, flatbuffers::FlatBufferBuilder>;
+using ResultT =
+    mapbox::util::variant<util::json::Object, std::string, flatbuffers::FlatBufferBuilder>;
 } // namespace osrm::engine::api
 
 #endif

include/engine/api/json_factory.hpp

@@ -41,7 +41,7 @@ inline bool hasValidLanes(const guidance::IntermediateIntersection &intersection
     return intersection.lanes.lanes_in_turn > 0;
 }
 
-util::json::Value coordinateToLonLat(const util::Coordinate &coordinate);
+util::json::Array coordinateToLonLat(const util::Coordinate &coordinate);
 
 /**
  * Ensures that a bearing value is a whole number, and clamped to the range 0-359
@@ -79,7 +79,7 @@ util::json::Object makeGeoJSONGeometry(ForwardIter begin, ForwardIter end)
         coordinates.values.push_back(location);
         coordinates.values.push_back(location);
     }
-    geojson.values["coordinates"] = util::json::Value{std::move(coordinates)};
+    geojson.values["coordinates"] = std::move(coordinates);
 
     return geojson;
 }

include/engine/api/match_api.hpp

@@ -30,14 +30,14 @@ class MatchAPI final : public RouteAPI
                       osrm::engine::api::ResultT &response) const
     {
         BOOST_ASSERT(sub_matchings.size() == sub_routes.size());
-        if (std::holds_alternative<flatbuffers::FlatBufferBuilder>(response))
+        if (response.is<flatbuffers::FlatBufferBuilder>())
         {
-            auto &fb_result = std::get<flatbuffers::FlatBufferBuilder>(response);
+            auto &fb_result = response.get<flatbuffers::FlatBufferBuilder>();
             MakeResponse(sub_matchings, sub_routes, fb_result);
         }
         else
         {
-            auto &json_result = std::get<util::json::Object>(response);
+            auto &json_result = response.get<util::json::Object>();
             MakeResponse(sub_matchings, sub_routes, json_result);
         }
     }
@@ -77,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.emplace("confidence", sub_matchings[index].confidence);
+            route.values["confidence"] = sub_matchings[index].confidence;
-            routes.values.emplace_back(std::move(route));
+            routes.values.push_back(std::move(route));
         }
         if (!parameters.skip_waypoints)
         {
-            response.values.emplace("tracepoints", MakeTracepoints(sub_matchings));
+            response.values["tracepoints"] = MakeTracepoints(sub_matchings);
         }
-        response.values.emplace("matchings", std::move(routes));
+        response.values["matchings"] = std::move(routes);
-        response.values.emplace("code", "Ok");
+        response.values["code"] = "Ok";
         auto data_timestamp = facade.GetTimestamp();
         if (!data_timestamp.empty())
         {
-            response.values.emplace("data_version", data_timestamp);
+            response.values["data_version"] = data_timestamp;
         }
     }
 
@@ -132,13 +132,13 @@ class MatchAPI final : public RouteAPI
 
             if (tidy_result.can_be_removed[trace_index])
             {
-                waypoints.emplace_back(fbresult::WaypointBuilder(fb_result).Finish());
+                waypoints.push_back(fbresult::WaypointBuilder(fb_result).Finish());
                 continue;
             }
             auto matching_index = trace_idx_to_matching_idx[trace_index];
             if (matching_index.NotMatched())
             {
-                waypoints.emplace_back(fbresult::WaypointBuilder(fb_result).Finish());
+                waypoints.push_back(fbresult::WaypointBuilder(fb_result).Finish());
                 continue;
             }
             const auto &phantom =
@@ -165,7 +165,7 @@ class MatchAPI final : public RouteAPI
             {
                 waypoint->add_waypoint_index(matching_index.point_index);
             }
-            waypoints.emplace_back(waypoint->Finish());
+            waypoints.push_back(waypoint->Finish());
         }
 
         return fb_result.CreateVector(waypoints);
@@ -186,23 +186,23 @@ class MatchAPI final : public RouteAPI
         {
             if (tidy_result.can_be_removed[trace_index])
             {
-                waypoints.values.emplace_back(util::json::Null());
+                waypoints.values.push_back(util::json::Null());
                 continue;
             }
             auto matching_index = trace_idx_to_matching_idx[trace_index];
             if (matching_index.NotMatched())
             {
-                waypoints.values.emplace_back(util::json::Null());
+                waypoints.values.push_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.emplace("matchings_index", matching_index.sub_matching_index);
+            waypoint.values["matchings_index"] = matching_index.sub_matching_index;
-            waypoint.values.emplace("waypoint_index", matching_index.point_index);
+            waypoint.values["waypoint_index"] = matching_index.point_index;
-            waypoint.values.emplace("alternatives_count",
+            waypoint.values["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())
@@ -217,7 +217,7 @@ class MatchAPI final : public RouteAPI
                     waypoint.values["waypoint_index"] = util::json::Null();
                 }
             }
-            waypoints.values.emplace_back(std::move(waypoint));
+            waypoints.values.push_back(std::move(waypoint));
         }
 
         return waypoints;

include/engine/api/nearest_api.hpp

@@ -29,14 +29,14 @@ class NearestAPI final : public BaseAPI
         BOOST_ASSERT(phantom_nodes.size() == 1);
         BOOST_ASSERT(parameters.coordinates.size() == 1);
 
-        if (std::holds_alternative<flatbuffers::FlatBufferBuilder>(response))
+        if (response.is<flatbuffers::FlatBufferBuilder>())
         {
-            auto &fb_result = std::get<flatbuffers::FlatBufferBuilder>(response);
+            auto &fb_result = response.get<flatbuffers::FlatBufferBuilder>();
             MakeResponse(phantom_nodes, fb_result);
         }
         else
         {
-            auto &json_result = std::get<util::json::Object>(response);
+            auto &json_result = response.get<util::json::Object>();
             MakeResponse(phantom_nodes, json_result);
         }
     }
@@ -100,23 +100,23 @@ class NearestAPI final : public BaseAPI
                                auto waypoint = MakeWaypoint({phantom_node});
 
                                util::json::Array nodes;
-                               nodes.values.reserve(2);
 
                                auto node_values = MakeNodes(phantom_node);
 
-                               nodes.values.emplace_back(node_values.first);
+                               nodes.values.push_back(node_values.first);
-                               nodes.values.emplace_back(node_values.second);
+                               nodes.values.push_back(node_values.second);
-                               waypoint.values.emplace("nodes", std::move(nodes));
+                               waypoint.values["nodes"] = std::move(nodes);
+
                                return waypoint;
                            });
-            response.values.emplace("waypoints", std::move(waypoints));
+            response.values["waypoints"] = std::move(waypoints);
         }
 
-        response.values.emplace("code", "Ok");
+        response.values["code"] = "Ok";
         auto data_timestamp = facade.GetTimestamp();
         if (!data_timestamp.empty())
         {
-            response.values.emplace("data_version", data_timestamp);
+            response.values["data_version"] = data_timestamp;
         }
     }
 

include/engine/api/route_api.hpp

@@ -50,14 +50,14 @@ class RouteAPI : public BaseAPI
     {
         BOOST_ASSERT(!raw_routes.routes.empty());
 
-        if (std::holds_alternative<flatbuffers::FlatBufferBuilder>(response))
+        if (response.is<flatbuffers::FlatBufferBuilder>())
         {
-            auto &fb_result = std::get<flatbuffers::FlatBufferBuilder>(response);
+            auto &fb_result = response.get<flatbuffers::FlatBufferBuilder>();
             MakeResponse(raw_routes, waypoint_candidates, fb_result);
         }
         else
         {
-            auto &json_result = std::get<util::json::Object>(response);
+            auto &json_result = response.get<util::json::Object>();
             MakeResponse(raw_routes, waypoint_candidates, json_result);
         }
     }
@@ -110,14 +110,14 @@ class RouteAPI : public BaseAPI
 
         if (!parameters.skip_waypoints)
         {
-            response.values.emplace("waypoints", BaseAPI::MakeWaypoints(waypoint_candidates));
+            response.values["waypoints"] = BaseAPI::MakeWaypoints(waypoint_candidates);
         }
-        response.values.emplace("routes", std::move(jsRoutes));
+        response.values["routes"] = std::move(jsRoutes);
-        response.values.emplace("code", "Ok");
+        response.values["code"] = "Ok";
         auto data_timestamp = facade.GetTimestamp();
         if (!data_timestamp.empty())
         {
-            response.values.emplace("data_version", data_timestamp);
+            response.values["data_version"] = data_timestamp;
         }
     }
 
@@ -158,8 +158,8 @@ class RouteAPI : public BaseAPI
     }
 
     template <typename ForwardIter>
-    std::variant<flatbuffers::Offset<flatbuffers::String>,
+    mapbox::util::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)
@@ -340,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
@@ -408,8 +408,8 @@ class RouteAPI : public BaseAPI
 
         // Fill geometry
         auto overview = MakeOverview(leg_geometries);
-        std::variant<flatbuffers::Offset<flatbuffers::String>,
+        mapbox::util::variant<flatbuffers::Offset<flatbuffers::String>,
-                     flatbuffers::Offset<flatbuffers::Vector<const fbresult::Position *>>>
+                              flatbuffers::Offset<flatbuffers::Vector<const fbresult::Position *>>>
             geometry;
         if (overview)
         {
@@ -426,7 +426,8 @@ class RouteAPI : public BaseAPI
         routeObject.add_legs(legs_vector);
         if (overview)
         {
-            std::visit(GeometryVisitor<fbresult::RouteObjectBuilder>(routeObject), geometry);
+            mapbox::util::apply_visitor(GeometryVisitor<fbresult::RouteObjectBuilder>(routeObject),
+                                        geometry);
         }
 
         return routeObject.Finish();
@@ -442,22 +443,23 @@ class RouteAPI : public BaseAPI
         if (requested_annotations & RouteParameters::AnnotationsType::Speed)
         {
             double prev_speed = 0;
-            speed = GetAnnotations<float>(
+            speed =
-                fb_result,
+                GetAnnotations<float>(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 = std::round(anno.distance / anno.duration * 10.) / 10.;
+                                              auto speed =
-                        prev_speed = speed;
+                                                  round(anno.distance / anno.duration * 10.) / 10.;
-                        return util::json::clamp_float(speed);
+                                              prev_speed = speed;
-                    }
+                                              return util::json::clamp_float(speed);
-                });
+                                          }
+                                      });
         }
 
         flatbuffers::Offset<flatbuffers::Vector<uint32_t>> duration;
@@ -643,7 +645,7 @@ class RouteAPI : public BaseAPI
         stepBuilder.add_rotary_pronunciation(rotary_pronunciation_string);
         stepBuilder.add_intersections(intersections_vector);
         stepBuilder.add_maneuver(maneuver_buffer);
-        std::visit(GeometryVisitor<fbresult::StepBuilder>(stepBuilder), geometry);
+        mapbox::util::apply_visitor(GeometryVisitor<fbresult::StepBuilder>(stepBuilder), geometry);
         return stepBuilder.Finish();
     };
 
@@ -716,8 +718,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 =
@@ -784,57 +786,49 @@ class RouteAPI : public BaseAPI
                 if (requested_annotations & RouteParameters::AnnotationsType::Speed)
                 {
                     double prev_speed = 0;
-                    annotation.values.emplace(
+                    annotation.values["speed"] = GetAnnotations(
-                        "speed",
+                        leg_geometry,
-                        GetAnnotations(leg_geometry,
+                        [&prev_speed](const guidance::LegGeometry::Annotation &anno)
-                                       [&prev_speed](const guidance::LegGeometry::Annotation &anno)
+                        {
-                                       {
+                            if (anno.duration < std::numeric_limits<double>::min())
-                                           if (anno.duration < std::numeric_limits<double>::min())
+                            {
-                                           {
+                                return prev_speed;
-                                               return prev_speed;
+                            }
-                                           }
+                            else
-                                           else
+                            {
-                                           {
+                                auto speed = std::round(anno.distance / anno.duration * 10.) / 10.;
-                                               auto speed =
+                                prev_speed = speed;
-                                                   std::round(anno.distance / anno.duration * 10.) /
+                                return util::json::clamp_float(speed);
-                                                   10.;
+                            }
-                                               prev_speed = speed;
+                        });
-                                               return util::json::clamp_float(speed);
-                                           }
-                                       }));
                 }
 
                 if (requested_annotations & RouteParameters::AnnotationsType::Duration)
                 {
-                    annotation.values.emplace(
+                    annotation.values["duration"] =
-                        "duration",
                         GetAnnotations(leg_geometry,
                                        [](const guidance::LegGeometry::Annotation &anno)
-                                       { return anno.duration; }));
+                                       { return anno.duration; });
                 }
                 if (requested_annotations & RouteParameters::AnnotationsType::Distance)
                 {
-                    annotation.values.emplace(
+                    annotation.values["distance"] =
-                        "distance",
                         GetAnnotations(leg_geometry,
                                        [](const guidance::LegGeometry::Annotation &anno)
-                                       { return anno.distance; }));
+                                       { return anno.distance; });
                 }
                 if (requested_annotations & RouteParameters::AnnotationsType::Weight)
                 {
-                    annotation.values.emplace(
+                    annotation.values["weight"] = GetAnnotations(
-                        "weight",
+                        leg_geometry,
-                        GetAnnotations(leg_geometry,
+                        [](const guidance::LegGeometry::Annotation &anno) { return anno.weight; });
-                                       [](const guidance::LegGeometry::Annotation &anno)
-                                       { return anno.weight; }));
                 }
                 if (requested_annotations & RouteParameters::AnnotationsType::Datasources)
                 {
-                    annotation.values.emplace(
+                    annotation.values["datasources"] =
-                        "datasources",
                         GetAnnotations(leg_geometry,
                                        [](const guidance::LegGeometry::Annotation &anno)
-                                       { return anno.datasource; }));
+                                       { return anno.datasource; });
                 }
                 if (requested_annotations & RouteParameters::AnnotationsType::Nodes)
                 {
@@ -845,7 +839,7 @@ class RouteAPI : public BaseAPI
                         nodes.values.push_back(
                             static_cast<std::uint64_t>(facade.GetOSMNodeIDOfNode(node_id)));
                     }
-                    annotation.values.emplace("nodes", std::move(nodes));
+                    annotation.values["nodes"] = std::move(nodes);
                 }
                 // Add any supporting metadata, if needed
                 if (requested_annotations & RouteParameters::AnnotationsType::Datasources)
@@ -861,8 +855,8 @@ class RouteAPI : public BaseAPI
                             break;
                         datasource_names.values.push_back(std::string(facade.GetDatasourceName(i)));
                     }
-                    metadata.values.emplace("datasource_names", datasource_names);
+                    metadata.values["datasource_names"] = datasource_names;
-                    annotation.values.emplace("metadata", metadata);
+                    annotation.values["metadata"] = metadata;
                 }
 
                 annotations.push_back(std::move(annotation));

include/engine/api/table_api.hpp

@@ -50,14 +50,14 @@ class TableAPI final : public BaseAPI
                  const std::vector<TableCellRef> &fallback_speed_cells,
                  osrm::engine::api::ResultT &response) const
     {
-        if (std::holds_alternative<flatbuffers::FlatBufferBuilder>(response))
+        if (response.is<flatbuffers::FlatBufferBuilder>())
         {
-            auto &fb_result = std::get<flatbuffers::FlatBufferBuilder>(response);
+            auto &fb_result = response.get<flatbuffers::FlatBufferBuilder>();
             MakeResponse(tables, candidates, fallback_speed_cells, fb_result);
         }
         else
         {
-            auto &json_result = std::get<util::json::Object>(response);
+            auto &json_result = response.get<util::json::Object>();
             MakeResponse(tables, candidates, fallback_speed_cells, json_result);
         }
     }
@@ -179,7 +179,7 @@ class TableAPI final : public BaseAPI
         {
             if (!parameters.skip_waypoints)
             {
-                response.values.emplace("sources", MakeWaypoints(candidates));
+                response.values["sources"] = MakeWaypoints(candidates);
             }
             number_of_sources = candidates.size();
         }
@@ -187,7 +187,7 @@ class TableAPI final : public BaseAPI
         {
             if (!parameters.skip_waypoints)
             {
-                response.values.emplace("sources", MakeWaypoints(candidates, parameters.sources));
+                response.values["sources"] = MakeWaypoints(candidates, parameters.sources);
             }
         }
 
@@ -195,7 +195,7 @@ class TableAPI final : public BaseAPI
         {
             if (!parameters.skip_waypoints)
             {
-                response.values.emplace("destinations", MakeWaypoints(candidates));
+                response.values["destinations"] = MakeWaypoints(candidates);
             }
             number_of_destinations = candidates.size();
         }
@@ -203,37 +203,34 @@ class TableAPI final : public BaseAPI
         {
             if (!parameters.skip_waypoints)
             {
-                response.values.emplace("destinations",
+                response.values["destinations"] =
-                                        MakeWaypoints(candidates, parameters.destinations));
+                    MakeWaypoints(candidates, parameters.destinations);
             }
         }
 
         if (parameters.annotations & TableParameters::AnnotationsType::Duration)
         {
-            response.values.emplace(
+            response.values["durations"] =
-                "durations",
+                MakeDurationTable(tables.first, number_of_sources, number_of_destinations);
-                MakeDurationTable(tables.first, number_of_sources, number_of_destinations));
         }
 
         if (parameters.annotations & TableParameters::AnnotationsType::Distance)
         {
-            response.values.emplace(
+            response.values["distances"] =
-                "distances",
+                MakeDistanceTable(tables.second, number_of_sources, number_of_destinations);
-                MakeDistanceTable(tables.second, number_of_sources, number_of_destinations));
         }
 
         if (parameters.fallback_speed != from_alias<double>(INVALID_FALLBACK_SPEED) &&
             parameters.fallback_speed > 0)
         {
-            response.values.emplace("fallback_speed_cells",
+            response.values["fallback_speed_cells"] = MakeEstimatesTable(fallback_speed_cells);
-                                    MakeEstimatesTable(fallback_speed_cells));
         }
 
-        response.values.emplace("code", "Ok");
+        response.values["code"] = "Ok";
         auto data_timestamp = facade.GetTimestamp();
         if (!data_timestamp.empty())
         {
-            response.values.emplace("data_version", data_timestamp);
+            response.values["data_version"] = data_timestamp;
         }
     }
 
@@ -380,8 +377,7 @@ class TableAPI final : public BaseAPI
                                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;
     }
@@ -410,7 +406,7 @@ class TableAPI final : public BaseAPI
                                return util::json::Value(util::json::Number(
                                    std::round(from_alias<double>(distance) * 10) / 10.));
                            });
-            json_table.values.push_back(util::json::Value{json_row});
+            json_table.values.push_back(std::move(json_row));
         }
         return json_table;
     }
@@ -419,18 +415,15 @@ class TableAPI final : public BaseAPI
     MakeEstimatesTable(const std::vector<TableCellRef> &fallback_speed_cells) const
     {
         util::json::Array json_table;
-        std::for_each(
+        std::for_each(fallback_speed_cells.begin(),
-            fallback_speed_cells.begin(),
+                      fallback_speed_cells.end(),
-            fallback_speed_cells.end(),
+                      [&](const auto &cell)
-            [&](const auto &cell)
+                      {
-            {
+                          util::json::Array row;
-                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;
     }
 

include/engine/api/trip_api.hpp

@@ -27,14 +27,14 @@ class TripAPI final : public RouteAPI
     {
         BOOST_ASSERT(sub_trips.size() == sub_routes.size());
 
-        if (std::holds_alternative<flatbuffers::FlatBufferBuilder>(response))
+        if (response.is<flatbuffers::FlatBufferBuilder>())
         {
-            auto &fb_result = std::get<flatbuffers::FlatBufferBuilder>(response);
+            auto &fb_result = response.get<flatbuffers::FlatBufferBuilder>();
             MakeResponse(sub_trips, sub_routes, candidates, fb_result);
         }
         else
         {
-            auto &json_result = std::get<util::json::Object>(response);
+            auto &json_result = response.get<util::json::Object>();
             MakeResponse(sub_trips, sub_routes, candidates, json_result);
         }
     }
@@ -79,14 +79,14 @@ class TripAPI final : public RouteAPI
         }
         if (!parameters.skip_waypoints)
         {
-            response.values.emplace("waypoints", MakeWaypoints(sub_trips, candidates));
+            response.values["waypoints"] = MakeWaypoints(sub_trips, candidates);
         }
-        response.values.emplace("trips", std::move(routes));
+        response.values["trips"] = std::move(routes);
-        response.values.emplace("code", "Ok");
+        response.values["code"] = "Ok";
         auto data_timestamp = facade.GetTimestamp();
         if (!data_timestamp.empty())
         {
-            response.values.emplace("data_version", data_timestamp);
+            response.values["data_version"] = data_timestamp;
         }
     }
 
@@ -151,8 +151,8 @@ class TripAPI final : public RouteAPI
             BOOST_ASSERT(!trip_index.NotUsed());
 
             auto waypoint = BaseAPI::MakeWaypoint(candidates[input_index]);
-            waypoint.values.emplace("trips_index", trip_index.sub_trip_index);
+            waypoint.values["trips_index"] = trip_index.sub_trip_index;
-            waypoint.values.emplace("waypoint_index", trip_index.point_index);
+            waypoint.values["waypoint_index"] = trip_index.point_index;
             waypoints.values.push_back(std::move(waypoint));
         }
 

include/engine/base64.hpp

@@ -47,29 +47,24 @@ namespace engine
 // Encodes a chunk of memory to Base64.
 inline std::string encodeBase64(const unsigned char *first, std::size_t size)
 {
-    BOOST_ASSERT(size > 0);
+    std::vector<unsigned char> bytes{first, first + size};
+    BOOST_ASSERT(!bytes.empty());
 
-    std::string encoded;
+    std::size_t bytes_to_pad{0};
-    encoded.reserve(((size + 2) / 3) * 4);
 
-    auto padding = (3 - size % 3) % 3;
+    while (bytes.size() % 3 != 0)
-
-    BOOST_ASSERT(padding == 0 || padding == 1 || padding == 2);
-
-    for (auto itr = detail::Base64FromBinary(first); itr != detail::Base64FromBinary(first + size);
-         ++itr)
     {
-        encoded.push_back(*itr);
+        bytes_to_pad += 1;
+        bytes.push_back(0);
     }
 
-    for (size_t index = 0; index < padding; ++index)
+    BOOST_ASSERT(bytes_to_pad == 0 || bytes_to_pad == 1 || bytes_to_pad == 2);
-    {
+    BOOST_ASSERT_MSG(0 == bytes.size() % 3, "base64 input data size is not a multiple of 3");
-        encoded.push_back('=');
-    }
 
-    BOOST_ASSERT(encoded.size() == (size + 2) / 3 * 4);
+    std::string encoded{detail::Base64FromBinary{bytes.data()},
+                        detail::Base64FromBinary{bytes.data() + (bytes.size() - bytes_to_pad)}};
 
-    return encoded;
+    return encoded.append(bytes_to_pad, '=');
 }
 
 // C++11 standard 3.9.1/1: Plain char, signed char, and unsigned char are three distinct types

include/engine/datafacade/algorithm_datafacade.hpp

@@ -55,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(const EdgeData &)> &filter) const = 0;
+                                    const std::function<bool(EdgeData)> filter) const = 0;
 };
 
 template <> class AlgorithmDataFacade<MLD>

include/engine/datafacade/contiguous_internalmem_datafacade.hpp

@@ -130,10 +130,9 @@ class ContiguousInternalMemoryAlgorithmDataFacade<CH> : public datafacade::Algor
             edge_based_node_from, edge_based_node_to, result);
     }
 
-    EdgeID
+    EdgeID FindSmallestEdge(const NodeID edge_based_node_from,
-    FindSmallestEdge(const NodeID edge_based_node_from,
+                            const NodeID edge_based_node_to,
-                     const NodeID edge_based_node_to,
+                            std::function<bool(EdgeData)> filter) const override final
-                     const std::function<bool(const EdgeData &)> &filter) const override final
     {
         return m_query_graph.FindSmallestEdge(edge_based_node_from, edge_based_node_to, filter);
     }
@@ -177,7 +176,7 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade
 
     SharedRTree m_static_rtree;
     std::unique_ptr<SharedGeospatialQuery> m_geospatial_query;
-    std::filesystem::path file_index_path;
+    boost::filesystem::path file_index_path;
 
     std::optional<extractor::IntersectionBearingsView> intersection_bearings_view;
 

include/engine/engine_config.hpp

@@ -31,7 +31,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "storage/storage_config.hpp"
 #include "osrm/datasets.hpp"
 
-#include <filesystem>
+#include <boost/filesystem/path.hpp>
+
 #include <set>
 #include <string>
 
@@ -53,10 +54,14 @@ namespace osrm::engine
  *
  * In addition, shared memory can be used for datasets loaded with osrm-datastore.
  *
- * You can chose between two algorithms:
+ * You can chose between three algorithms:
  *  - Algorithm::CH
  *      Contraction Hierarchies, extremely fast queries but slow pre-processing. The default right
  * now.
+ *  - Algorithm::CoreCH
+ *      Deprecated, to be removed in v6.0
+ *      Contraction Hierachies with partial contraction for faster pre-processing but slower
+ * queries.
  *  - Algorithm::MLD
  *      Multi Level Dijkstra, moderately fast in both pre-processing and query.
  *
@@ -69,6 +74,7 @@ struct EngineConfig final
     enum class Algorithm
     {
         CH,
+        CoreCH, // Deprecated, will be removed in v6.0
         MLD
     };
 
@@ -82,7 +88,7 @@ struct EngineConfig final
     boost::optional<double> default_radius = -1.0;
     int max_alternatives = 3; // set an arbitrary upper bound; can be adjusted by user
     bool use_shared_memory = true;
-    std::filesystem::path memory_file;
+    boost::filesystem::path memory_file;
     bool use_mmap = true;
     Algorithm algorithm = Algorithm::CH;
     std::vector<storage::FeatureDataset> disable_feature_dataset;

include/engine/guidance/collapse_turns.hpp

@@ -1,6 +1,7 @@
 #ifndef OSRM_ENGINE_GUIDANCE_COLLAPSE_HPP
 
 #include "engine/guidance/route_step.hpp"
+#include "util/attributes.hpp"
 
 #include <type_traits>
 #include <vector>
@@ -11,15 +12,16 @@ namespace osrm::engine::guidance
 // Multiple possible reasons can result in unnecessary/confusing instructions
 // Collapsing such turns into a single turn instruction, we give a clearer
 // set of instructions that is not cluttered by unnecessary turns/name changes.
-[[nodiscard]] std::vector<RouteStep> collapseTurnInstructions(std::vector<RouteStep> steps);
+OSRM_ATTR_WARN_UNUSED
+std::vector<RouteStep> collapseTurnInstructions(std::vector<RouteStep> steps);
 
 // Multiple possible reasons can result in unnecessary/confusing instructions
 // A prime example would be a segregated intersection. Turning around at this
 // intersection would result in two instructions to turn left.
 // Collapsing such turns into a single turn instruction, we give a clearer
 // set of instructions that is not cluttered by unnecessary turns/name changes.
-[[nodiscard]] std::vector<RouteStep>
+OSRM_ATTR_WARN_UNUSED
-collapseSegregatedTurnInstructions(std::vector<RouteStep> steps);
+std::vector<RouteStep> collapseSegregatedTurnInstructions(std::vector<RouteStep> steps);
 
 // A combined turn is a set of two instructions that actually form a single turn, as far as we
 // perceive it. A u-turn consisting of two left turns is one such example. But there are also lots

include/engine/guidance/collapsing_utility.hpp

@@ -3,6 +3,7 @@
 
 #include "guidance/turn_instruction.hpp"
 #include "engine/guidance/route_step.hpp"
+#include "util/attributes.hpp"
 #include "util/bearing.hpp"
 #include "util/guidance/name_announcements.hpp"
 
@@ -165,7 +166,8 @@ inline bool areSameSide(const RouteStep &lhs, const RouteStep &rhs)
 }
 
 // do this after invalidating any steps to compress the step array again
-[[nodiscard]] inline std::vector<RouteStep> removeNoTurnInstructions(std::vector<RouteStep> steps)
+OSRM_ATTR_WARN_UNUSED
+inline std::vector<RouteStep> removeNoTurnInstructions(std::vector<RouteStep> steps)
 {
     // finally clean up the post-processed instructions.
     // Remove all invalid instructions from the set of instructions.
@@ -202,8 +204,8 @@ inline double totalTurnAngle(const RouteStep &entry_step, const RouteStep &exit_
     if (entry_step.geometry_begin > exit_step.geometry_begin)
         return totalTurnAngle(exit_step, entry_step);
 
-    const auto &exit_intersection = exit_step.intersections.front();
+    const auto exit_intersection = exit_step.intersections.front();
-    const auto &entry_intersection = entry_step.intersections.front();
+    const auto entry_intersection = entry_step.intersections.front();
     if ((exit_intersection.out >= exit_intersection.bearings.size()) ||
         (entry_intersection.in >= entry_intersection.bearings.size()))
         return entry_intersection.bearings[entry_intersection.out];

include/engine/guidance/lane_processing.hpp

@@ -1,10 +1,11 @@
 #ifndef OSRM_ENGINE_GUIDANCE_LANE_PROCESSING_HPP_
 #define OSRM_ENGINE_GUIDANCE_LANE_PROCESSING_HPP_
 
-#include "engine/guidance/route_step.hpp"
-
 #include <vector>
 
+#include "engine/guidance/route_step.hpp"
+#include "util/attributes.hpp"
+
 namespace osrm::engine::guidance
 {
 
@@ -13,9 +14,9 @@ namespace osrm::engine::guidance
 // we anticipate lane changes emitting only matching lanes early on.
 // the second parameter describes the duration that we feel two segments need to be apart to count
 // as separate maneuvers.
-[[nodiscard]] std::vector<RouteStep>
+OSRM_ATTR_WARN_UNUSED
-anticipateLaneChange(std::vector<RouteStep> steps,
+std::vector<RouteStep> anticipateLaneChange(std::vector<RouteStep> steps,
-                     const double min_distance_needed_for_lane_change = 200);
+                                            const double min_distance_needed_for_lane_change = 200);
 
 } // namespace osrm::engine::guidance
 

include/engine/guidance/post_processing.hpp

@@ -5,6 +5,7 @@
 #include "engine/guidance/leg_geometry.hpp"
 #include "engine/guidance/route_step.hpp"
 #include "engine/phantom_node.hpp"
+#include "util/attributes.hpp"
 
 #include <vector>
 
@@ -12,7 +13,8 @@ namespace osrm::engine::guidance
 {
 
 // passed as none-reference to modify in-place and move out again
-[[nodiscard]] std::vector<RouteStep> handleRoundabouts(std::vector<RouteStep> steps);
+OSRM_ATTR_WARN_UNUSED
+std::vector<RouteStep> handleRoundabouts(std::vector<RouteStep> steps);
 
 // trim initial/final segment of very short length.
 // This function uses in/out parameter passing to modify both steps and geometry in place.
@@ -22,21 +24,23 @@ namespace osrm::engine::guidance
 void trimShortSegments(std::vector<RouteStep> &steps, LegGeometry &geometry);
 
 // assign relative locations to depart/arrive instructions
-[[nodiscard]] std::vector<RouteStep> assignRelativeLocations(std::vector<RouteStep> steps,
+OSRM_ATTR_WARN_UNUSED
-                                                             const LegGeometry &geometry,
+std::vector<RouteStep> assignRelativeLocations(std::vector<RouteStep> steps,
-                                                             const PhantomNode &source_node,
+                                               const LegGeometry &geometry,
-                                                             const PhantomNode &target_node);
+                                               const PhantomNode &source_node,
+                                               const PhantomNode &target_node);
 
 // collapse suppressed instructions remaining into intersections array
-[[nodiscard]] std::vector<RouteStep> buildIntersections(std::vector<RouteStep> steps);
+OSRM_ATTR_WARN_UNUSED
+std::vector<RouteStep> buildIntersections(std::vector<RouteStep> steps);
 
 // postProcess will break the connection between the leg geometry
 // for which a segment is supposed to represent exactly the coordinates
 // between routing maneuvers and the route steps itself.
 // If required, we can get both in sync again using this function.
 // Move in LegGeometry for modification in place.
-[[nodiscard]] LegGeometry resyncGeometry(LegGeometry leg_geometry,
+OSRM_ATTR_WARN_UNUSED
-                                         const std::vector<RouteStep> &steps);
+LegGeometry resyncGeometry(LegGeometry leg_geometry, const std::vector<RouteStep> &steps);
 
 /**
  * Apply maneuver override relations to the selected route.

include/engine/guidance/verbosity_reduction.hpp

@@ -2,6 +2,7 @@
 #define OSRM_ENGINE_GUIDANCE_VERBOSITY_REDUCTION_HPP_
 
 #include "engine/guidance/route_step.hpp"
+#include "util/attributes.hpp"
 
 #include <vector>
 
@@ -12,7 +13,8 @@ namespace osrm::engine::guidance
 // to announce them. All these that are not collapsed into a single turn (think segregated
 // intersection) have to be checked for the length they are active in. If they are active for a
 // short distance only, we don't announce them
-[[nodiscard]] std::vector<RouteStep> suppressShortNameSegments(std::vector<RouteStep> steps);
+OSRM_ATTR_WARN_UNUSED
+std::vector<RouteStep> suppressShortNameSegments(std::vector<RouteStep> steps);
 
 } // namespace osrm::engine::guidance
 

include/engine/map_matching/bayes_classifier.hpp

@@ -6,7 +6,7 @@
 #include <utility>
 #include <vector>
 
-#include <numbers>
+#include <boost/math/constants/constants.hpp>
 
 namespace osrm::engine::map_matching
 {
@@ -21,8 +21,10 @@ struct NormalDistribution
     // FIXME implement log-probability version since it's faster
     double Density(const double val) const
     {
+        using namespace boost::math::constants;
+
         const double x = val - mean;
-        return 1.0 / (std::sqrt(2 * std::numbers::pi) * standard_deviation) *
+        return 1.0 / (std::sqrt(two_pi<double>()) * standard_deviation) *
                std::exp(-x * x / (standard_deviation * standard_deviation));
     }
 

include/engine/map_matching/hidden_markov_model.hpp

@@ -4,7 +4,7 @@
 #include "util/integer_range.hpp"
 
 #include <boost/assert.hpp>
-#include <numbers>
+#include <boost/math/constants/constants.hpp>
 
 #include <cmath>
 
@@ -14,7 +14,7 @@
 namespace osrm::engine::map_matching
 {
 
-static const double log_2_pi = std::log(2. * std::numbers::pi);
+static const double log_2_pi = std::log(2. * boost::math::constants::pi<double>());
 static const double IMPOSSIBLE_LOG_PROB = -std::numeric_limits<double>::infinity();
 static const double MINIMAL_LOG_PROB = std::numeric_limits<double>::lowest();
 static const std::size_t INVALID_STATE = std::numeric_limits<std::size_t>::max();

include/engine/map_matching/matching_confidence.hpp

@@ -2,7 +2,7 @@
 #define ENGINE_MAP_MATCHING_CONFIDENCE_HPP
 
 #include "engine/map_matching/bayes_classifier.hpp"
-#include <boost/assert.hpp>
+
 #include <cmath>
 
 namespace osrm::engine::map_matching

include/engine/plugins/plugin_base.hpp

@@ -95,7 +95,7 @@ class BasePlugin
                  const std::string &message,
                  osrm::engine::api::ResultT &result) const
     {
-        std::visit(ErrorRenderer(code, message), result);
+        mapbox::util::apply_visitor(ErrorRenderer(code, message), result);
         return Status::Error;
     }
 

include/engine/polyline_compressor.hpp

@@ -12,7 +12,7 @@ namespace osrm::engine
 {
 namespace detail
 {
-void encode(int number_to_encode, std::string &output);
+std::string encode(std::vector<int> &numbers);
 std::int32_t decode_polyline_integer(std::string::const_iterator &first,
                                      std::string::const_iterator last);
 } // namespace detail
@@ -30,24 +30,27 @@ std::string encodePolyline(CoordVectorForwardIter begin, CoordVectorForwardIter
         return {};
     }
 
-    std::string output;
+    std::vector<int> delta_numbers;
-    // just a guess that we will need ~4 bytes per coordinate to avoid reallocations
+    BOOST_ASSERT(size > 0);
-    output.reserve(size * 4);
+    delta_numbers.reserve((size - 1) * 2);
-
     int current_lat = 0;
     int current_lon = 0;
-    for (auto it = begin; it != end; ++it)
+    std::for_each(
-    {
+        begin,
-        const int lat_diff =
+        end,
-            std::round(static_cast<int>(it->lat) * coordinate_to_polyline) - current_lat;
+        [&delta_numbers, &current_lat, &current_lon, coordinate_to_polyline](
-        const int lon_diff =
+            const util::Coordinate loc)
-            std::round(static_cast<int>(it->lon) * coordinate_to_polyline) - current_lon;
+        {
-        detail::encode(lat_diff, output);
+            const int lat_diff =
-        detail::encode(lon_diff, output);
+                std::round(static_cast<int>(loc.lat) * coordinate_to_polyline) - current_lat;
-        current_lat += lat_diff;
+            const int lon_diff =
-        current_lon += lon_diff;
+                std::round(static_cast<int>(loc.lon) * coordinate_to_polyline) - current_lon;
-    }
+            delta_numbers.emplace_back(lat_diff);
-    return output;
+            delta_numbers.emplace_back(lon_diff);
+            current_lat += lat_diff;
+            current_lon += lon_diff;
+        });
+    return detail::encode(delta_numbers);
 }
 
 // Decodes geometry from polyline format

include/engine/routing_algorithms/routing_base_mld.hpp

@@ -11,7 +11,6 @@
 #include <boost/assert.hpp>
 
 #include <algorithm>
-#include <boost/core/ignore_unused.hpp>
 #include <iterator>
 #include <limits>
 #include <tuple>
@@ -270,29 +269,10 @@ retrievePackedPathFromHeap(const SearchEngineData<Algorithm>::QueryHeap &forward
     return packed_path;
 }
 
-template <typename Heap>
+template <bool DIRECTION, typename Algorithm, typename... Args>
-void insertOrUpdate(Heap &heap,
-                    const NodeID node,
-                    const EdgeWeight weight,
-                    const typename Heap::DataType &data)
-{
-    const auto heapNode = heap.GetHeapNodeIfWasInserted(node);
-    if (!heapNode)
-    {
-        heap.Insert(node, weight, data);
-    }
-    else if (weight < heapNode->weight)
-    {
-        heapNode->data = data;
-        heapNode->weight = weight;
-        heap.DecreaseKey(*heapNode);
-    }
-}
-
-template <bool DIRECTION, typename Algorithm, typename Heap, typename... Args>
 void relaxOutgoingEdges(const DataFacade<Algorithm> &facade,
-                        Heap &forward_heap,
+                        typename SearchEngineData<Algorithm>::QueryHeap &forward_heap,
-                        const typename Heap::HeapNode &heapNode,
+                        const typename SearchEngineData<Algorithm>::QueryHeap::HeapNode &heapNode,
                         const Args &...args)
 {
     const auto &partition = facade.GetMultiLevelPartition();
@@ -301,31 +281,14 @@ void relaxOutgoingEdges(const DataFacade<Algorithm> &facade,
 
     const auto level = getNodeQueryLevel(partition, heapNode.node, args...);
 
-    static constexpr auto IS_MAP_MATCHING =
-        std::is_same_v<typename SearchEngineData<mld::Algorithm>::MapMatchingQueryHeap, Heap>;
-
     if (level >= 1 && !heapNode.data.from_clique_arc)
     {
-        if constexpr (DIRECTION == FORWARD_DIRECTION)
+        if (DIRECTION == FORWARD_DIRECTION)
         {
             // Shortcuts in forward direction
             const auto &cell =
                 cells.GetCell(metric, level, partition.GetCell(level, heapNode.node));
             auto destination = cell.GetDestinationNodes().begin();
-            auto distance = [&cell, node = heapNode.node ]() -> auto
-            {
-                if constexpr (IS_MAP_MATCHING)
-                {
-
-                    return cell.GetOutDistance(node).begin();
-                }
-                else
-                {
-                    boost::ignore_unused(cell, node);
-                    return 0;
-                }
-            }
-            ();
             for (auto shortcut_weight : cell.GetOutWeight(heapNode.node))
             {
                 BOOST_ASSERT(destination != cell.GetDestinationNodes().end());
@@ -335,23 +298,19 @@ void relaxOutgoingEdges(const DataFacade<Algorithm> &facade,
                 {
                     const EdgeWeight to_weight = heapNode.weight + shortcut_weight;
                     BOOST_ASSERT(to_weight >= heapNode.weight);
-
+                    const auto toHeapNode = forward_heap.GetHeapNodeIfWasInserted(to);
-                    if constexpr (IS_MAP_MATCHING)
+                    if (!toHeapNode)
                     {
-                        const EdgeDistance to_distance = heapNode.data.distance + *distance;
+                        forward_heap.Insert(to, to_weight, {heapNode.node, true});
-                        insertOrUpdate(
-                            forward_heap, to, to_weight, {heapNode.node, true, to_distance});
                     }
-                    else
+                    else if (to_weight < toHeapNode->weight)
                     {
-                        insertOrUpdate(forward_heap, to, to_weight, {heapNode.node, true});
+                        toHeapNode->data = {heapNode.node, true};
+                        toHeapNode->weight = to_weight;
+                        forward_heap.DecreaseKey(*toHeapNode);
                     }
                 }
                 ++destination;
-                if constexpr (IS_MAP_MATCHING)
-                {
-                    ++distance;
-                }
             }
         }
         else
@@ -360,20 +319,6 @@ void relaxOutgoingEdges(const DataFacade<Algorithm> &facade,
             const auto &cell =
                 cells.GetCell(metric, level, partition.GetCell(level, heapNode.node));
             auto source = cell.GetSourceNodes().begin();
-            auto distance = [&cell, node = heapNode.node ]() -> auto
-            {
-                if constexpr (IS_MAP_MATCHING)
-                {
-
-                    return cell.GetInDistance(node).begin();
-                }
-                else
-                {
-                    boost::ignore_unused(cell, node);
-                    return 0;
-                }
-            }
-            ();
             for (auto shortcut_weight : cell.GetInWeight(heapNode.node))
             {
                 BOOST_ASSERT(source != cell.GetSourceNodes().end());
@@ -383,22 +328,19 @@ void relaxOutgoingEdges(const DataFacade<Algorithm> &facade,
                 {
                     const EdgeWeight to_weight = heapNode.weight + shortcut_weight;
                     BOOST_ASSERT(to_weight >= heapNode.weight);
-                    if constexpr (IS_MAP_MATCHING)
+                    const auto toHeapNode = forward_heap.GetHeapNodeIfWasInserted(to);
+                    if (!toHeapNode)
                     {
-                        const EdgeDistance to_distance = heapNode.data.distance + *distance;
+                        forward_heap.Insert(to, to_weight, {heapNode.node, true});
-                        insertOrUpdate(
-                            forward_heap, to, to_weight, {heapNode.node, true, to_distance});
                     }
-                    else
+                    else if (to_weight < toHeapNode->weight)
                     {
-                        insertOrUpdate(forward_heap, to, to_weight, {heapNode.node, true});
+                        toHeapNode->data = {heapNode.node, true};
+                        toHeapNode->weight = to_weight;
+                        forward_heap.DecreaseKey(*toHeapNode);
                     }
                 }
                 ++source;
-                if constexpr (IS_MAP_MATCHING)
-                {
-                    ++distance;
-                }
             }
         }
     }
@@ -425,28 +367,26 @@ void relaxOutgoingEdges(const DataFacade<Algorithm> &facade,
                 const EdgeWeight to_weight =
                     heapNode.weight + node_weight + alias_cast<EdgeWeight>(turn_penalty);
 
-                if constexpr (IS_MAP_MATCHING)
+                const auto toHeapNode = forward_heap.GetHeapNodeIfWasInserted(to);
+                if (!toHeapNode)
                 {
-                    const auto node_distance =
+                    forward_heap.Insert(to, to_weight, {heapNode.node, false});
-                        facade.GetNodeDistance(DIRECTION == FORWARD_DIRECTION ? heapNode.node : to);
-
-                    const EdgeDistance to_distance = heapNode.data.distance + node_distance;
-                    insertOrUpdate(
-                        forward_heap, to, to_weight, {heapNode.node, false, to_distance});
                 }
-                else
+                else if (to_weight < toHeapNode->weight)
                 {
-                    insertOrUpdate(forward_heap, to, to_weight, {heapNode.node, false});
+                    toHeapNode->data = {heapNode.node, false};
+                    toHeapNode->weight = to_weight;
+                    forward_heap.DecreaseKey(*toHeapNode);
                 }
             }
         }
     }
 }
 
-template <bool DIRECTION, typename Algorithm, typename Heap, typename... Args>
+template <bool DIRECTION, typename Algorithm, typename... Args>
 void routingStep(const DataFacade<Algorithm> &facade,
-                 Heap &forward_heap,
+                 typename SearchEngineData<Algorithm>::QueryHeap &forward_heap,
-                 Heap &reverse_heap,
+                 typename SearchEngineData<Algorithm>::QueryHeap &reverse_heap,
                  NodeID &middle_node,
                  EdgeWeight &path_upper_bound,
                  const std::vector<NodeID> &force_step_nodes,
@@ -489,19 +429,22 @@ using UnpackedNodes = std::vector<NodeID>;
 using UnpackedEdges = std::vector<EdgeID>;
 using UnpackedPath = std::tuple<EdgeWeight, UnpackedNodes, UnpackedEdges>;
 
-template <typename Algorithm, typename Heap, typename... Args>
+template <typename Algorithm, typename... Args>
-std::optional<std::pair<NodeID, EdgeWeight>> runSearch(const DataFacade<Algorithm> &facade,
+UnpackedPath search(SearchEngineData<Algorithm> &engine_working_data,
-                                                       Heap &forward_heap,
+                    const DataFacade<Algorithm> &facade,
-                                                       Heap &reverse_heap,
+                    typename SearchEngineData<Algorithm>::QueryHeap &forward_heap,
-                                                       const std::vector<NodeID> &force_step_nodes,
+                    typename SearchEngineData<Algorithm>::QueryHeap &reverse_heap,
-                                                       EdgeWeight weight_upper_bound,
+                    const std::vector<NodeID> &force_step_nodes,
-                                                       const Args &...args)
+                    EdgeWeight weight_upper_bound,
+                    const Args &...args)
 {
     if (forward_heap.Empty() || reverse_heap.Empty())
     {
-        return {};
+        return std::make_tuple(INVALID_EDGE_WEIGHT, std::vector<NodeID>(), std::vector<EdgeID>());
     }
 
+    const auto &partition = facade.GetMultiLevelPartition();
+
     BOOST_ASSERT(!forward_heap.Empty() && forward_heap.MinKey() < INVALID_EDGE_WEIGHT);
     BOOST_ASSERT(!reverse_heap.Empty() && reverse_heap.MinKey() < INVALID_EDGE_WEIGHT);
 
@@ -531,33 +474,10 @@ std::optional<std::pair<NodeID, EdgeWeight>> runSearch(const DataFacade<Algorith
 
     // No path found for both target nodes?
     if (weight >= weight_upper_bound || SPECIAL_NODEID == middle)
-    {
-        return {};
-    }
-
-    return {{middle, weight}};
-}
-
-template <typename Algorithm, typename... Args>
-UnpackedPath search(SearchEngineData<Algorithm> &engine_working_data,
-                    const DataFacade<Algorithm> &facade,
-                    typename SearchEngineData<Algorithm>::QueryHeap &forward_heap,
-                    typename SearchEngineData<Algorithm>::QueryHeap &reverse_heap,
-                    const std::vector<NodeID> &force_step_nodes,
-                    EdgeWeight weight_upper_bound,
-                    const Args &...args)
-{
-    auto searchResult = runSearch(
-        facade, forward_heap, reverse_heap, force_step_nodes, weight_upper_bound, args...);
-    if (!searchResult)
     {
         return std::make_tuple(INVALID_EDGE_WEIGHT, std::vector<NodeID>(), std::vector<EdgeID>());
     }
 
-    auto [middle, weight] = *searchResult;
-
-    const auto &partition = facade.GetMultiLevelPartition();
-
     // Get packed path as edges {from node ID, to node ID, from_clique_arc}
     auto packed_path = retrievePackedPathFromHeap(forward_heap, reverse_heap, middle);
 
@@ -616,31 +536,6 @@ UnpackedPath search(SearchEngineData<Algorithm> &engine_working_data,
     return std::make_tuple(weight, std::move(unpacked_nodes), std::move(unpacked_edges));
 }
 
-template <typename Algorithm, typename... Args>
-EdgeDistance
-searchDistance(SearchEngineData<Algorithm> &,
-               const DataFacade<Algorithm> &facade,
-               typename SearchEngineData<Algorithm>::MapMatchingQueryHeap &forward_heap,
-               typename SearchEngineData<Algorithm>::MapMatchingQueryHeap &reverse_heap,
-               const std::vector<NodeID> &force_step_nodes,
-               EdgeWeight weight_upper_bound,
-               const Args &...args)
-{
-
-    auto searchResult = runSearch(
-        facade, forward_heap, reverse_heap, force_step_nodes, weight_upper_bound, args...);
-    if (!searchResult)
-    {
-        return INVALID_EDGE_DISTANCE;
-    }
-
-    auto [middle, _] = *searchResult;
-
-    auto distance = forward_heap.GetData(middle).distance + reverse_heap.GetData(middle).distance;
-
-    return distance;
-}
-
 // Alias to be compatible with the CH-based search
 template <typename Algorithm, typename PhantomEndpointT>
 inline void search(SearchEngineData<Algorithm> &engine_working_data,
@@ -698,8 +593,8 @@ void unpackPath(const FacadeT &facade,
 template <typename Algorithm>
 double getNetworkDistance(SearchEngineData<Algorithm> &engine_working_data,
                           const DataFacade<Algorithm> &facade,
-                          typename SearchEngineData<Algorithm>::MapMatchingQueryHeap &forward_heap,
+                          typename SearchEngineData<Algorithm>::QueryHeap &forward_heap,
-                          typename SearchEngineData<Algorithm>::MapMatchingQueryHeap &reverse_heap,
+                          typename SearchEngineData<Algorithm>::QueryHeap &reverse_heap,
                           const PhantomNode &source_phantom,
                           const PhantomNode &target_phantom,
                           EdgeWeight weight_upper_bound = INVALID_EDGE_WEIGHT)
@@ -707,49 +602,48 @@ double getNetworkDistance(SearchEngineData<Algorithm> &engine_working_data,
     forward_heap.Clear();
     reverse_heap.Clear();
 
-    if (source_phantom.IsValidForwardSource())
-    {
-        forward_heap.Insert(source_phantom.forward_segment_id.id,
-                            EdgeWeight{0} - source_phantom.GetForwardWeightPlusOffset(),
-                            {source_phantom.forward_segment_id.id,
-                             false,
-                             EdgeDistance{0} - source_phantom.GetForwardDistance()});
-    }
-
-    if (source_phantom.IsValidReverseSource())
-    {
-        forward_heap.Insert(source_phantom.reverse_segment_id.id,
-                            EdgeWeight{0} - source_phantom.GetReverseWeightPlusOffset(),
-                            {source_phantom.reverse_segment_id.id,
-                             false,
-                             EdgeDistance{0} - source_phantom.GetReverseDistance()});
-    }
-
-    if (target_phantom.IsValidForwardTarget())
-    {
-        reverse_heap.Insert(
-            target_phantom.forward_segment_id.id,
-            target_phantom.GetForwardWeightPlusOffset(),
-            {target_phantom.forward_segment_id.id, false, target_phantom.GetForwardDistance()});
-    }
-
-    if (target_phantom.IsValidReverseTarget())
-    {
-        reverse_heap.Insert(
-            target_phantom.reverse_segment_id.id,
-            target_phantom.GetReverseWeightPlusOffset(),
-            {target_phantom.reverse_segment_id.id, false, target_phantom.GetReverseDistance()});
-    }
-
     const PhantomEndpoints endpoints{source_phantom, target_phantom};
+    insertNodesInHeaps(forward_heap, reverse_heap, endpoints);
 
-    auto distance = searchDistance(
+    auto [weight, unpacked_nodes, unpacked_edges] = search(
         engine_working_data, facade, forward_heap, reverse_heap, {}, weight_upper_bound, endpoints);
 
-    if (distance == INVALID_EDGE_DISTANCE)
+    if (weight == INVALID_EDGE_WEIGHT)
     {
         return std::numeric_limits<double>::max();
     }
+
+    BOOST_ASSERT(unpacked_nodes.size() >= 1);
+
+    EdgeDistance distance = {0.0};
+
+    if (source_phantom.forward_segment_id.id == unpacked_nodes.front())
+    {
+        BOOST_ASSERT(source_phantom.forward_segment_id.enabled);
+        distance = EdgeDistance{0} - source_phantom.GetForwardDistance();
+    }
+    else if (source_phantom.reverse_segment_id.id == unpacked_nodes.front())
+    {
+        BOOST_ASSERT(source_phantom.reverse_segment_id.enabled);
+        distance = EdgeDistance{0} - source_phantom.GetReverseDistance();
+    }
+
+    for (size_t index = 0; index < unpacked_nodes.size() - 1; ++index)
+    {
+        distance += facade.GetNodeDistance(unpacked_nodes[index]);
+    }
+
+    if (target_phantom.forward_segment_id.id == unpacked_nodes.back())
+    {
+        BOOST_ASSERT(target_phantom.forward_segment_id.enabled);
+        distance += target_phantom.GetForwardDistance();
+    }
+    else if (target_phantom.reverse_segment_id.id == unpacked_nodes.back())
+    {
+        BOOST_ASSERT(target_phantom.reverse_segment_id.enabled);
+        distance += target_phantom.GetReverseDistance();
+    }
+
     return from_alias<double>(distance);
 }
 

include/engine/search_engine_data.hpp

@@ -12,6 +12,7 @@ namespace osrm::engine
 
 // Algorithm-dependent heaps
 // - CH algorithms use CH heaps
+// - CoreCH algorithms use CH
 // - MLD algorithms use MLD heaps
 
 template <typename Algorithm> struct SearchEngineData
@@ -46,7 +47,6 @@ template <> struct SearchEngineData<routing_algorithms::ch::Algorithm>
                                                 util::UnorderedMapStorage<NodeID, int>>;
 
     using SearchEngineHeapPtr = boost::thread_specific_ptr<QueryHeap>;
-
     using ManyToManyHeapPtr = boost::thread_specific_ptr<ManyToManyQueryHeap>;
 
     static SearchEngineHeapPtr forward_heap_1;
@@ -56,10 +56,6 @@ template <> struct SearchEngineData<routing_algorithms::ch::Algorithm>
     static SearchEngineHeapPtr forward_heap_3;
     static SearchEngineHeapPtr reverse_heap_3;
     static ManyToManyHeapPtr many_to_many_heap;
-    static SearchEngineHeapPtr map_matching_forward_heap_1;
-    static SearchEngineHeapPtr map_matching_reverse_heap_1;
-
-    void InitializeOrClearMapMatchingThreadLocalStorage(unsigned number_of_nodes);
 
     void InitializeOrClearFirstThreadLocalStorage(unsigned number_of_nodes);
 
@@ -78,19 +74,6 @@ struct MultiLayerDijkstraHeapData
     MultiLayerDijkstraHeapData(NodeID p, bool from) : parent(p), from_clique_arc(from) {}
 };
 
-struct MapMatchingMultiLayerDijkstraHeapData
-{
-    NodeID parent;
-    bool from_clique_arc;
-    EdgeDistance distance = {0};
-    MapMatchingMultiLayerDijkstraHeapData(NodeID p) : parent(p), from_clique_arc(false) {}
-    MapMatchingMultiLayerDijkstraHeapData(NodeID p, bool from) : parent(p), from_clique_arc(from) {}
-    MapMatchingMultiLayerDijkstraHeapData(NodeID p, bool from, EdgeDistance d)
-        : parent(p), from_clique_arc(from), distance(d)
-    {
-    }
-};
-
 struct ManyToManyMultiLayerDijkstraHeapData : MultiLayerDijkstraHeapData
 {
     EdgeDuration duration;
@@ -121,27 +104,16 @@ template <> struct SearchEngineData<routing_algorithms::mld::Algorithm>
                                                 EdgeWeight,
                                                 ManyToManyMultiLayerDijkstraHeapData,
                                                 util::TwoLevelStorage<NodeID, int>>;
-    using MapMatchingQueryHeap = util::QueryHeap<NodeID,
-                                                 NodeID,
-                                                 EdgeWeight,
-                                                 MapMatchingMultiLayerDijkstraHeapData,
-                                                 util::TwoLevelStorage<NodeID, int>>;
 
     using SearchEngineHeapPtr = boost::thread_specific_ptr<QueryHeap>;
     using ManyToManyHeapPtr = boost::thread_specific_ptr<ManyToManyQueryHeap>;
-    using MapMatchingHeapPtr = boost::thread_specific_ptr<MapMatchingQueryHeap>;
 
     static SearchEngineHeapPtr forward_heap_1;
     static SearchEngineHeapPtr reverse_heap_1;
-    static MapMatchingHeapPtr map_matching_forward_heap_1;
-    static MapMatchingHeapPtr map_matching_reverse_heap_1;
-
     static ManyToManyHeapPtr many_to_many_heap;
 
     void InitializeOrClearFirstThreadLocalStorage(unsigned number_of_nodes,
                                                   unsigned number_of_boundary_nodes);
-    void InitializeOrClearMapMatchingThreadLocalStorage(unsigned number_of_nodes,
-                                                        unsigned number_of_boundary_nodes);
 
     void InitializeOrClearManyToManyThreadLocalStorage(unsigned number_of_nodes,
                                                        unsigned number_of_boundary_nodes);

include/extractor/extractor_callbacks.hpp

@@ -3,9 +3,11 @@
 
 #include "extractor/class_data.hpp"
 #include "extractor/turn_lane_types.hpp"
-#include "util/std_hash.hpp"
 #include "util/typedefs.hpp"
 
+#include <boost/functional/hash.hpp>
+#include <boost/optional/optional_fwd.hpp>
+
 #include <string>
 #include <unordered_map>
 
@@ -16,6 +18,25 @@ class Way;
 class Relation;
 } // namespace osmium
 
+namespace std
+{
+template <> struct hash<std::tuple<std::string, std::string, std::string, std::string, std::string>>
+{
+    std::size_t operator()(
+        const std::tuple<std::string, std::string, std::string, std::string, std::string> &mk)
+        const noexcept
+    {
+        std::size_t seed = 0;
+        boost::hash_combine(seed, std::get<0>(mk));
+        boost::hash_combine(seed, std::get<1>(mk));
+        boost::hash_combine(seed, std::get<2>(mk));
+        boost::hash_combine(seed, std::get<3>(mk));
+        boost::hash_combine(seed, std::get<4>(mk));
+        return seed;
+    }
+};
+} // namespace std
+
 namespace osrm::extractor
 {
 

include/extractor/extractor_config.hpp

@@ -28,12 +28,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef EXTRACTOR_CONFIG_HPP
 #define EXTRACTOR_CONFIG_HPP
 
-#include "storage/io_config.hpp"
+#include <boost/filesystem/path.hpp>
 
 #include <array>
-#include <filesystem>
 #include <string>
 
+#include "storage/io_config.hpp"
+
 namespace osrm::extractor
 {
 
@@ -70,14 +71,14 @@ struct ExtractorConfig final : storage::IOConfig
     {
     }
 
-    void UseDefaultOutputNames(const std::filesystem::path &base)
+    void UseDefaultOutputNames(const boost::filesystem::path &base)
     {
         IOConfig::UseDefaultOutputNames(base);
     }
 
-    std::filesystem::path input_path;
+    boost::filesystem::path input_path;
-    std::filesystem::path profile_path;
+    boost::filesystem::path profile_path;
-    std::vector<std::filesystem::path> location_dependent_data_paths;
+    std::vector<boost::filesystem::path> location_dependent_data_paths;
     std::string data_version;
 
     unsigned requested_num_threads = 0;

include/extractor/files.hpp

@@ -23,9 +23,9 @@ namespace osrm::extractor::files
 
 // writes the .osrm.icd file
 template <typename IntersectionBearingsT, typename EntryClassVectorT>
-void writeIntersections(const std::filesystem::path &path,
+inline void writeIntersections(const boost::filesystem::path &path,
-                        const IntersectionBearingsT &intersection_bearings,
+                               const IntersectionBearingsT &intersection_bearings,
-                        const EntryClassVectorT &entry_classes)
+                               const EntryClassVectorT &entry_classes)
 {
     static_assert(std::is_same<IntersectionBearingsContainer, IntersectionBearingsT>::value ||
                       std::is_same<IntersectionBearingsView, IntersectionBearingsT>::value,
@@ -39,9 +39,9 @@ void writeIntersections(const std::filesystem::path &path,
 
 // read the .osrm.icd file
 template <typename IntersectionBearingsT, typename EntryClassVectorT>
-void readIntersections(const std::filesystem::path &path,
+inline void readIntersections(const boost::filesystem::path &path,
-                       IntersectionBearingsT &intersection_bearings,
+                              IntersectionBearingsT &intersection_bearings,
-                       EntryClassVectorT &entry_classes)
+                              EntryClassVectorT &entry_classes)
 {
     static_assert(std::is_same<IntersectionBearingsContainer, IntersectionBearingsT>::value ||
                       std::is_same<IntersectionBearingsView, IntersectionBearingsT>::value,
@@ -54,7 +54,8 @@ void readIntersections(const std::filesystem::path &path,
 }
 
 // reads .osrm.properties
-inline void readProfileProperties(const std::filesystem::path &path, ProfileProperties &properties)
+inline void readProfileProperties(const boost::filesystem::path &path,
+                                  ProfileProperties &properties)
 {
     const auto fingerprint = storage::tar::FileReader::VerifyFingerprint;
     storage::tar::FileReader reader{path, fingerprint};
@@ -63,7 +64,7 @@ inline void readProfileProperties(const std::filesystem::path &path, ProfileProp
 }
 
 // writes .osrm.properties
-inline void writeProfileProperties(const std::filesystem::path &path,
+inline void writeProfileProperties(const boost::filesystem::path &path,
                                    const ProfileProperties &properties)
 {
     const auto fingerprint = storage::tar::FileWriter::GenerateFingerprint;
@@ -73,7 +74,7 @@ inline void writeProfileProperties(const std::filesystem::path &path,
 }
 
 template <typename EdgeBasedEdgeVector>
-void writeEdgeBasedGraph(const std::filesystem::path &path,
+void writeEdgeBasedGraph(const boost::filesystem::path &path,
                          EdgeID const number_of_edge_based_nodes,
                          const EdgeBasedEdgeVector &edge_based_edge_list,
                          const std::uint32_t connectivity_checksum)
@@ -91,7 +92,7 @@ void writeEdgeBasedGraph(const std::filesystem::path &path,
 
 // reads .osrm.ebg file
 template <typename EdgeBasedEdgeVector>
-void readEdgeBasedGraph(const std::filesystem::path &path,
+void readEdgeBasedGraph(const boost::filesystem::path &path,
                         EdgeID &number_of_edge_based_nodes,
                         EdgeBasedEdgeVector &edge_based_edge_list,
                         std::uint32_t &connectivity_checksum)
@@ -107,9 +108,9 @@ void readEdgeBasedGraph(const std::filesystem::path &path,
 
 // reads .osrm.nbg_nodes
 template <typename CoordinatesT, typename PackedOSMIDsT>
-void readNodes(const std::filesystem::path &path,
+inline void readNodes(const boost::filesystem::path &path,
-               CoordinatesT &coordinates,
+                      CoordinatesT &coordinates,
-               PackedOSMIDsT &osm_node_ids)
+                      PackedOSMIDsT &osm_node_ids)
 {
     static_assert(std::is_same<typename CoordinatesT::value_type, util::Coordinate>::value, "");
     static_assert(std::is_same<typename PackedOSMIDsT::value_type, OSMNodeID>::value, "");
@@ -123,7 +124,7 @@ void readNodes(const std::filesystem::path &path,
 
 // reads only coordinates from .osrm.nbg_nodes
 template <typename CoordinatesT>
-void readNodeCoordinates(const std::filesystem::path &path, CoordinatesT &coordinates)
+inline void readNodeCoordinates(const boost::filesystem::path &path, CoordinatesT &coordinates)
 {
     static_assert(std::is_same<typename CoordinatesT::value_type, util::Coordinate>::value, "");
 
@@ -135,9 +136,9 @@ void readNodeCoordinates(const std::filesystem::path &path, CoordinatesT &coordi
 
 // writes .osrm.nbg_nodes
 template <typename CoordinatesT, typename PackedOSMIDsT>
-void writeNodes(const std::filesystem::path &path,
+inline void writeNodes(const boost::filesystem::path &path,
-                const CoordinatesT &coordinates,
+                       const CoordinatesT &coordinates,
-                const PackedOSMIDsT &osm_node_ids)
+                       const PackedOSMIDsT &osm_node_ids)
 {
     static_assert(std::is_same<typename CoordinatesT::value_type, util::Coordinate>::value, "");
     static_assert(std::is_same<typename PackedOSMIDsT::value_type, OSMNodeID>::value, "");
@@ -150,7 +151,7 @@ void writeNodes(const std::filesystem::path &path,
 }
 
 // reads .osrm.cnbg_to_ebg
-inline void readNBGMapping(const std::filesystem::path &path, std::vector<NBGToEBG> &mapping)
+inline void readNBGMapping(const boost::filesystem::path &path, std::vector<NBGToEBG> &mapping)
 {
     const auto fingerprint = storage::tar::FileReader::VerifyFingerprint;
     storage::tar::FileReader reader{path, fingerprint};
@@ -159,7 +160,8 @@ inline void readNBGMapping(const std::filesystem::path &path, std::vector<NBGToE
 }
 
 // writes .osrm.cnbg_to_ebg
-inline void writeNBGMapping(const std::filesystem::path &path, const std::vector<NBGToEBG> &mapping)
+inline void writeNBGMapping(const boost::filesystem::path &path,
+                            const std::vector<NBGToEBG> &mapping)
 {
     const auto fingerprint = storage::tar::FileWriter::GenerateFingerprint;
     storage::tar::FileWriter writer{path, fingerprint};
@@ -168,7 +170,7 @@ inline void writeNBGMapping(const std::filesystem::path &path, const std::vector
 }
 
 // reads .osrm.datasource_names
-inline void readDatasources(const std::filesystem::path &path, Datasources &sources)
+inline void readDatasources(const boost::filesystem::path &path, Datasources &sources)
 {
     const auto fingerprint = storage::tar::FileReader::VerifyFingerprint;
     storage::tar::FileReader reader{path, fingerprint};
@@ -177,7 +179,7 @@ inline void readDatasources(const std::filesystem::path &path, Datasources &sour
 }
 
 // writes .osrm.datasource_names
-inline void writeDatasources(const std::filesystem::path &path, Datasources &sources)
+inline void writeDatasources(const boost::filesystem::path &path, Datasources &sources)
 {
     const auto fingerprint = storage::tar::FileWriter::GenerateFingerprint;
     storage::tar::FileWriter writer{path, fingerprint};
@@ -187,7 +189,7 @@ inline void writeDatasources(const std::filesystem::path &path, Datasources &sou
 
 // reads .osrm.geometry
 template <typename SegmentDataT>
-void readSegmentData(const std::filesystem::path &path, SegmentDataT &segment_data)
+inline void readSegmentData(const boost::filesystem::path &path, SegmentDataT &segment_data)
 {
     static_assert(std::is_same<SegmentDataContainer, SegmentDataT>::value ||
                       std::is_same<SegmentDataView, SegmentDataT>::value,
@@ -200,7 +202,7 @@ void readSegmentData(const std::filesystem::path &path, SegmentDataT &segment_da
 
 // writes .osrm.geometry
 template <typename SegmentDataT>
-void writeSegmentData(const std::filesystem::path &path, const SegmentDataT &segment_data)
+inline void writeSegmentData(const boost::filesystem::path &path, const SegmentDataT &segment_data)
 {
     static_assert(std::is_same<SegmentDataContainer, SegmentDataT>::value ||
                       std::is_same<SegmentDataView, SegmentDataT>::value,
@@ -213,7 +215,7 @@ void writeSegmentData(const std::filesystem::path &path, const SegmentDataT &seg
 
 // reads .osrm.ebg_nodes
 template <typename NodeDataT>
-inline void readNodeData(const std::filesystem::path &path, NodeDataT &node_data)
+inline void readNodeData(const boost::filesystem::path &path, NodeDataT &node_data)
 {
     static_assert(std::is_same<EdgeBasedNodeDataContainer, NodeDataT>::value ||
                       std::is_same<EdgeBasedNodeDataView, NodeDataT>::value ||
@@ -227,7 +229,7 @@ inline void readNodeData(const std::filesystem::path &path, NodeDataT &node_data
 
 // writes .osrm.ebg_nodes
 template <typename NodeDataT>
-inline void writeNodeData(const std::filesystem::path &path, const NodeDataT &node_data)
+inline void writeNodeData(const boost::filesystem::path &path, const NodeDataT &node_data)
 {
     static_assert(std::is_same<EdgeBasedNodeDataContainer, NodeDataT>::value ||
                       std::is_same<EdgeBasedNodeDataView, NodeDataT>::value ||
@@ -241,7 +243,7 @@ inline void writeNodeData(const std::filesystem::path &path, const NodeDataT &no
 
 // reads .osrm.tls
 template <typename OffsetsT, typename MaskT>
-inline void readTurnLaneDescriptions(const std::filesystem::path &path,
+inline void readTurnLaneDescriptions(const boost::filesystem::path &path,
                                      OffsetsT &turn_offsets,
                                      MaskT &turn_masks)
 {
@@ -258,7 +260,7 @@ inline void readTurnLaneDescriptions(const std::filesystem::path &path,
 
 // writes .osrm.tls
 template <typename OffsetsT, typename MaskT>
-inline void writeTurnLaneDescriptions(const std::filesystem::path &path,
+inline void writeTurnLaneDescriptions(const boost::filesystem::path &path,
                                       const OffsetsT &turn_offsets,
                                       const MaskT &turn_masks)
 {
@@ -275,7 +277,7 @@ inline void writeTurnLaneDescriptions(const std::filesystem::path &path,
 
 // reads .osrm.tld
 template <typename TurnLaneDataT>
-inline void readTurnLaneData(const std::filesystem::path &path, TurnLaneDataT &turn_lane_data)
+inline void readTurnLaneData(const boost::filesystem::path &path, TurnLaneDataT &turn_lane_data)
 {
     static_assert(
         std::is_same<typename TurnLaneDataT::value_type, util::guidance::LaneTupleIdPair>::value,
@@ -289,7 +291,7 @@ inline void readTurnLaneData(const std::filesystem::path &path, TurnLaneDataT &t
 
 // writes .osrm.tld
 template <typename TurnLaneDataT>
-inline void writeTurnLaneData(const std::filesystem::path &path,
+inline void writeTurnLaneData(const boost::filesystem::path &path,
                               const TurnLaneDataT &turn_lane_data)
 {
     static_assert(
@@ -304,7 +306,7 @@ inline void writeTurnLaneData(const std::filesystem::path &path,
 
 // reads .osrm.timestamp
 template <typename TimestampDataT>
-inline void readTimestamp(const std::filesystem::path &path, TimestampDataT &timestamp)
+inline void readTimestamp(const boost::filesystem::path &path, TimestampDataT &timestamp)
 {
     const auto fingerprint = storage::tar::FileReader::VerifyFingerprint;
     storage::tar::FileReader reader{path, fingerprint};
@@ -314,7 +316,7 @@ inline void readTimestamp(const std::filesystem::path &path, TimestampDataT &tim
 
 // writes .osrm.timestamp
 template <typename TimestampDataT>
-inline void writeTimestamp(const std::filesystem::path &path, const TimestampDataT &timestamp)
+inline void writeTimestamp(const boost::filesystem::path &path, const TimestampDataT &timestamp)
 {
     const auto fingerprint = storage::tar::FileWriter::GenerateFingerprint;
     storage::tar::FileWriter writer{path, fingerprint};
@@ -324,7 +326,7 @@ inline void writeTimestamp(const std::filesystem::path &path, const TimestampDat
 
 // reads .osrm.maneuver_overrides
 template <typename StorageManeuverOverrideT, typename NodeSequencesT>
-inline void readManeuverOverrides(const std::filesystem::path &path,
+inline void readManeuverOverrides(const boost::filesystem::path &path,
                                   StorageManeuverOverrideT &maneuver_overrides,
                                   NodeSequencesT &node_sequences)
 {
@@ -338,7 +340,7 @@ inline void readManeuverOverrides(const std::filesystem::path &path,
 }
 
 // writes .osrm.maneuver_overrides
-inline void writeManeuverOverrides(const std::filesystem::path &path,
+inline void writeManeuverOverrides(const boost::filesystem::path &path,
                                    const std::vector<StorageManeuverOverride> &maneuver_overrides,
                                    const std::vector<NodeID> &node_sequences)
 {
@@ -353,7 +355,7 @@ inline void writeManeuverOverrides(const std::filesystem::path &path,
 
 // writes .osrm.turn_weight_penalties
 template <typename TurnPenaltyT>
-inline void writeTurnWeightPenalty(const std::filesystem::path &path,
+inline void writeTurnWeightPenalty(const boost::filesystem::path &path,
                                    const TurnPenaltyT &turn_penalty)
 {
     const auto fingerprint = storage::tar::FileWriter::GenerateFingerprint;
@@ -364,7 +366,7 @@ inline void writeTurnWeightPenalty(const std::filesystem::path &path,
 
 // read .osrm.turn_weight_penalties
 template <typename TurnPenaltyT>
-inline void readTurnWeightPenalty(const std::filesystem::path &path, TurnPenaltyT &turn_penalty)
+inline void readTurnWeightPenalty(const boost::filesystem::path &path, TurnPenaltyT &turn_penalty)
 {
     const auto fingerprint = storage::tar::FileReader::VerifyFingerprint;
     storage::tar::FileReader reader{path, fingerprint};
@@ -374,7 +376,7 @@ inline void readTurnWeightPenalty(const std::filesystem::path &path, TurnPenalty
 
 // writes .osrm.turn_duration_penalties
 template <typename TurnPenaltyT>
-inline void writeTurnDurationPenalty(const std::filesystem::path &path,
+inline void writeTurnDurationPenalty(const boost::filesystem::path &path,
                                      const TurnPenaltyT &turn_penalty)
 {
     const auto fingerprint = storage::tar::FileWriter::GenerateFingerprint;
@@ -385,7 +387,7 @@ inline void writeTurnDurationPenalty(const std::filesystem::path &path,
 
 // read .osrm.turn_weight_penalties
 template <typename TurnPenaltyT>
-inline void readTurnDurationPenalty(const std::filesystem::path &path, TurnPenaltyT &turn_penalty)
+inline void readTurnDurationPenalty(const boost::filesystem::path &path, TurnPenaltyT &turn_penalty)
 {
     const auto fingerprint = storage::tar::FileReader::VerifyFingerprint;
     storage::tar::FileReader reader{path, fingerprint};
@@ -395,7 +397,7 @@ inline void readTurnDurationPenalty(const std::filesystem::path &path, TurnPenal
 
 // writes .osrm.turn_penalties_index
 template <typename TurnIndexT>
-inline void writeTurnPenaltiesIndex(const std::filesystem::path &path,
+inline void writeTurnPenaltiesIndex(const boost::filesystem::path &path,
                                     const TurnIndexT &turn_penalties_index)
 {
     const auto fingerprint = storage::tar::FileWriter::GenerateFingerprint;
@@ -406,7 +408,7 @@ inline void writeTurnPenaltiesIndex(const std::filesystem::path &path,
 
 // read .osrm.turn_penalties_index
 template <typename TurnIndexT>
-inline void readTurnPenaltiesIndex(const std::filesystem::path &path,
+inline void readTurnPenaltiesIndex(const boost::filesystem::path &path,
                                    TurnIndexT &turn_penalties_index)
 {
     const auto fingerprint = storage::tar::FileReader::VerifyFingerprint;
@@ -417,7 +419,7 @@ inline void readTurnPenaltiesIndex(const std::filesystem::path &path,
 
 // writes .osrm.restrictions
 template <typename ConditionalRestrictionsT>
-inline void writeConditionalRestrictions(const std::filesystem::path &path,
+inline void writeConditionalRestrictions(const boost::filesystem::path &path,
                                          const ConditionalRestrictionsT &conditional_restrictions)
 {
     const auto fingerprint = storage::tar::FileWriter::GenerateFingerprint;
@@ -428,7 +430,7 @@ inline void writeConditionalRestrictions(const std::filesystem::path &path,
 
 // read .osrm.restrictions
 template <typename ConditionalRestrictionsT>
-inline void readConditionalRestrictions(const std::filesystem::path &path,
+inline void readConditionalRestrictions(const boost::filesystem::path &path,
                                         ConditionalRestrictionsT &conditional_restrictions)
 {
     const auto fingerprint = storage::tar::FileReader::VerifyFingerprint;
@@ -439,7 +441,7 @@ inline void readConditionalRestrictions(const std::filesystem::path &path,
 
 // reads .osrm file which is a temporary file of osrm-extract
 template <typename PackedOSMIDsT>
-void readRawNBGraph(const std::filesystem::path &path,
+void readRawNBGraph(const boost::filesystem::path &path,
                     std::vector<util::Coordinate> &coordinates,
                     PackedOSMIDsT &osm_node_ids,
                     std::vector<extractor::NodeBasedEdge> &edge_list)
@@ -464,7 +466,8 @@ void readRawNBGraph(const std::filesystem::path &path,
     storage::serialization::read(reader, "/extractor/edges", edge_list);
 }
 
-template <typename NameTableT> void readNames(const std::filesystem::path &path, NameTableT &table)
+template <typename NameTableT>
+void readNames(const boost::filesystem::path &path, NameTableT &table)
 {
     const auto fingerprint = storage::tar::FileReader::VerifyFingerprint;
     storage::tar::FileReader reader{path, fingerprint};
@@ -473,7 +476,7 @@ template <typename NameTableT> void readNames(const std::filesystem::path &path,
 }
 
 template <typename NameTableT>
-void writeNames(const std::filesystem::path &path, const NameTableT &table)
+void writeNames(const boost::filesystem::path &path, const NameTableT &table)
 {
     const auto fingerprint = storage::tar::FileWriter::GenerateFingerprint;
     storage::tar::FileWriter writer{path, fingerprint};
@@ -482,7 +485,7 @@ void writeNames(const std::filesystem::path &path, const NameTableT &table)
 }
 
 template <typename NodeWeightsVectorT>
-void readEdgeBasedNodeWeights(const std::filesystem::path &path, NodeWeightsVectorT &weights)
+void readEdgeBasedNodeWeights(const boost::filesystem::path &path, NodeWeightsVectorT &weights)
 {
     const auto fingerprint = storage::tar::FileReader::VerifyFingerprint;
     storage::tar::FileReader reader{path, fingerprint};
@@ -491,7 +494,8 @@ void readEdgeBasedNodeWeights(const std::filesystem::path &path, NodeWeightsVect
 }
 
 template <typename NodeDistancesVectorT>
-void readEdgeBasedNodeDistances(const std::filesystem::path &path, NodeDistancesVectorT &distances)
+void readEdgeBasedNodeDistances(const boost::filesystem::path &path,
+                                NodeDistancesVectorT &distances)
 {
     const auto fingerprint = storage::tar::FileReader::VerifyFingerprint;
     storage::tar::FileReader reader{path, fingerprint};
@@ -500,7 +504,7 @@ void readEdgeBasedNodeDistances(const std::filesystem::path &path, NodeDistances
 }
 
 template <typename NodeWeightsVectorT, typename NodeDurationsVectorT, typename NodeDistancesVectorT>
-void writeEdgeBasedNodeWeightsDurationsDistances(const std::filesystem::path &path,
+void writeEdgeBasedNodeWeightsDurationsDistances(const boost::filesystem::path &path,
                                                  const NodeWeightsVectorT &weights,
                                                  const NodeDurationsVectorT &durations,
                                                  const NodeDistancesVectorT &distances)
@@ -514,7 +518,7 @@ void writeEdgeBasedNodeWeightsDurationsDistances(const std::filesystem::path &pa
 }
 
 template <typename NodeWeightsVectorT, typename NodeDurationsVectorT>
-void readEdgeBasedNodeWeightsDurations(const std::filesystem::path &path,
+void readEdgeBasedNodeWeightsDurations(const boost::filesystem::path &path,
                                        NodeWeightsVectorT &weights,
                                        NodeDurationsVectorT &durations)
 {
@@ -526,7 +530,7 @@ void readEdgeBasedNodeWeightsDurations(const std::filesystem::path &path,
 }
 
 template <typename NodeWeightsVectorT, typename NodeDurationsVectorT>
-void writeEdgeBasedNodeWeightsDurations(const std::filesystem::path &path,
+void writeEdgeBasedNodeWeightsDurations(const boost::filesystem::path &path,
                                         const NodeWeightsVectorT &weights,
                                         const NodeDurationsVectorT &durations)
 {
@@ -538,7 +542,7 @@ void writeEdgeBasedNodeWeightsDurations(const std::filesystem::path &path,
 }
 
 template <typename RTreeT>
-void writeRamIndex(const std::filesystem::path &path, const RTreeT &rtree)
+void writeRamIndex(const boost::filesystem::path &path, const RTreeT &rtree)
 {
     const auto fingerprint = storage::tar::FileWriter::GenerateFingerprint;
     storage::tar::FileWriter writer{path, fingerprint};
@@ -546,7 +550,7 @@ void writeRamIndex(const std::filesystem::path &path, const RTreeT &rtree)
     util::serialization::write(writer, "/common/rtree", rtree);
 }
 
-template <typename RTreeT> void readRamIndex(const std::filesystem::path &path, RTreeT &rtree)
+template <typename RTreeT> void readRamIndex(const boost::filesystem::path &path, RTreeT &rtree)
 {
     const auto fingerprint = storage::tar::FileReader::VerifyFingerprint;
     storage::tar::FileReader reader{path, fingerprint};
@@ -555,7 +559,7 @@ template <typename RTreeT> void readRamIndex(const std::filesystem::path &path,
 }
 
 template <typename EdgeListT>
-void writeCompressedNodeBasedGraph(const std::filesystem::path &path, const EdgeListT &edge_list)
+void writeCompressedNodeBasedGraph(const boost::filesystem::path &path, const EdgeListT &edge_list)
 {
     const auto fingerprint = storage::tar::FileWriter::GenerateFingerprint;
     storage::tar::FileWriter writer{path, fingerprint};
@@ -564,7 +568,7 @@ void writeCompressedNodeBasedGraph(const std::filesystem::path &path, const Edge
 }
 
 template <typename EdgeListT>
-void readCompressedNodeBasedGraph(const std::filesystem::path &path, EdgeListT &edge_list)
+void readCompressedNodeBasedGraph(const boost::filesystem::path &path, EdgeListT &edge_list)
 {
     const auto fingerprint = storage::tar::FileReader::VerifyFingerprint;
     storage::tar::FileReader reader{path, fingerprint};

include/extractor/internal_extractor_edge.hpp

@@ -7,8 +7,8 @@
 #include "util/typedefs.hpp"
 
 #include <boost/assert.hpp>
+#include <mapbox/variant.hpp>
 #include <utility>
-#include <variant>
 
 namespace osrm::extractor
 {

include/extractor/intersection/coordinate_extractor.hpp

@@ -1,15 +1,16 @@
 #ifndef OSRM_EXTRACTOR_INTERSECTION_COORDINATE_EXTRACTOR_HPP_
 #define OSRM_EXTRACTOR_INTERSECTION_COORDINATE_EXTRACTOR_HPP_
 
+#include <utility>
+#include <vector>
+
 #include "extractor/compressed_edge_container.hpp"
 #include "extractor/query_node.hpp"
 
+#include "util/attributes.hpp"
 #include "util/coordinate.hpp"
 #include "util/node_based_graph.hpp"
 
-#include <utility>
-#include <vector>
-
 namespace osrm::extractor::intersection
 {
 
@@ -26,16 +27,17 @@ class CoordinateExtractor
      * Note: The segment between intersection and turn coordinate can be zero, if the OSM modelling
      * is unfortunate. See https://github.com/Project-OSRM/osrm-backend/issues/3470
      */
-    [[nodiscard]] util::Coordinate
+    OSRM_ATTR_WARN_UNUSED
-    GetCoordinateAlongRoad(const NodeID intersection_node,
+    util::Coordinate GetCoordinateAlongRoad(const NodeID intersection_node,
-                           const EdgeID turn_edge,
+                                            const EdgeID turn_edge,
-                           const bool traversed_in_reverse,
+                                            const bool traversed_in_reverse,
-                           const NodeID to_node,
+                                            const NodeID to_node,
-                           const std::uint8_t number_of_in_lanes) const;
+                                            const std::uint8_t number_of_in_lanes) const;
 
     // Given a set of precomputed coordinates, select the representative coordinate along the road
     // that best describes the turn
-    [[nodiscard]] util::Coordinate
+    OSRM_ATTR_WARN_UNUSED
+    util::Coordinate
     ExtractRepresentativeCoordinate(const NodeID intersection_node,
                                     const EdgeID turn_edge,
                                     const bool traversed_in_reverse,
@@ -45,7 +47,7 @@ class CoordinateExtractor
 
     // instead of finding only a single coordinate, we can also list all coordinates along a
     // road.
-    [[nodiscard]] std::vector<util::Coordinate>
+    OSRM_ATTR_WARN_UNUSED std::vector<util::Coordinate>
     GetCoordinatesAlongRoad(const NodeID intersection_node,
                             const EdgeID turn_edge,
                             const bool traversed_in_reverse,
@@ -53,18 +55,20 @@ class CoordinateExtractor
 
     // wrapper in case of normal forward edges (traversed_in_reverse = false, to_node =
     // node_based_graph.GetTarget(turn_edge)
-    [[nodiscard]] std::vector<util::Coordinate>
+    OSRM_ATTR_WARN_UNUSED
-    GetForwardCoordinatesAlongRoad(const NodeID from, const EdgeID turn_edge) const;
+    std::vector<util::Coordinate> GetForwardCoordinatesAlongRoad(const NodeID from,
+                                                                 const EdgeID turn_edge) const;
 
     // a less precise way to compute coordinates along a route. Due to the heavy interaction of
     // graph traversal and turn instructions, we often don't care for high precision. We only want
     // to check for available connections in order, or find (with room for error) the straightmost
     // turn. This function will offer a bit more error potential but allow for much higher
     // performance
-    [[nodiscard]] util::Coordinate GetCoordinateCloseToTurn(const NodeID from_node,
+    OSRM_ATTR_WARN_UNUSED
-                                                            const EdgeID turn_edge,
+    util::Coordinate GetCoordinateCloseToTurn(const NodeID from_node,
-                                                            const bool traversed_in_reverse,
+                                              const EdgeID turn_edge,
-                                                            const NodeID to_node) const;
+                                              const bool traversed_in_reverse,
+                                              const NodeID to_node) const;
 
     /* When extracting the coordinates, we first extract all coordinates. We don't care about most
      * of them, though.
@@ -86,19 +90,22 @@ class CoordinateExtractor
      * The optional length cache needs to store the accumulated distance up to the respective
      * coordinate index [0,d(0,1),...]
      */
-    [[nodiscard]] std::vector<util::Coordinate>
+    OSRM_ATTR_WARN_UNUSED
+    std::vector<util::Coordinate>
     TrimCoordinatesToLength(std::vector<util::Coordinate> coordinates,
                             const double desired_length,
                             const std::vector<double> &length_cache = {}) const;
 
-    [[nodiscard]] std::vector<double>
+    OSRM_ATTR_WARN_UNUSED
-    PrepareLengthCache(const std::vector<util::Coordinate> &coordinates, const double limit) const;
+    std::vector<double> PrepareLengthCache(const std::vector<util::Coordinate> &coordinates,
+                                           const double limit) const;
 
     /* when looking at a set of coordinates, this function allows trimming the vector to a smaller,
      * only containing coordinates up to a given distance along the path. The last coordinate might
      * be interpolated
      */
-    [[nodiscard]] std::vector<util::Coordinate>
+    OSRM_ATTR_WARN_UNUSED
+    std::vector<util::Coordinate>
     TrimCoordinatesByLengthFront(std::vector<util::Coordinate> coordinates,
                                  const double desired_length) const;
 
@@ -123,9 +130,10 @@ class CoordinateExtractor
      *
      * for fixpoint `b`, vector_base `d` and vector_head `e`
      */
-    [[nodiscard]] util::Coordinate GetCorrectedCoordinate(const util::Coordinate fixpoint,
+    OSRM_ATTR_WARN_UNUSED
-                                                          const util::Coordinate vector_base,
+    util::Coordinate GetCorrectedCoordinate(const util::Coordinate fixpoint,
-                                                          const util::Coordinate vector_head) const;
+                                            const util::Coordinate vector_base,
+                                            const util::Coordinate vector_head) const;
 
     /* generate a uniform vector of coordinates in same range distances
      *
@@ -135,7 +143,8 @@ class CoordinateExtractor
      * Into:
      * x -- x -- x -- x -- x - x
      */
-    [[nodiscard]] std::vector<util::Coordinate>
+    OSRM_ATTR_WARN_UNUSED
+    std::vector<util::Coordinate>
     SampleCoordinates(const std::vector<util::Coordinate> &coordinates,
                       const double length,
                       const double rate) const;

include/extractor/location_dependent_data.hpp

@@ -1,13 +1,13 @@
 #ifndef OSRM_LOCATION_DEPENDENT_DATA_HPP
 #define OSRM_LOCATION_DEPENDENT_DATA_HPP
 
+#include <boost/filesystem/path.hpp>
 #include <boost/geometry.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/index/rtree.hpp>
 
 #include <osmium/osm/way.hpp>
 
-#include <filesystem>
 #include <string>
 #include <unordered_map>
 
@@ -30,7 +30,7 @@ struct LocationDependentData
     using property_t = boost::variant<boost::blank, double, std::string, bool>;
     using properties_t = std::unordered_map<std::string, property_t>;
 
-    LocationDependentData(const std::vector<std::filesystem::path> &file_paths);
+    LocationDependentData(const std::vector<boost::filesystem::path> &file_paths);
 
     bool empty() const { return rtree.empty(); }
 
@@ -39,7 +39,7 @@ struct LocationDependentData
     property_t FindByKey(const std::vector<std::size_t> &property_indexes, const char *key) const;
 
   private:
-    void loadLocationDependentData(const std::filesystem::path &file_path,
+    void loadLocationDependentData(const boost::filesystem::path &file_path,
                                    std::vector<rtree_t::value_type> &bounding_boxes);
 
     rtree_t rtree;

include/extractor/maneuver_override.hpp

@@ -8,12 +8,10 @@
 #include "turn_path.hpp"
 #include "util/integer_range.hpp"
 #include "util/log.hpp"
-#include "util/std_hash.hpp"
 #include "util/vector_view.hpp"
-
-#include <variant>
-
 #include <algorithm>
+#include <boost/functional/hash.hpp>
+#include <mapbox/variant.hpp>
 
 namespace osrm::extractor
 {
@@ -149,6 +147,7 @@ struct UnresolvedManeuverOverride
 namespace std
 {
 template <> struct hash<osrm::extractor::NodeBasedTurn>
+
 {
     using argument_type = osrm::extractor::NodeBasedTurn;
     using result_type = std::size_t;
@@ -156,9 +155,9 @@ template <> struct hash<osrm::extractor::NodeBasedTurn>
     {
 
         std::size_t seed = 0;
-        hash_combine(seed, s.from);
+        boost::hash_combine(seed, s.from);
-        hash_combine(seed, s.via);
+        boost::hash_combine(seed, s.via);
-        hash_combine(seed, s.to);
+        boost::hash_combine(seed, s.to);
 
         return seed;
     }

include/extractor/node_based_graph_factory.hpp

@@ -12,7 +12,8 @@
 #include "util/coordinate.hpp"
 #include "util/node_based_graph.hpp"
 
-#include <filesystem>
+#include <boost/filesystem/path.hpp>
+
 #include <memory>
 #include <string>
 #include <unordered_set>

include/extractor/raster_source.hpp

@@ -7,13 +7,14 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/assert.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
 #include <boost/foreach.hpp>
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/qi_int.hpp>
 
 #include <storage/io.hpp>
 
-#include <filesystem>
 #include <iterator>
 #include <string>
 #include <unordered_map>
@@ -39,7 +40,7 @@ struct RasterDatum
 class RasterGrid
 {
   public:
-    RasterGrid(const std::filesystem::path &filepath, std::size_t _xdim, std::size_t _ydim)
+    RasterGrid(const boost::filesystem::path &filepath, std::size_t _xdim, std::size_t _ydim)
     {
         xdim = _xdim;
         ydim = _ydim;

include/extractor/restriction.hpp

@@ -1,10 +1,12 @@
 #ifndef RESTRICTION_HPP
 #define RESTRICTION_HPP
 
-#include "turn_path.hpp"
 #include "util/coordinate.hpp"
 #include "util/opening_hours.hpp"
 #include "util/typedefs.hpp"
+
+#include "mapbox/variant.hpp"
+#include "turn_path.hpp"
 #include <limits>
 
 namespace osrm::extractor

include/extractor/scripting_environment_lua.hpp

@@ -70,7 +70,7 @@ class Sol2ScriptingEnvironment final : public ScriptingEnvironment
 
     explicit Sol2ScriptingEnvironment(
         const std::string &file_name,
-        const std::vector<std::filesystem::path> &location_dependent_data_paths);
+        const std::vector<boost::filesystem::path> &location_dependent_data_paths);
     ~Sol2ScriptingEnvironment() override = default;
 
     const ProfileProperties &GetProfileProperties() override;

include/extractor/segment_data_container.hpp

@@ -8,12 +8,13 @@
 #include "storage/shared_memory_ownership.hpp"
 #include "storage/tar_fwd.hpp"
 
+#include <boost/filesystem/path.hpp>
 #include <boost/range/adaptor/reversed.hpp>
 #include <boost/range/iterator_range.hpp>
 
-#include <filesystem>
-#include <string>
 #include <unordered_map>
+
+#include <string>
 #include <vector>
 
 namespace osrm::extractor

include/extractor/serialization.hpp

@@ -215,6 +215,7 @@ inline void read(storage::tar::FileReader &reader,
                  const std::string &name,
                  detail::NameTableImpl<Ownership> &name_table)
 {
+    std::string buffer;
     util::serialization::read(reader, name, name_table.indexed_data);
 }
 } // namespace osrm::extractor::serialization

include/extractor/traffic_signals.hpp

@@ -1,11 +1,10 @@
 #ifndef OSRM_EXTRACTOR_TRAFFIC_SIGNALS_HPP
 #define OSRM_EXTRACTOR_TRAFFIC_SIGNALS_HPP
 
-#include "util/std_hash.hpp"
 #include "util/typedefs.hpp"
 
+#include <boost/functional/hash.hpp>
 #include <unordered_set>
-#include <utility>
 
 namespace osrm::extractor
 {
@@ -13,22 +12,23 @@ namespace osrm::extractor
 struct TrafficSignals
 {
     std::unordered_set<NodeID> bidirectional_nodes;
-    std::unordered_set<std::pair<NodeID, NodeID>> unidirectional_segments;
+    std::unordered_set<std::pair<NodeID, NodeID>, boost::hash<std::pair<NodeID, NodeID>>>
+        unidirectional_segments;
 
     inline bool HasSignal(NodeID from, NodeID to) const
     {
-        return bidirectional_nodes.contains(to) || unidirectional_segments.contains({from, to});
+        return bidirectional_nodes.count(to) > 0 || unidirectional_segments.count({from, to}) > 0;
     }
 
     void Compress(NodeID from, NodeID via, NodeID to)
     {
         bidirectional_nodes.erase(via);
-        if (unidirectional_segments.contains({via, to}))
+        if (unidirectional_segments.count({via, to}))
         {
             unidirectional_segments.erase({via, to});
             unidirectional_segments.insert({from, to});
         }
-        if (unidirectional_segments.contains({via, from}))
+        if (unidirectional_segments.count({via, from}))
         {
             unidirectional_segments.erase({via, from});
             unidirectional_segments.insert({to, from});

include/extractor/turn_lane_types.hpp

@@ -3,9 +3,10 @@
 
 #include "util/concurrent_id_map.hpp"
 #include "util/integer_range.hpp"
-#include "util/std_hash.hpp"
 #include "util/typedefs.hpp"
 
+#include <boost/functional/hash.hpp>
+
 #include <bitset>
 #include <cstddef>
 #include <cstdint>
@@ -53,7 +54,19 @@ const constexpr Mask merge_to_right = 1u << 10u;
 
 using TurnLaneDescription = std::vector<TurnLaneType::Mask>;
 
-using LaneDescriptionMap = util::ConcurrentIDMap<TurnLaneDescription, LaneDescriptionID>;
+// hash function for TurnLaneDescription
+struct TurnLaneDescription_hash
+{
+    std::size_t operator()(const TurnLaneDescription &lane_description) const
+    {
+        std::size_t seed = 0;
+        boost::hash_range(seed, lane_description.begin(), lane_description.end());
+        return seed;
+    }
+};
+
+using LaneDescriptionMap =
+    util::ConcurrentIDMap<TurnLaneDescription, LaneDescriptionID, TurnLaneDescription_hash>;
 
 using TurnLanesIndexedArray =
     std::tuple<std::vector<std::uint32_t>, std::vector<TurnLaneType::Mask>>;

include/extractor/turn_path.hpp

@@ -4,7 +4,7 @@
 #include "util/typedefs.hpp"
 
 #include <algorithm>
-#include <variant>
+#include <mapbox/variant.hpp>
 #include <vector>
 
 namespace osrm::extractor
@@ -61,50 +61,50 @@ struct InputViaWayPath
 
 struct InputTurnPath
 {
-    std::variant<InputViaNodePath, InputViaWayPath> node_or_way;
+    mapbox::util::variant<InputViaNodePath, InputViaWayPath> node_or_way;
 
     TurnPathType Type() const
     {
-        BOOST_ASSERT(node_or_way.index() < TurnPathType::NUM_TURN_PATH_TYPES);
+        BOOST_ASSERT(node_or_way.which() < TurnPathType::NUM_TURN_PATH_TYPES);
-        return static_cast<TurnPathType>(node_or_way.index());
+        return static_cast<TurnPathType>(node_or_way.which());
     }
 
     OSMWayID From() const
     {
-        return node_or_way.index() == TurnPathType::VIA_NODE_TURN_PATH
+        return node_or_way.which() == TurnPathType::VIA_NODE_TURN_PATH
-                   ? std::get<InputViaNodePath>(node_or_way).from
+                   ? mapbox::util::get<InputViaNodePath>(node_or_way).from
-                   : std::get<InputViaWayPath>(node_or_way).from;
+                   : mapbox::util::get<InputViaWayPath>(node_or_way).from;
     }
 
     OSMWayID To() const
     {
-        return node_or_way.index() == TurnPathType::VIA_NODE_TURN_PATH
+        return node_or_way.which() == TurnPathType::VIA_NODE_TURN_PATH
-                   ? std::get<InputViaNodePath>(node_or_way).to
+                   ? mapbox::util::get<InputViaNodePath>(node_or_way).to
-                   : std::get<InputViaWayPath>(node_or_way).to;
+                   : mapbox::util::get<InputViaWayPath>(node_or_way).to;
     }
 
     InputViaWayPath &AsViaWayPath()
     {
-        BOOST_ASSERT(node_or_way.index() == TurnPathType::VIA_WAY_TURN_PATH);
+        BOOST_ASSERT(node_or_way.which() == TurnPathType::VIA_WAY_TURN_PATH);
-        return std::get<InputViaWayPath>(node_or_way);
+        return mapbox::util::get<InputViaWayPath>(node_or_way);
     }
 
     const InputViaWayPath &AsViaWayPath() const
     {
-        BOOST_ASSERT(node_or_way.index() == TurnPathType::VIA_WAY_TURN_PATH);
+        BOOST_ASSERT(node_or_way.which() == TurnPathType::VIA_WAY_TURN_PATH);
-        return std::get<InputViaWayPath>(node_or_way);
+        return mapbox::util::get<InputViaWayPath>(node_or_way);
     }
 
     InputViaNodePath &AsViaNodePath()
     {
-        BOOST_ASSERT(node_or_way.index() == TurnPathType::VIA_NODE_TURN_PATH);
+        BOOST_ASSERT(node_or_way.which() == TurnPathType::VIA_NODE_TURN_PATH);
-        return std::get<InputViaNodePath>(node_or_way);
+        return mapbox::util::get<InputViaNodePath>(node_or_way);
     }
 
     const InputViaNodePath &AsViaNodePath() const
     {
-        BOOST_ASSERT(node_or_way.index() == TurnPathType::VIA_NODE_TURN_PATH);
+        BOOST_ASSERT(node_or_way.which() == TurnPathType::VIA_NODE_TURN_PATH);
-        return std::get<InputViaNodePath>(node_or_way);
+        return mapbox::util::get<InputViaNodePath>(node_or_way);
     }
 };
 
@@ -175,63 +175,63 @@ struct ViaWayPath
 // between node/way paths
 struct TurnPath
 {
-    std::variant<ViaNodePath, ViaWayPath> node_or_way;
+    mapbox::util::variant<ViaNodePath, ViaWayPath> node_or_way;
 
     NodeID To() const
     {
-        return node_or_way.index() == TurnPathType::VIA_NODE_TURN_PATH
+        return node_or_way.which() == TurnPathType::VIA_NODE_TURN_PATH
-                   ? std::get<ViaNodePath>(node_or_way).to
+                   ? mapbox::util::get<ViaNodePath>(node_or_way).to
-                   : std::get<ViaWayPath>(node_or_way).to;
+                   : mapbox::util::get<ViaWayPath>(node_or_way).to;
     }
 
     NodeID From() const
     {
-        return node_or_way.index() == TurnPathType::VIA_NODE_TURN_PATH
+        return node_or_way.which() == TurnPathType::VIA_NODE_TURN_PATH
-                   ? std::get<ViaNodePath>(node_or_way).from
+                   ? mapbox::util::get<ViaNodePath>(node_or_way).from
-                   : std::get<ViaWayPath>(node_or_way).from;
+                   : mapbox::util::get<ViaWayPath>(node_or_way).from;
     }
 
     NodeID FirstVia() const
     {
-        if (node_or_way.index() == TurnPathType::VIA_NODE_TURN_PATH)
+        if (node_or_way.which() == TurnPathType::VIA_NODE_TURN_PATH)
         {
-            return std::get<ViaNodePath>(node_or_way).via;
+            return mapbox::util::get<ViaNodePath>(node_or_way).via;
         }
         else
         {
-            BOOST_ASSERT(!std::get<ViaWayPath>(node_or_way).via.empty());
+            BOOST_ASSERT(!mapbox::util::get<ViaWayPath>(node_or_way).via.empty());
-            return std::get<ViaWayPath>(node_or_way).via[0];
+            return mapbox::util::get<ViaWayPath>(node_or_way).via[0];
         }
     }
 
     ViaWayPath &AsViaWayPath()
     {
-        BOOST_ASSERT(node_or_way.index() == TurnPathType::VIA_WAY_TURN_PATH);
+        BOOST_ASSERT(node_or_way.which() == TurnPathType::VIA_WAY_TURN_PATH);
-        return std::get<ViaWayPath>(node_or_way);
+        return mapbox::util::get<ViaWayPath>(node_or_way);
     }
 
     const ViaWayPath &AsViaWayPath() const
     {
-        BOOST_ASSERT(node_or_way.index() == TurnPathType::VIA_WAY_TURN_PATH);
+        BOOST_ASSERT(node_or_way.which() == TurnPathType::VIA_WAY_TURN_PATH);
-        return std::get<ViaWayPath>(node_or_way);
+        return mapbox::util::get<ViaWayPath>(node_or_way);
     }
 
     ViaNodePath &AsViaNodePath()
     {
-        BOOST_ASSERT(node_or_way.index() == TurnPathType::VIA_NODE_TURN_PATH);
+        BOOST_ASSERT(node_or_way.which() == TurnPathType::VIA_NODE_TURN_PATH);
-        return std::get<ViaNodePath>(node_or_way);
+        return mapbox::util::get<ViaNodePath>(node_or_way);
     }
 
     const ViaNodePath &AsViaNodePath() const
     {
-        BOOST_ASSERT(node_or_way.index() == TurnPathType::VIA_NODE_TURN_PATH);
+        BOOST_ASSERT(node_or_way.which() == TurnPathType::VIA_NODE_TURN_PATH);
-        return std::get<ViaNodePath>(node_or_way);
+        return mapbox::util::get<ViaNodePath>(node_or_way);
     }
 
     TurnPathType Type() const
     {
-        BOOST_ASSERT(node_or_way.index() < TurnPathType::NUM_TURN_PATH_TYPES);
+        BOOST_ASSERT(node_or_way.which() < TurnPathType::NUM_TURN_PATH_TYPES);
-        return static_cast<TurnPathType>(node_or_way.index());
+        return static_cast<TurnPathType>(node_or_way.which());
     }
 
     bool operator==(const TurnPath &other) const

include/guidance/files.hpp

@@ -10,16 +10,12 @@
 
 #include <boost/assert.hpp>
 
-#include <cstdint>
-#include <filesystem>
-#include <type_traits>
-
 namespace osrm::guidance::files
 {
 
 // reads .osrm.edges
 template <typename TurnDataT>
-inline void readTurnData(const std::filesystem::path &path,
+inline void readTurnData(const boost::filesystem::path &path,
                          TurnDataT &turn_data,
                          std::uint32_t &connectivity_checksum)
 {
@@ -36,7 +32,7 @@ inline void readTurnData(const std::filesystem::path &path,
 
 // writes .osrm.edges
 template <typename TurnDataT>
-inline void writeTurnData(const std::filesystem::path &path,
+inline void writeTurnData(const boost::filesystem::path &path,
                           const TurnDataT &turn_data,
                           const std::uint32_t connectivity_checksum)
 {

include/guidance/motorway_handler.hpp

@@ -7,6 +7,7 @@
 #include "guidance/intersection_handler.hpp"
 #include "guidance/is_through_street.hpp"
 
+#include "util/attributes.hpp"
 #include "util/node_based_graph.hpp"
 
 #include <vector>
@@ -41,14 +42,18 @@ class MotorwayHandler final : public IntersectionHandler
                             Intersection intersection) const override final;
 
   private:
-    [[nodiscard]] Intersection handleSliproads(const NodeID intersection_node_id,
+    OSRM_ATTR_WARN_UNUSED
-                                               Intersection intersection) const;
+    Intersection handleSliproads(const NodeID intersection_node_id,
+                                 Intersection intersection) const;
 
-    [[nodiscard]] Intersection fromMotorway(const EdgeID via_edge, Intersection intersection) const;
+    OSRM_ATTR_WARN_UNUSED
+    Intersection fromMotorway(const EdgeID via_edge, Intersection intersection) const;
 
-    [[nodiscard]] Intersection fromRamp(const EdgeID via_edge, Intersection intersection) const;
+    OSRM_ATTR_WARN_UNUSED
+    Intersection fromRamp(const EdgeID via_edge, Intersection intersection) const;
 
-    [[nodiscard]] Intersection fallback(Intersection intersection) const;
+    OSRM_ATTR_WARN_UNUSED
+    Intersection fallback(Intersection intersection) const;
 };
 
 } // namespace osrm::guidance

include/guidance/parsing_toolkit.hpp

@@ -7,6 +7,8 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/tokenizer.hpp>
 
+#include "util/attributes.hpp"
+
 namespace osrm::extractor::guidance
 {
 
@@ -19,7 +21,8 @@ namespace osrm::extractor::guidance
 // will be corrected to left|throught, since the final lane is not drivable.
 // This is in contrast to a situation with lanes:psv:forward=0 (or not set) where left|through|
 // represents left|through|through
-[[nodiscard]] inline std::string
+OSRM_ATTR_WARN_UNUSED
+inline std::string
 trimLaneString(std::string lane_string, std::int32_t count_left, std::int32_t count_right)
 {
     if (count_left)
@@ -65,8 +68,8 @@ trimLaneString(std::string lane_string, std::int32_t count_left, std::int32_t co
 // turn:lanes=left|through|through|right
 // vehicle:lanes=yes|yes|no|yes
 // bicycle:lanes=yes|no|designated|yes
-[[nodiscard]] inline std::string applyAccessTokens(std::string lane_string,
+OSRM_ATTR_WARN_UNUSED
-                                                   const std::string &access_tokens)
+inline std::string applyAccessTokens(std::string lane_string, const std::string &access_tokens)
 {
     using tokenizer = boost::tokenizer<boost::char_separator<char>>;
     boost::char_separator<char> sep("|", "", boost::keep_empty_tokens);

include/guidance/turn_analysis.hpp

@@ -17,6 +17,7 @@
 #include "guidance/turn_classification.hpp"
 #include "guidance/turn_handler.hpp"
 
+#include "util/attributes.hpp"
 #include "util/node_based_graph.hpp"
 
 #include <cstdint>
@@ -46,11 +47,13 @@ class TurnAnalysis
 
     /* Full Analysis Process for a single node/edge combination. Use with caution, as the process is
      * relatively expensive */
-    [[nodiscard]] Intersection operator()(const NodeID node_prior_to_intersection,
+    OSRM_ATTR_WARN_UNUSED
-                                          const EdgeID entering_via_edge) const;
+    Intersection operator()(const NodeID node_prior_to_intersection,
+                            const EdgeID entering_via_edge) const;
 
     // Select turn types based on the intersection shape
-    [[nodiscard]] Intersection
+    OSRM_ATTR_WARN_UNUSED
+    Intersection
     AssignTurnTypes(const NodeID from_node,
                     const EdgeID via_eid,
                     const extractor::intersection::IntersectionView &intersection) const;

include/guidance/turn_handler.hpp

@@ -8,6 +8,7 @@
 #include "guidance/intersection_handler.hpp"
 #include "guidance/is_through_street.hpp"
 
+#include "util/attributes.hpp"
 #include "util/node_based_graph.hpp"
 
 #include <cstddef>
@@ -75,19 +76,20 @@ class TurnHandler final : public IntersectionHandler
     bool isCompatibleByRoadClass(const Intersection &intersection, const Fork fork) const;
 
     // Dead end.
-    [[nodiscard]] Intersection handleOneWayTurn(Intersection intersection) const;
+    OSRM_ATTR_WARN_UNUSED
+    Intersection handleOneWayTurn(Intersection intersection) const;
 
     // Mode Changes, new names...
-    [[nodiscard]] Intersection handleTwoWayTurn(const EdgeID via_edge,
+    OSRM_ATTR_WARN_UNUSED
-                                                Intersection intersection) const;
+    Intersection handleTwoWayTurn(const EdgeID via_edge, Intersection intersection) const;
 
     // Forks, T intersections and similar
-    [[nodiscard]] Intersection handleThreeWayTurn(const EdgeID via_edge,
+    OSRM_ATTR_WARN_UNUSED
-                                                  Intersection intersection) const;
+    Intersection handleThreeWayTurn(const EdgeID via_edge, Intersection intersection) const;
 
     // Handling of turns larger then degree three
-    [[nodiscard]] Intersection handleComplexTurn(const EdgeID via_edge,
+    OSRM_ATTR_WARN_UNUSED
-                                                 Intersection intersection) const;
+    Intersection handleComplexTurn(const EdgeID via_edge, Intersection intersection) const;
 
     void
     handleDistinctConflict(const EdgeID via_edge, ConnectedRoad &left, ConnectedRoad &right) const;
@@ -95,13 +97,15 @@ class TurnHandler final : public IntersectionHandler
     // Classification
     std::optional<Fork> findFork(const EdgeID via_edge, Intersection &intersection) const;
 
-    [[nodiscard]] Intersection assignLeftTurns(const EdgeID via_edge,
+    OSRM_ATTR_WARN_UNUSED
-                                               Intersection intersection,
+    Intersection assignLeftTurns(const EdgeID via_edge,
-                                               const std::size_t starting_at) const;
+                                 Intersection intersection,
+                                 const std::size_t starting_at) const;
 
-    [[nodiscard]] Intersection assignRightTurns(const EdgeID via_edge,
+    OSRM_ATTR_WARN_UNUSED
-                                                Intersection intersection,
+    Intersection assignRightTurns(const EdgeID via_edge,
-                                                const std::size_t up_to) const;
+                                  Intersection intersection,
+                                  const std::size_t up_to) const;
 };
 
 } // namespace osrm::guidance

include/guidance/turn_instruction.hpp

@@ -2,6 +2,7 @@
 #define OSRM_GUIDANCE_TURN_INSTRUCTION_HPP_
 
 #include "guidance/roundabout_type.hpp"
+#include "util/attributes.hpp"
 #include "util/typedefs.hpp"
 
 #include <algorithm>
@@ -242,7 +243,8 @@ inline guidance::DirectionModifier::Enum getTurnDirection(const double angle)
 }
 
 // swaps left <-> right modifier types
-[[nodiscard]] inline guidance::DirectionModifier::Enum
+OSRM_ATTR_WARN_UNUSED
+inline guidance::DirectionModifier::Enum
 mirrorDirectionModifier(const guidance::DirectionModifier::Enum modifier)
 {
     const constexpr guidance::DirectionModifier::Enum results[] = {

include/guidance/turn_lane_augmentation.hpp

@@ -3,12 +3,14 @@
 
 #include "guidance/intersection.hpp"
 #include "guidance/turn_lane_data.hpp"
+#include "util/attributes.hpp"
 
 namespace osrm::guidance::lanes
 {
 
-[[nodiscard]] LaneDataVector handleNoneValueAtSimpleTurn(LaneDataVector lane_data,
+OSRM_ATTR_WARN_UNUSED
-                                                         const Intersection &intersection);
+LaneDataVector handleNoneValueAtSimpleTurn(LaneDataVector lane_data,
+                                           const Intersection &intersection);
 
 } // namespace osrm::guidance::lanes
 

include/guidance/turn_lane_data.hpp

@@ -2,6 +2,7 @@
 #define OSRM_GUIDANCE_TURN_LANE_DATA_HPP_
 
 #include "extractor/turn_lane_types.hpp"
+#include "util/attributes.hpp"
 #include "util/typedefs.hpp"
 #include <vector>
 
@@ -22,8 +23,8 @@ struct TurnLaneData
 using LaneDataVector = std::vector<TurnLaneData>;
 
 // convertes a string given in the OSM format into a TurnLaneData vector
-[[nodiscard]] LaneDataVector
+OSRM_ATTR_WARN_UNUSED
-laneDataFromDescription(const extractor::TurnLaneDescription &turn_lane_description);
+LaneDataVector laneDataFromDescription(const extractor::TurnLaneDescription &turn_lane_description);
 
 // Locate A Tag in a lane data vector (if multiple tags are set, the first one found is returned)
 LaneDataVector::const_iterator findTag(const extractor::TurnLaneType::Mask tag,

include/guidance/turn_lane_handler.hpp

@@ -9,6 +9,7 @@
 #include "guidance/turn_analysis.hpp"
 #include "guidance/turn_lane_data.hpp"
 
+#include "util/attributes.hpp"
 #include "util/guidance/turn_lanes.hpp"
 #include "util/node_based_graph.hpp"
 #include "util/typedefs.hpp"
@@ -67,8 +68,8 @@ class TurnLaneHandler
 
     ~TurnLaneHandler();
 
-    [[nodiscard]] Intersection
+    OSRM_ATTR_WARN_UNUSED
-    assignTurnLanes(const NodeID at, const EdgeID via_edge, Intersection intersection);
+    Intersection assignTurnLanes(const NodeID at, const EdgeID via_edge, Intersection intersection);
 
   private:
     mutable std::atomic<std::size_t> count_handled;
@@ -107,23 +108,24 @@ class TurnLaneHandler
                               const Intersection &intersection) const;
 
     // in case of a simple intersection, assign the lane entries
-    [[nodiscard]] Intersection simpleMatchTuplesToTurns(Intersection intersection,
+    OSRM_ATTR_WARN_UNUSED
-                                                        const LaneDataVector &lane_data,
+    Intersection simpleMatchTuplesToTurns(Intersection intersection,
-                                                        const LaneDescriptionID lane_string_id);
+                                          const LaneDataVector &lane_data,
+                                          const LaneDescriptionID lane_string_id);
 
     // partition lane data into lane data relevant at current turn and at next turn
-    [[nodiscard]] std::pair<TurnLaneHandler::LaneDataVector, TurnLaneHandler::LaneDataVector>
+    OSRM_ATTR_WARN_UNUSED
-    partitionLaneData(const NodeID at,
+    std::pair<TurnLaneHandler::LaneDataVector, TurnLaneHandler::LaneDataVector> partitionLaneData(
-                      LaneDataVector turn_lane_data,
+        const NodeID at, LaneDataVector turn_lane_data, const Intersection &intersection) const;
-                      const Intersection &intersection) const;
 
     // Sliproad turns have a separated lane to the right/left of other depicted lanes. These lanes
     // are not necessarily separated clearly from the rest of the way. As a result, we combine both
     // lane entries for our output, while performing the matching with the separated lanes only.
-    [[nodiscard]] Intersection handleSliproadTurn(Intersection intersection,
+    OSRM_ATTR_WARN_UNUSED
-                                                  const LaneDescriptionID lane_description_id,
+    Intersection handleSliproadTurn(Intersection intersection,
-                                                  LaneDataVector lane_data,
+                                    const LaneDescriptionID lane_description_id,
-                                                  const Intersection &previous_intersection);
+                                    LaneDataVector lane_data,
+                                    const Intersection &previous_intersection);
 
     // get the lane data for an intersection
     void extractLaneData(const EdgeID via_edge,

include/guidance/turn_lane_matcher.hpp

@@ -5,6 +5,7 @@
 #include "guidance/turn_instruction.hpp"
 #include "guidance/turn_lane_data.hpp"
 
+#include "util/attributes.hpp"
 #include "util/guidance/turn_lanes.hpp"
 #include "util/node_based_graph.hpp"
 
@@ -33,12 +34,12 @@ findBestMatchForReverse(const extractor::TurnLaneType::Mask leftmost_tag,
 bool canMatchTrivially(const Intersection &intersection, const LaneDataVector &lane_data);
 
 // perform a trivial match on the turn lanes
-[[nodiscard]] Intersection
+OSRM_ATTR_WARN_UNUSED
-triviallyMatchLanesToTurns(Intersection intersection,
+Intersection triviallyMatchLanesToTurns(Intersection intersection,
-                           const LaneDataVector &lane_data,
+                                        const LaneDataVector &lane_data,
-                           const util::NodeBasedDynamicGraph &node_based_graph,
+                                        const util::NodeBasedDynamicGraph &node_based_graph,
-                           const LaneDescriptionID lane_string_id,
+                                        const LaneDescriptionID lane_string_id,
-                           util::guidance::LaneDataIdMap &lane_data_to_id);
+                                        util::guidance::LaneDataIdMap &lane_data_to_id);
 
 } // namespace osrm::guidance::lanes
 

include/nodejs/json_v8_renderer.hpp

@@ -29,7 +29,7 @@ struct V8Renderer
         for (const auto &keyValue : object.values)
         {
             Napi::Value child;
-            std::visit(V8Renderer(env, child), keyValue.second);
+            mapbox::util::apply_visitor(V8Renderer(env, child), keyValue.second);
             obj.Set(keyValue.first, child);
         }
         out = obj;
@@ -41,7 +41,7 @@ struct V8Renderer
         for (auto i = 0u; i < array.values.size(); ++i)
         {
             Napi::Value child;
-            std::visit(V8Renderer(env, child), array.values[i]);
+            mapbox::util::apply_visitor(V8Renderer(env, child), array.values[i]);
             a.Set(i, child);
         }
         out = a;

include/nodejs/node_osrm_support.hpp

@@ -24,11 +24,11 @@
 #include <boost/optional.hpp>
 
 #include <algorithm>
+#include <iostream>
 #include <iterator>
 #include <sstream>
 #include <stdexcept>
 #include <string>
-#include <variant>
 #include <vector>
 
 #include <exception>
@@ -51,7 +51,7 @@ struct PluginParameters
     bool renderToBuffer = false;
 };
 
-using ObjectOrString = typename std::variant<osrm::json::Object, std::string>;
+using ObjectOrString = typename mapbox::util::variant<osrm::json::Object, std::string>;
 
 template <typename ResultT> inline Napi::Value render(const Napi::Env &env, const ResultT &result);
 
@@ -62,18 +62,18 @@ template <> Napi::Value inline render(const Napi::Env &env, const std::string &r
 
 template <> Napi::Value inline render(const Napi::Env &env, const ObjectOrString &result)
 {
-    if (std::holds_alternative<osrm::json::Object>(result))
+    if (result.is<osrm::json::Object>())
     {
         // Convert osrm::json object tree into matching v8 object tree
         Napi::Value value;
-        renderToV8(env, value, std::get<osrm::json::Object>(result));
+        renderToV8(env, value, result.get<osrm::json::Object>());
         return value;
     }
     else
     {
         // Return the string object as a node Buffer
         return Napi::Buffer<char>::Copy(
-            env, std::get<std::string>(result).data(), std::get<std::string>(result).size());
+            env, result.get<std::string>().data(), result.get<std::string>().size());
     }
 }
 
@@ -96,7 +96,7 @@ inline void ParseResult(const osrm::Status &result_status, osrm::json::Object &r
 
     if (result_status == osrm::Status::Error)
     {
-        throw std::logic_error(std::get<osrm::json::String>(code_iter->second).value.c_str());
+        throw std::logic_error(code_iter->second.get<osrm::json::String>().value.c_str());
     }
 
     result.values.erase(code_iter);
@@ -296,19 +296,24 @@ inline engine_config_ptr argumentsToEngineConfig(const Napi::CallbackInfo &args)
         {
             engine_config->algorithm = osrm::EngineConfig::Algorithm::CH;
         }
+        else if (algorithm_str == "CoreCH")
+        {
+            engine_config->algorithm = osrm::EngineConfig::Algorithm::CH;
+        }
         else if (algorithm_str == "MLD")
         {
             engine_config->algorithm = osrm::EngineConfig::Algorithm::MLD;
         }
         else
         {
-            ThrowError(args.Env(), "algorithm option must be one of 'CH', or 'MLD'.");
+            ThrowError(args.Env(), "algorithm option must be one of 'CH', 'CoreCH', or 'MLD'.");
             return engine_config_ptr();
         }
     }
     else if (!algorithm.IsUndefined())
     {
-        ThrowError(args.Env(), "algorithm option must be a string and one of 'CH', or 'MLD'.");
+        ThrowError(args.Env(),
+                   "algorithm option must be a string and one of 'CH', 'CoreCH', or 'MLD'.");
         return engine_config_ptr();
     }
 

include/partitioner/edge_based_graph_reader.hpp

@@ -173,8 +173,8 @@ graphToEdges(const DynamicEdgeBasedGraph &edge_based_graph)
                 for (auto edge : edge_based_graph.GetAdjacentEdgeRange(node))
                 {
                     const auto &data = edge_based_graph.GetEdgeData(edge);
-                    // we only need to save the forward edges, since the read method
+                    // we only need to save the forward edges, since the read method will
-                    // will convert from forward to bi-directional edges again
+                    // convert from forward to bi-directional edges again
                     if (data.forward)
                     {
                         auto target = edge_based_graph.GetTarget(edge);
@@ -191,7 +191,7 @@ graphToEdges(const DynamicEdgeBasedGraph &edge_based_graph)
     return edges;
 }
 
-inline DynamicEdgeBasedGraph LoadEdgeBasedGraph(const std::filesystem::path &path)
+inline DynamicEdgeBasedGraph LoadEdgeBasedGraph(const boost::filesystem::path &path)
 {
     EdgeID number_of_edge_based_nodes;
     std::vector<extractor::EdgeBasedEdge> edges;

include/partitioner/files.hpp

@@ -10,7 +10,7 @@ namespace osrm::partitioner::files
 
 // read .osrm.partition file
 template <typename MultiLevelPartitionT>
-inline void readPartition(const std::filesystem::path &path, MultiLevelPartitionT &mlp)
+inline void readPartition(const boost::filesystem::path &path, MultiLevelPartitionT &mlp)
 {
     static_assert(std::is_same<MultiLevelPartitionView, MultiLevelPartitionT>::value ||
                       std::is_same<MultiLevelPartition, MultiLevelPartitionT>::value,
@@ -24,7 +24,7 @@ inline void readPartition(const std::filesystem::path &path, MultiLevelPartition
 
 // writes .osrm.partition file
 template <typename MultiLevelPartitionT>
-inline void writePartition(const std::filesystem::path &path, const MultiLevelPartitionT &mlp)
+inline void writePartition(const boost::filesystem::path &path, const MultiLevelPartitionT &mlp)
 {
     static_assert(std::is_same<MultiLevelPartitionView, MultiLevelPartitionT>::value ||
                       std::is_same<MultiLevelPartition, MultiLevelPartitionT>::value,
@@ -38,7 +38,7 @@ inline void writePartition(const std::filesystem::path &path, const MultiLevelPa
 
 // reads .osrm.cells file
 template <typename CellStorageT>
-inline void readCells(const std::filesystem::path &path, CellStorageT &storage)
+inline void readCells(const boost::filesystem::path &path, CellStorageT &storage)
 {
     static_assert(std::is_same<CellStorageView, CellStorageT>::value ||
                       std::is_same<CellStorage, CellStorageT>::value,
@@ -52,7 +52,7 @@ inline void readCells(const std::filesystem::path &path, CellStorageT &storage)
 
 // writes .osrm.cells file
 template <typename CellStorageT>
-inline void writeCells(const std::filesystem::path &path, CellStorageT &storage)
+inline void writeCells(const boost::filesystem::path &path, CellStorageT &storage)
 {
     static_assert(std::is_same<CellStorageView, CellStorageT>::value ||
                       std::is_same<CellStorage, CellStorageT>::value,
@@ -66,7 +66,7 @@ inline void writeCells(const std::filesystem::path &path, CellStorageT &storage)
 
 // reads .osrm.mldgr file
 template <typename MultiLevelGraphT>
-inline void readGraph(const std::filesystem::path &path,
+inline void readGraph(const boost::filesystem::path &path,
                       MultiLevelGraphT &graph,
                       std::uint32_t &connectivity_checksum)
 {
@@ -80,7 +80,7 @@ inline void readGraph(const std::filesystem::path &path,
 
 // writes .osrm.mldgr file
 template <typename MultiLevelGraphT>
-inline void writeGraph(const std::filesystem::path &path,
+inline void writeGraph(const boost::filesystem::path &path,
                        const MultiLevelGraphT &graph,
                        const std::uint32_t connectivity_checksum)
 {

include/partitioner/partitioner_config.hpp

@@ -1,8 +1,9 @@
 #ifndef OSRM_PARTITIONER_CONFIG_HPP
 #define OSRM_PARTITIONER_CONFIG_HPP
 
+#include <boost/filesystem/path.hpp>
+
 #include <array>
-#include <filesystem>
 #include <string>
 
 #include "storage/io_config.hpp"
@@ -28,7 +29,7 @@ struct PartitionerConfig final : storage::IOConfig
     {
     }
 
-    void UseDefaultOutputNames(const std::filesystem::path &base)
+    void UseDefaultOutputNames(const boost::filesystem::path &base)
     {
         IOConfig::UseDefaultOutputNames(base);
     }

include/server/http/header.hpp

@@ -12,7 +12,7 @@ struct header
     // explicitly use default copy c'tor as adding move c'tor
     header &operator=(const header &other) = default;
     header(std::string name, std::string value) : name(std::move(name)), value(std::move(value)) {}
-    header(header &&other) noexcept : name(std::move(other.name)), value(std::move(other.value)) {}
+    header(header &&other) : name(std::move(other.name)), value(std::move(other.value)) {}
 
     void clear()
     {

include/server/service/base_service.hpp

@@ -5,7 +5,7 @@
 #include "osrm/osrm.hpp"
 #include "util/coordinate.hpp"
 
-#include <variant>
+#include <mapbox/variant.hpp>
 
 #include <string>
 #include <vector>

include/storage/io.hpp

@@ -10,14 +10,14 @@
 #include "util/log.hpp"
 #include "util/version.hpp"
 
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
 #include <boost/iostreams/device/array.hpp>
 #include <boost/iostreams/seek.hpp>
 #include <boost/iostreams/stream.hpp>
+
 #include <cerrno>
 #include <cstring>
-#include <filesystem>
-#include <fstream>
-#include <iostream>
 #include <tuple>
 #include <type_traits>
 
@@ -34,11 +34,11 @@ class FileReader
     };
 
     FileReader(const std::string &filename, const FingerprintFlag flag)
-        : FileReader(std::filesystem::path(filename), flag)
+        : FileReader(boost::filesystem::path(filename), flag)
     {
     }
 
-    FileReader(const std::filesystem::path &filepath_, const FingerprintFlag flag)
+    FileReader(const boost::filesystem::path &filepath_, const FingerprintFlag flag)
         : filepath(filepath_), fingerprint(flag)
     {
         input_stream.open(filepath, std::ios::binary);
@@ -57,14 +57,14 @@ class FileReader
 
     std::size_t GetSize()
     {
-        const std::filesystem::path path(filepath);
+        const boost::filesystem::path path(filepath);
         try
         {
-            return std::size_t(std::filesystem::file_size(path)) -
+            return std::size_t(boost::filesystem::file_size(path)) -
                    ((fingerprint == FingerprintFlag::VerifyFingerprint) ? sizeof(util::FingerPrint)
                                                                         : 0);
         }
-        catch (const std::filesystem::filesystem_error &ex)
+        catch (const boost::filesystem::filesystem_error &ex)
         {
             std::cout << ex.what() << std::endl;
             throw;
@@ -195,8 +195,8 @@ class FileReader
     }
 
   private:
-    const std::filesystem::path filepath;
+    const boost::filesystem::path filepath;
-    std::ifstream input_stream;
+    boost::filesystem::ifstream input_stream;
     FingerprintFlag fingerprint;
 };
 
@@ -210,11 +210,11 @@ class FileWriter
     };
 
     FileWriter(const std::string &filename, const FingerprintFlag flag)
-        : FileWriter(std::filesystem::path(filename), flag)
+        : FileWriter(boost::filesystem::path(filename), flag)
     {
     }
 
-    FileWriter(const std::filesystem::path &filepath_, const FingerprintFlag flag)
+    FileWriter(const boost::filesystem::path &filepath_, const FingerprintFlag flag)
         : filepath(filepath_), fingerprint(flag)
     {
         output_stream.open(filepath, std::ios::binary);
@@ -283,8 +283,8 @@ class FileWriter
     }
 
   private:
-    const std::filesystem::path filepath;
+    const boost::filesystem::path filepath;
-    std::ofstream output_stream;
+    boost::filesystem::ofstream output_stream;
     FingerprintFlag fingerprint;
 };
 

include/storage/io_config.hpp

@@ -3,19 +3,19 @@
 
 #include "util/exception.hpp"
 
-#include <boost/algorithm/string/predicate.hpp>
-
 #include <array>
-#include <filesystem>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
 #include <string>
 
 namespace osrm::storage
 {
 struct IOConfig
 {
-    IOConfig(std::vector<std::filesystem::path> required_input_files_,
+    IOConfig(std::vector<boost::filesystem::path> required_input_files_,
-             std::vector<std::filesystem::path> optional_input_files_,
+             std::vector<boost::filesystem::path> optional_input_files_,
-             std::vector<std::filesystem::path> output_files_)
+             std::vector<boost::filesystem::path> output_files_)
         : required_input_files(std::move(required_input_files_)),
           optional_input_files(std::move(optional_input_files_)),
           output_files(std::move(output_files_))
@@ -24,7 +24,7 @@ struct IOConfig
 
     bool IsValid() const;
     std::vector<std::string> GetMissingFiles() const;
-    std::filesystem::path GetPath(const std::string &fileName) const
+    boost::filesystem::path GetPath(const std::string &fileName) const
     {
         if (!IsConfigured(fileName, required_input_files) &&
             !IsConfigured(fileName, optional_input_files) && !IsConfigured(fileName, output_files))
@@ -40,11 +40,11 @@ struct IOConfig
         return IsConfigured(fileName, required_input_files);
     }
 
-    std::filesystem::path base_path;
+    boost::filesystem::path base_path;
 
   protected:
     // Infer the base path from the path of the .osrm file
-    void UseDefaultOutputNames(const std::filesystem::path &base)
+    void UseDefaultOutputNames(const boost::filesystem::path &base)
     {
         // potentially strip off the .osrm (or other) extensions for
         // determining the base path=
@@ -67,7 +67,7 @@ struct IOConfig
 
   private:
     static bool IsConfigured(const std::string &fileName,
-                             const std::vector<std::filesystem::path> &paths)
+                             const std::vector<boost::filesystem::path> &paths)
     {
         for (auto &path : paths)
         {
@@ -80,9 +80,9 @@ struct IOConfig
         return false;
     }
 
-    std::vector<std::filesystem::path> required_input_files;
+    std::vector<boost::filesystem::path> required_input_files;
-    std::vector<std::filesystem::path> optional_input_files;
+    std::vector<boost::filesystem::path> optional_input_files;
-    std::vector<std::filesystem::path> output_files;
+    std::vector<boost::filesystem::path> output_files;
 };
 } // namespace osrm::storage
 

include/storage/shared_memory.hpp

@@ -5,6 +5,8 @@
 #include "util/exception_utils.hpp"
 #include "util/log.hpp"
 
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
 #include <boost/interprocess/mapped_region.hpp>
 #ifndef _WIN32
 #include <boost/interprocess/xsi_shared_memory.hpp>
@@ -21,8 +23,6 @@
 
 #include <algorithm>
 #include <exception>
-#include <filesystem>
-#include <fstream>
 #include <thread>
 
 #include "storage/shared_memory_ownership.hpp"
@@ -32,10 +32,10 @@ namespace osrm::storage
 
 struct OSRMLockFile
 {
-    template <typename IdentifierT> std::filesystem::path operator()(const IdentifierT &id)
+    template <typename IdentifierT> boost::filesystem::path operator()(const IdentifierT &id)
     {
-        std::filesystem::path temp_dir = std::filesystem::temp_directory_path();
+        boost::filesystem::path temp_dir = boost::filesystem::temp_directory_path();
-        std::filesystem::path lock_file = temp_dir / ("osrm-" + std::to_string(id) + ".lock");
+        boost::filesystem::path lock_file = temp_dir / ("osrm-" + std::to_string(id) + ".lock");
         return lock_file;
     }
 };
@@ -51,7 +51,7 @@ class SharedMemory
     SharedMemory &operator=(const SharedMemory &) = delete;
 
     template <typename IdentifierT>
-    SharedMemory(const std::filesystem::path &lock_file,
+    SharedMemory(const boost::filesystem::path &lock_file,
                  const IdentifierT id,
                  const uint64_t size = 0)
         : key(lock_file.string().c_str(), id)
@@ -61,7 +61,7 @@ class SharedMemory
         {
             shm = boost::interprocess::xsi_shared_memory(boost::interprocess::open_only, key);
 
-            util::Log(logDEBUG) << "opening " << shm.get_shmid() << " from id " << (int)id;
+            util::Log(logDEBUG) << "opening " << (int)shm.get_shmid() << " from id " << (int)id;
 
             region = boost::interprocess::mapped_region(shm, boost::interprocess::read_only);
         }
@@ -202,7 +202,7 @@ class SharedMemory
     void *Ptr() const { return region.get_address(); }
     std::size_t Size() const { return region.get_size(); }
 
-    SharedMemory(const std::filesystem::path &lock_file, const int id, const uint64_t size = 0)
+    SharedMemory(const boost::filesystem::path &lock_file, const int id, const uint64_t size = 0)
     {
         sprintf(key, "%s.%d", "osrm.lock", id);
         if (0 == size)
@@ -290,7 +290,7 @@ std::unique_ptr<SharedMemory> makeSharedMemory(const IdentifierT &id, const uint
     try
     {
         LockFileT lock_file;
-        if (!std::filesystem::exists(lock_file(id)))
+        if (!boost::filesystem::exists(lock_file(id)))
         {
             if (0 == size)
             {
@@ -298,7 +298,7 @@ std::unique_ptr<SharedMemory> makeSharedMemory(const IdentifierT &id, const uint
             }
             else
             {
-                std::ofstream ofs(lock_file(id));
+                boost::filesystem::ofstream ofs(lock_file(id));
             }
         }
         return std::make_unique<SharedMemory>(lock_file(id), id, size);

include/storage/storage.hpp

@@ -32,14 +32,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "storage/shared_datatype.hpp"
 #include "storage/storage_config.hpp"
 
-#include <filesystem>
+#include <boost/filesystem/path.hpp>
+
 #include <string>
 #include <vector>
 
 namespace osrm::storage
 {
 
-void populateLayoutFromFile(const std::filesystem::path &path, storage::BaseDataLayout &layout);
+void populateLayoutFromFile(const boost::filesystem::path &path, storage::BaseDataLayout &layout);
 
 class Storage
 {
@@ -50,10 +51,10 @@ class Storage
     void PopulateStaticData(const SharedDataIndex &index);
     void PopulateUpdatableData(const SharedDataIndex &index);
     void PopulateLayout(storage::BaseDataLayout &layout,
-                        const std::vector<std::pair<bool, std::filesystem::path>> &files);
+                        const std::vector<std::pair<bool, boost::filesystem::path>> &files);
     std::string PopulateLayoutWithRTree(storage::BaseDataLayout &layout);
-    std::vector<std::pair<bool, std::filesystem::path>> GetUpdatableFiles();
+    std::vector<std::pair<bool, boost::filesystem::path>> GetUpdatableFiles();
-    std::vector<std::pair<bool, std::filesystem::path>> GetStaticFiles();
+    std::vector<std::pair<bool, boost::filesystem::path>> GetStaticFiles();
 
   private:
     StorageConfig config;

include/storage/storage_config.hpp

@@ -28,23 +28,22 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef STORAGE_CONFIG_HPP
 #define STORAGE_CONFIG_HPP
 
+#include <boost/filesystem/path.hpp>
+
 #include "storage/io_config.hpp"
 #include "osrm/datasets.hpp"
 
-#include <filesystem>
-#include <istream>
 #include <set>
-#include <vector>
 
 namespace osrm::storage
 {
 
 std::istream &operator>>(std::istream &in, FeatureDataset &datasets);
 
-static std::vector<std::filesystem::path>
+static std::vector<boost::filesystem::path>
 GetRequiredFiles(const std::vector<storage::FeatureDataset> &disabled_feature_dataset)
 {
-    std::set<std::filesystem::path> required{
+    std::set<boost::filesystem::path> required{
         ".osrm.datasource_names",
         ".osrm.ebg_nodes",
         ".osrm.edges",
@@ -83,7 +82,7 @@ GetRequiredFiles(const std::vector<storage::FeatureDataset> &disabled_feature_da
         }
     }
 
-    return std::vector<std::filesystem::path>(required.begin(), required.end());
+    return std::vector<boost::filesystem::path>(required.begin(), required.end());
     ;
 }
 
@@ -95,7 +94,7 @@ GetRequiredFiles(const std::vector<storage::FeatureDataset> &disabled_feature_da
 struct StorageConfig final : IOConfig
 {
 
-    StorageConfig(const std::filesystem::path &base,
+    StorageConfig(const boost::filesystem::path &base,
                   const std::vector<storage::FeatureDataset> &disabled_feature_datasets_ = {})
         : StorageConfig(disabled_feature_datasets_)
     {

include/storage/tar.hpp

@@ -7,7 +7,7 @@
 #include "util/integer_range.hpp"
 #include "util/version.hpp"
 
-#include <filesystem>
+#include <boost/filesystem/path.hpp>
 
 extern "C"
 {
@@ -19,7 +19,7 @@ namespace osrm::storage::tar
 namespace detail
 {
 inline void
-checkMTarError(int error_code, const std::filesystem::path &filepath, const std::string &name)
+checkMTarError(int error_code, const boost::filesystem::path &filepath, const std::string &name)
 {
     switch (error_code)
     {
@@ -78,7 +78,7 @@ class FileReader
         HasNoFingerprint
     };
 
-    FileReader(const std::filesystem::path &path, FingerprintFlag flag) : path(path)
+    FileReader(const boost::filesystem::path &path, FingerprintFlag flag) : path(path)
     {
         auto ret = mtar_open(&handle, path.string().c_str(), "r");
         detail::checkMTarError(ret, path, "");
@@ -204,7 +204,7 @@ class FileReader
         return true;
     }
 
-    std::filesystem::path path;
+    boost::filesystem::path path;
     mtar_t handle;
 };
 
@@ -217,7 +217,7 @@ class FileWriter
         HasNoFingerprint
     };
 
-    FileWriter(const std::filesystem::path &path, FingerprintFlag flag) : path(path)
+    FileWriter(const boost::filesystem::path &path, FingerprintFlag flag) : path(path)
     {
         auto ret = mtar_open(&handle, path.string().c_str(), "w");
         detail::checkMTarError(ret, path, "");
@@ -305,7 +305,7 @@ class FileWriter
         WriteFrom("osrm_fingerprint.meta", fingerprint);
     }
 
-    std::filesystem::path path;
+    boost::filesystem::path path;
     mtar_t handle;
 };
 } // namespace osrm::storage::tar

include/storage/view_factory.hpp

@@ -202,7 +202,7 @@ inline auto make_search_tree_view(const SharedDataIndex &index, const std::strin
 
     const char *path = index.template GetBlockPtr<char>(name + "/file_index_path");
 
-    if (!std::filesystem::exists(std::filesystem::path{path}))
+    if (!boost::filesystem::exists(boost::filesystem::path{path}))
     {
         throw util::exception("Could not load " + std::string(path) + "Does the leaf file exist?" +
                               SOURCE_REF);

include/updater/csv_file_parser.hpp

@@ -12,12 +12,12 @@
 #include <tbb/spin_mutex.h>
 
 #include <boost/exception/diagnostic_information.hpp>
+#include <boost/filesystem.hpp>
 #include <boost/iostreams/device/mapped_file.hpp>
 #include <boost/phoenix.hpp>
 #include <boost/spirit/include/qi.hpp>
 
 #include <exception>
-#include <filesystem>
 #include <stdexcept>
 #include <vector>
 
@@ -100,7 +100,7 @@ template <typename Key, typename Value> struct CSVFilesParser
         std::vector<std::pair<Key, Value>> result;
         try
         {
-            if (std::filesystem::file_size(filename) == 0)
+            if (boost::filesystem::file_size(filename) == 0)
                 return result;
 
             boost::iostreams::mapped_file_source mmap(filename);

include/updater/updater_config.hpp

@@ -28,13 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef OSRM_UPDATER_UPDATER_CONFIG_HPP
 #define OSRM_UPDATER_UPDATER_CONFIG_HPP
 
-#include "storage/io_config.hpp"
+#include <boost/filesystem/path.hpp>
-#include "storage/storage_config.hpp"
 
 #include <chrono>
-#include <filesystem>
 #include <string>
 
+#include "storage/io_config.hpp"
+#include "storage/storage_config.hpp"
+
 namespace osrm::updater
 {
 
@@ -58,7 +59,7 @@ struct UpdaterConfig final : storage::IOConfig
     {
     }
 
-    void UseDefaultOutputNames(const std::filesystem::path &base)
+    void UseDefaultOutputNames(const boost::filesystem::path &base)
     {
         IOConfig::UseDefaultOutputNames(base);
     }

include/util/alias.hpp

@@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef OSRM_UTIL_ALIAS_HPP
 #define OSRM_UTIL_ALIAS_HPP
 
-#include <cstddef>
+#include <boost/numeric/conversion/cast.hpp>
 #include <functional>
-#include <ostream>
+#include <iostream>
 #include <type_traits>
 
 namespace osrm

include/util/attributes.hpp

@@ -0,0 +1,13 @@
+#ifndef OSRM_ATTRIBUTES_HPP_
+#define OSRM_ATTRIBUTES_HPP_
+
+// OSRM_ATTR_WARN_UNUSED - caller has to use function's return value
+// https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html
+
+#if defined(__GNUC__) && (__GNUC__ >= 4)
+#define OSRM_ATTR_WARN_UNUSED __attribute__((warn_unused_result))
+#else
+#define OSRM_ATTR_WARN_UNUSED
+#endif
+
+#endif

include/util/cheap_ruler.hpp

@@ -4,7 +4,6 @@
 #include <cmath>
 #include <cstdint>
 #include <limits>
-#include <numbers>
 #include <tuple>
 #include <utility>
 
@@ -38,7 +37,7 @@ class CheapRuler
     static constexpr double FE = 1.0 / 298.257223563; // flattening
 
     static constexpr double E2 = FE * (2 - FE);
-    static constexpr double RAD = std::numbers::pi / 180.0;
+    static constexpr double RAD = M_PI / 180.0;
 
   public:
     explicit CheapRuler(double latitude)

include/util/concurrent_id_map.hpp

@@ -26,7 +26,7 @@ struct ConcurrentIDMap
     mutable UpgradableMutex mutex;
 
     ConcurrentIDMap() = default;
-    ConcurrentIDMap(ConcurrentIDMap &&other) noexcept
+    ConcurrentIDMap(ConcurrentIDMap &&other)
     {
         if (this != &other)
         {
@@ -36,7 +36,7 @@ struct ConcurrentIDMap
             data = std::move(other.data);
         }
     }
-    ConcurrentIDMap &operator=(ConcurrentIDMap &&other) noexcept
+    ConcurrentIDMap &operator=(ConcurrentIDMap &&other)
     {
         if (this != &other)
         {

include/util/coordinate_calculation.hpp

@@ -3,7 +3,7 @@
 
 #include "util/coordinate.hpp"
 
-#include <numbers>
+#include <boost/math/constants/constants.hpp>
 
 #include <algorithm>
 #include <cmath>
@@ -23,9 +23,17 @@ const constexpr double RAD_TO_DEGREE = 1. / DEGREE_TO_RAD;
 // The IUGG value for the equatorial radius is 6378.137 km (3963.19 miles)
 const constexpr long double EARTH_RADIUS = 6372797.560856;
 
-inline double degToRad(const double degree) { return degree * (std::numbers::pi / 180.0); }
+inline double degToRad(const double degree)
+{
+    using namespace boost::math::constants;
+    return degree * (pi<double>() / 180.0);
+}
 
-inline double radToDeg(const double radian) { return radian * (180.0 * std::numbers::inv_pi); }
+inline double radToDeg(const double radian)
+{
+    using namespace boost::math::constants;
+    return radian * (180.0 * (1. / pi<double>()));
+}
 } // namespace detail
 
 const constexpr static double METERS_PER_DEGREE_LAT = 110567.0;

include/util/deallocating_vector.hpp

@@ -166,7 +166,7 @@ class DeallocatingVectorIterator
 
 template <typename ElementT> class DeallocatingVector;
 
-template <typename T> void swap(DeallocatingVector<T> &lhs, DeallocatingVector<T> &rhs) noexcept;
+template <typename T> void swap(DeallocatingVector<T> &lhs, DeallocatingVector<T> &rhs);
 
 template <typename ElementT> class DeallocatingVector
 {
@@ -204,8 +204,8 @@ template <typename ElementT> class DeallocatingVector
     }
 
     // moving is fine
-    DeallocatingVector(DeallocatingVector &&other) noexcept { swap(other); }
+    DeallocatingVector(DeallocatingVector &&other) { swap(other); }
-    DeallocatingVector &operator=(DeallocatingVector &&other) noexcept
+    DeallocatingVector &operator=(DeallocatingVector &&other)
     {
         swap(other);
         return *this;
@@ -221,10 +221,9 @@ template <typename ElementT> class DeallocatingVector
 
     ~DeallocatingVector() { clear(); }
 
-    friend void swap<>(DeallocatingVector<ElementT> &lhs,
+    friend void swap<>(DeallocatingVector<ElementT> &lhs, DeallocatingVector<ElementT> &rhs);
-                       DeallocatingVector<ElementT> &rhs) noexcept;
 
-    void swap(DeallocatingVector<ElementT> &other) noexcept
+    void swap(DeallocatingVector<ElementT> &other)
     {
         std::swap(current_size, other.current_size);
         bucket_list.swap(other.bucket_list);
@@ -343,7 +342,7 @@ template <typename ElementT> class DeallocatingVector
     }
 };
 
-template <typename T> void swap(DeallocatingVector<T> &lhs, DeallocatingVector<T> &rhs) noexcept
+template <typename T> void swap(DeallocatingVector<T> &lhs, DeallocatingVector<T> &rhs)
 {
     lhs.swap(rhs);
 }

include/util/debug.hpp

@@ -12,7 +12,7 @@
 #include "util/typedefs.hpp"
 
 #include <iomanip>
-#include <ostream>
+#include <iostream>
 #include <sstream>
 #include <string>
 #include <vector>

include/util/dynamic_graph.hpp

@@ -154,7 +154,7 @@ template <typename EdgeDataT> class DynamicGraph
         return *this;
     }
 
-    DynamicGraph(DynamicGraph &&other) noexcept
+    DynamicGraph(DynamicGraph &&other)
     {
         number_of_nodes = other.number_of_nodes;
         // atomics can't be moved this is why we need an own constructor
@@ -164,7 +164,7 @@ template <typename EdgeDataT> class DynamicGraph
         edge_list = std::move(other.edge_list);
     }
 
-    DynamicGraph &operator=(DynamicGraph &&other) noexcept
+    DynamicGraph &operator=(DynamicGraph &&other)
     {
         number_of_nodes = other.number_of_nodes;
         // atomics can't be moved this is why we need an own constructor

include/util/exception.hpp

@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <array>
 #include <exception>
+#include <iostream>
 #include <string>
 #include <utility>
 

include/util/exception_utils.hpp

@@ -1,8 +1,6 @@
-#ifndef EXCEPTION_UTILS_HPP
+#ifndef SOURCE_MACROS_HPP
-#define EXCEPTION_UTILS_HPP
+#define SOURCE_MACROS_HPP
-
 #include <cstring>
-#include <string>
 
 // Helper macros, don't use these ones
 // STRIP the OSRM_PROJECT_DIR from the front of a filename.  Expected to come
@@ -14,4 +12,4 @@
 // This is the macro to use
 #define SOURCE_REF (OSRM_SOURCE_FILE_ + ":" + std::to_string(__LINE__))
 
-#endif // EXCEPTION_UTILS_HPP
+#endif // SOURCE_MACROS_HPP

include/util/geojson_debug_logger.hpp

@@ -51,7 +51,7 @@ class GeojsonLogger
             if (!first)
                 ofs << ",\n\t\t";
 
-            util::json::render(ofs, std::get<util::json::Object>(object));
+            util::json::render(ofs, object.get<util::json::Object>());
 
             first = false;
         }

include/util/geojson_debug_policies.hpp

@@ -51,4 +51,4 @@ struct CoordinateVectorToMultiPoint
 
 } // namespace osrm::util
 
-#endif /* OSRM_GEOJSON_DEBUG_POLICIES */
+#endif /* OSRM_GEOJSON_DEBUG_POLICIES */

include/util/geojson_debug_policy_toolkit.hpp

@@ -55,12 +55,12 @@ inline util::json::Object makeStyle(const GeojsonStyleSize size_type,
 
 struct CoordinateToJsonArray
 {
-    util::json::Value operator()(const util::Coordinate coordinate)
+    util::json::Array operator()(const util::Coordinate coordinate)
     {
         util::json::Array json_coordinate;
         json_coordinate.values.push_back(static_cast<double>(toFloating(coordinate.lon)));
         json_coordinate.values.push_back(static_cast<double>(toFloating(coordinate.lat)));
-        return util::json::Value{json_coordinate};
+        return json_coordinate;
     }
 };
 
@@ -73,7 +73,7 @@ struct NodeIdToCoordinate
 
     const std::vector<util::Coordinate> &node_coordinates;
 
-    util::json::Value operator()(const NodeID nid)
+    util::json::Array operator()(const NodeID nid)
     {
         auto coordinate = node_coordinates[nid];
         CoordinateToJsonArray converter;
@@ -108,4 +108,4 @@ inline util::json::Array makeJsonArray(const std::vector<util::Coordinate> &inpu
 }
 } // namespace osrm::util
 
-#endif /* OSRM_GEOJSON_DEBUG_POLICY_TOOLKIT_HPP */
+#endif /* OSRM_GEOJSON_DEBUG_POLICY_TOOLKIT_HPP */