2694 changed files with 49598 additions and 580476 deletions
--- a/.babelrc
+++ b/.babelrc
@ -1,7 +0,0 @@
-{
-    "plugins": ["transform-class-properties"],
-    "presets": [
-        "@babel/preset-env",
-        "@babel/preset-react"
-    ]
-}
--- a/.clang-format
+++ b/.clang-format
@ -2,89 +2,53 @@
 Language:        Cpp
 # BasedOnStyle:  LLVM
 AccessModifierOffset: -2
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
+ConstructorInitializerIndentWidth: 4
 AlignEscapedNewlinesLeft: false
-AlignOperands:   true
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: true
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
+AllowShortFunctionsOnASingleLine: true
 AlwaysBreakTemplateDeclarations: false
-BinPackArguments: false
-BinPackParameters: false
-BraceWrapping:   
-  AfterClass:      true
-  AfterControlStatement: true
-  AfterEnum:       true
-  AfterFunction:   true
-  AfterNamespace:  true
-  AfterObjCDeclaration: true
-  AfterStruct:     true
-  AfterUnion:      true
-  BeforeCatch:     true
-  BeforeElse:      true
-  IndentBraces:    true
+AlwaysBreakBeforeMultilineStrings: false
 BreakBeforeBinaryOperators: false
-BreakBeforeBraces: Allman
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
+BinPackParameters: false
 ColumnLimit:     100
-CommentPragmas:  '^ IWYU pragma:'
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DerivePointerAlignment: false
-DisableFormat:   false
+DerivePointerBinding: false
 ExperimentalAutoDetectBinPacking: false
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IncludeCategories:
-  - Regex:           '^<'
-    Priority:        3
-  - Regex:           '^"(osrm|util|engine|extract|contract)/'
-    Priority:        2
-  - Regex:           '.*'
-    Priority:        1
 IndentCaseLabels: false
-IndentWidth:     4
-IndentWrappedFunctionNames: false
-KeepEmptyLinesAtTheStartOfBlocks: true
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
+KeepEmptyLinesAtTheStartOfBlocks: true
 NamespaceIndentation: None
-ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
-PenaltyExcessCharacter: 1000000
+PenaltyBreakFirstLessLess: 120
+PenaltyExcessCharacter: 1000
 PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Right
-ReflowComments:  true
-SortIncludes:    true
-SpaceAfterCStyleCast: false
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
+PointerBindsToType: false
 SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
+Cpp11BracedListStyle: true
 Standard:        Cpp11
+IndentWidth:     4
 TabWidth:        8
 UseTab:          Never
+BreakBeforeBraces: Allman
+IndentFunctionDeclarationAfterType: false
+SpacesInParentheses: false
+SpacesInAngles:  false
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: true
+SpaceBeforeAssignmentOperators: true
+ContinuationIndentWidth: 4
+CommentPragmas:  '^ IWYU pragma:'
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+SpaceBeforeParens: ControlStatements
 ...

--- a/.clang-tidy
+++ b/.clang-tidy
@ -1,101 +0,0 @@
---
-Checks: >
-    bugprone-*,
-    -bugprone-narrowing-conversions,
-    -bugprone-easily-swappable-parameters,
-    -bugprone-branch-clone,
-    -bugprone-misplaced-widening-cast,
-    -bugprone-exception-escape,
-    -bugprone-implicit-widening-of-multiplication-result,
-    -bugprone-integer-division,
-    -bugprone-reserved-identifier,
-    -bugprone-unhandled-self-assignment,
-    -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,
-    -bugprone-unchecked-optional-access,
-    -clang-analyzer-*,
-    -clang-diagnostic-deprecated-declarations,
-    -clang-diagnostic-constant-conversion,
-    cppcoreguidelines-avoid-goto,
-    cppcoreguidelines-no-malloc,
-    cppcoreguidelines-virtual-class-destructor,
-    google-*,
-    -google-build-explicit-make-pair,
-    -google-build-using-namespace,
-    -google-explicit-constructor,
-    -google-default-arguments,
-    -google-readability-braces-around-statements,
-    -google-readability-casting,
-    -google-readability-namespace-comments,
-    -google-readability-function,
-    -google-readability-todo,
-    -google-runtime-int,
-    -google-build-namespaces,
-    -google-runtime-references,
-    -google-readability-function-size,
-    llvm-*,
-    -llvm-namespace-comment,
-    -llvm-qualified-auto,
-    -llvm-include-order,
-    -llvm-else-after-return,
-    -llvm-header-guard,
-    -llvm-twine-local,
-    misc-*,
-    -misc-argument-comment,
-    -misc-const-correctness,
-    -misc-non-private-member-variables-in-classes,
-    -misc-unconventional-assign-operator,
-    -misc-no-recursion,
-    -misc-misplaced-const,
-    -misc-definitions-in-headers,
-    -misc-unused-parameters,
-    -misc-include-cleaner,
-    modernize-concat-nested-namespaces,
-    modernize-use-using,
-    performance-*,
-    -performance-no-int-to-ptr,
-    -performance-enum-size,
-    -performance-avoid-endl,
-    readability-*,
-    -readability-avoid-const-params-in-decls,
-    -readability-braces-around-statements,
-    -readability-container-size-empty,
-    -readability-convert-member-functions-to-static,
-    -readability-const-return-type,
-    -readability-function-cognitive-complexity,
-    -readability-function-size,
-    -readability-identifier-naming,
-    -readability-implicit-bool-conversion,
-    -readability-magic-numbers,
-    -readability-else-after-return,
-    -readability-inconsistent-declaration-parameter-name,
-    -readability-isolate-declaration,
-    -readability-identifier-length,
-    -readability-redundant-declaration,
-    -readability-uppercase-literal-suffix,
-    -readability-named-parameter,
-    -readability-qualified-auto,
-    -readability-suspicious-call-argument,
-    -readability-redundant-access-specifiers,
-    -readability-redundant-member-init,
-    -readability-static-definition-in-anonymous-namespace,
-    -readability-use-anyofallof,
-    -readability-simplify-boolean-expr,
-    -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: '*'
-HeaderFilterRegex: '.*'
-
-
--- a/.cncc.style
+++ b/.cncc.style
@ -1,14 +0,0 @@
-# Kind-specific patterns to check AST nodes against. Both python-clang and
-# libclang docs explain CursorKind, with differences in detail. See also:
-#  - https://github.com/llvm-mirror/clang/blob/aca4fe314a55cacae29e1548cb7bfd2119c6df4c/bindings/python/clang/cindex.py#L599
-#  - http://clang.llvm.org/doxygen/group__CINDEX.html#gaaccc432245b4cd9f2d470913f9ef0013
-#  - https://docs.python.org/2/library/re.html#regular-expression-syntax
-
-class_decl: '^([A-Z]+[a-z]+)+$'
-struct_decl: '^([A-Z]+[a-z]+)+$'
-field_decl: '^[a-z_]+$'
-var_decl: '^[a-z]+[a-z0-9_]*$'
-parm_decl: '^[a-z]*[a-z0-9_]*$'
-namespace: '^[a-z_]*$'
-cxx_method: '^([A-Z]+[a-z]+)+$'
-function_decl: '^[a-z]+([A-Z]+[a-z]+)*$'
--- a/.dockerignore
+++ b/.dockerignore
@ -1,2 +0,0 @@
-test
-build
--- a/.editorconfig
+++ b/.editorconfig
@ -1,30 +0,0 @@
-# EditorConfig is awesome: http://EditorConfig.org
-#
-# NOTE: Keep settings in sync with the master .clang-format file
-#
-# top-most EditorConfig file
-root = true
-
-# CMake configuration files
-[{CMakeLists.txt,CMakeSettings.json,*.cmake}]
-indent_size = 2
-indent_style = space
-trim_trailing_whitespace = true
-
-# CI configuration files
-[{.travis.yml,appveyor.yml}]
-indent_size = 2
-indent_style = space
-trim_trailing_whitespace = true
-
-# Unix shell scripts
-[*.sh]
-end_of_line = lf
-indent_style = space
-trim_trailing_whitespace = true
-
-# Windows shell scripts
-[*.bat]
-end_of_line = crlf
-indent_style = space
-trim_trailing_whitespace = true
--- a/.eslintignore
+++ b/.eslintignore
@ -1,2 +0,0 @@
-features/support/flatbuffers.js
-features/support/fbresult_generated.js
--- a/.eslintrc
+++ b/.eslintrc
@ -1,28 +0,0 @@
-{
-    "rules": {
-        "indent": [
-            2,
-            4
-        ],
-        "quotes": [
-            1,
-            "single"
-        ],
-        "linebreak-style": [
-            2,
-            "unix"
-        ],
-        "semi": [
-            2,
-            "always"
-        ],
-        "no-console": [
-            1
-        ]
-    },
-    "env": {
-        "es6": true,
-        "node": true
-    },
-    "extends": "eslint:recommended"
-}
--- a/.gitattributes
+++ b/.gitattributes
@ -1,18 +0,0 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
-
-# Explicitly declare text files you want to always be normalized and converted
-# to native line endings on checkout.
-*.cpp text
-*.hpp text
-
-# Declare files that will always have CRLF line endings on checkout.
-*.bat text eol=crlf
-*.cmd text eol=crlf
-*.ps1 text eol=crlf
-
-# Declare files that will always have LF line endings on checkout.
-*.sh text eol=lf
-
-# https://eslint.org/docs/latest/rules/linebreak-style#using-this-rule-with-version-control-systems
-*.js text eol=lf
--- a/.gitea/workflows/publish-container.yaml
+++ b/.gitea/workflows/publish-container.yaml
@ -1,65 +0,0 @@
-name: Build and Publish Docker Image
-
-on:
-  release:
-    types: [published, prereleased]
-
-env:
-  IMAGE_NAME: openharbor/osrm-backend
-
-jobs:
-  publish:
-    strategy:
-      matrix:
-        docker-base-image: ["debian", "alpine"]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ env.IMAGE_NAME }}
-
-      - name: Docker meta - debug
-        id: metadebug
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ env.IMAGE_NAME }}
-          flavor: |
-            latest=true
-            suffix=-debug,onlatest=true
-
-      - name: Log in to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
-
-      - name: Build and push debug image
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/riscv64
-          file: ./docker/Dockerfile-${{ matrix.docker-base-image }}
-          tags: ${{ steps.metadebug.outputs.tags }}
-          build-args: |
-            DOCKER_TAG=${{ join(steps.metadebug.outputs.tags) }}-${{ matrix.docker-base-image }}
-
-      - name: Build and push normal image
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/riscv64
-          file: ./docker/Dockerfile-${{ matrix.docker-base-image }}
-          tags: ${{ steps.meta.outputs.tags }}
-          build-args: |
-            DOCKER_TAG=${{ join(steps.meta.outputs.tags) }}-${{ matrix.docker-base-image }}
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,30 +0,0 @@
---
-name: Bug Report
-about: Report issue with osrm-backend
-labels: Bug Report
---
-
-# Issue
-
-Please describe the issue you are seeing with OSRM.
-Images are a good way to illustrate your problem.
-
-**Note**: If your issue relates to the demo site (https://map.project-osrm.org) or routing provided on openstreetmap.org, be aware that they use separate [profile settings](https://github.com/fossgis-routing-server/cbf-routing-profiles) from those provided by default in `osrm-backend`.
-If your issue relates to the demo site or openstreetmap.org behaviour, please check these profiles first to see if they explain the behaviour before creating an issue here.
-
-# Steps to reproduce
-
-Please provide the steps required to reproduce your problem.
- `osrm-backend` version being used
- OSM extract that was processed
- Processing commands (e.g. CH vs MLD processing)
- Server queries
-
-If you're reporting an issue with https://map.project-osrm.org, please provide a link to the problematic request.
-
-# Specifications
-
-Please provide details of your development environment.
- Library/dependency versions
- Operating system
- Hardware
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@ -1,10 +0,0 @@
---
-name: Feature Request
-about: Request a new feature in osrm-backend
-labels: Feature Request
---
-
-# Feature
-
-Please describe the feature you would like to see in OSRM.
-Images are often a good way to illustrate your requested feature.
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -1,19 +0,0 @@
-# Issue
-
-What issue is this PR targeting? If there is no issue that addresses the problem, please open a corresponding issue and link it here.
-
-Please read our [documentation](https://github.com/Project-OSRM/osrm-backend/blob/master/docs/releasing.md) on release and version management.
-If your PR is still work in progress please attach the relevant label.
-
-## Tasklist
-
- - [ ] CHANGELOG.md entry ([How to write a changelog entry](http://keepachangelog.com/en/1.0.0/#how))
- - [ ] update relevant [Wiki pages](https://github.com/Project-OSRM/osrm-backend/wiki)
- - [ ] add tests (see [testing documentation](https://github.com/Project-OSRM/osrm-backend/blob/master/docs/testing.md))
- - [ ] review
- - [ ] adjust for comments
- - [ ] cherry pick to release branch
-
-## Requirements / Relations
-
- Link any requirements here. Other pull requests this PR is based on?
--- a/.github/workflows/osrm-backend-docker.yml
+++ b/.github/workflows/osrm-backend-docker.yml
@ -1,84 +0,0 @@
-name: build and publish container image
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  publish:
-    strategy:
-      matrix:
-        docker-base-image: ["debian", "alpine"]
-    runs-on: ubuntu-latest
-    steps:       
-      - name: Check out the repo
-        uses: actions/checkout@v2
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: ghcr.io/${{ github.repository }}
-
-      - name: Docker meta - debug
-        id: metadebug
-        uses: docker/metadata-action@v3
-        with:
-          images: ghcr.io/${{ github.repository }}
-          flavor: |
-            latest=true
-            suffix=-debug,onlatest=true
-
-      - name: Docker meta - assertions
-        id: metaassertions
-        uses: docker/metadata-action@v3
-        with:
-          images: ghcr.io/${{ github.repository }}
-          flavor: |
-            latest=true
-            suffix=-assertions,onlatest=true        
-
-      - name: Log in to GitHub Docker Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build container image - debug
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64
-          file: ./docker/Dockerfile-${{ matrix.docker-base-image }}
-          tags: ${{ steps.metadebug.outputs.tags  }}
-          build-args: |
-            DOCKER_TAG=${{ join(steps.metadebug.outputs.tags ) }}-${{ matrix.docker-base-image }}
-
-
-      - name: Build container image - assertions
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64
-          file: ./docker/Dockerfile-${{ matrix.docker-base-image }}
-          tags: ${{ steps.metaassertions.outputs.tags  }}
-          build-args: |
-            DOCKER_TAG=${{ join(steps.metaassertions.outputs.tags ) }}-${{ matrix.docker-base-image }}
-
-      # build and publish "normal" image as last to get it listed on top
-      - name: Build container image - normal
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64
-          file: ./docker/Dockerfile-${{ matrix.docker-base-image }}
-          tags: ${{ steps.meta.outputs.tags  }}
-          build-args: |
-            DOCKER_TAG=${{ join(steps.meta.outputs.tags ) }}-${{ matrix.docker-base-image }}
--- a/.github/workflows/osrm-backend.yml
+++ b/.github/workflows/osrm-backend.yml
@ -1,786 +0,0 @@
-name: osrm-backend CI
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - v[1-9]+.[0-9]+.[0-9]+
-      - v[1-9]+.[0-9]+.[0-9]+-[a-zA-Z]+.[0-9]+
-      - v[1-9]+.[0-9]+-[0-9a-zA-Z]+
-  pull_request:
-    branches:
-      - master
-
-env:
-  CCACHE_TEMPDIR: /tmp/.ccache-temp
-  CCACHE_COMPRESS: 1
-  CASHER_TIME_OUT: 599 # one second less than 10m to avoid 10m timeout error: https://github.com/Project-OSRM/osrm-backend/issues/2742
-  CMAKE_VERSION: 3.21.2
-  ENABLE_NODE_BINDINGS: "ON"
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  windows-release-node:
-    needs: format-taginfo-docs
-    runs-on: windows-2022
-    continue-on-error: false
-    env:
-      BUILD_TYPE: Release
-    steps:
-    - uses: actions/checkout@v4
-    - run: pip install "conan<2.0.0"
-    - run: conan --version
-    - run: cmake --version
-    - uses: actions/setup-node@v4
-      with:
-        node-version: 18
-    - run: node --version
-    - run: npm --version
-    - name: Prepare environment
-      shell: bash
-      run: |
-        PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)")
-        echo PUBLISH=$([[ "${GITHUB_REF:-}" == "refs/tags/v${PACKAGE_JSON_VERSION}" ]] && echo "On" || echo "Off") >> $GITHUB_ENV
-    - run: npm install --ignore-scripts
-    - run: npm link --ignore-scripts
-    - name: Build
-      shell: bash
-      run: |
-        mkdir build
-        cd build
-        cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON ..
-        cmake --build . --config Release
-        
-    # TODO: MSVC goes out of memory when building our tests
-    # - name: Run tests
-    #   shell: bash
-    #   run: |
-    #     cd build
-    #     cmake --build . --config Release --target tests
-    #     # TODO: run tests
-    # - name: Run node tests
-    #   shell: bash
-    #   run: |
-    #     ./lib/binding/osrm-extract.exe -p profiles/car.lua test/data/monaco.osm.pbf
-
-    #     mkdir -p test/data/ch
-    #     cp test/data/monaco.osrm* test/data/ch/
-    #     ./lib/binding/osrm-contract.exe test/data/ch/monaco.osrm
-
-    #     ./lib/binding/osrm-datastore.exe test/data/ch/monaco.osrm
-    #     node test/nodejs/index.js
-    - name: Build Node package
-      shell: bash
-      run: ./scripts/ci/node_package.sh
-    - name: Publish Node package
-      if: ${{ env.PUBLISH == 'On' }}
-      uses: ncipollo/release-action@v1
-      with:
-        allowUpdates: true
-        artifactErrorsFailBuild: true
-        artifacts: build/stage/**/*.tar.gz
-        omitBody: true
-        omitBodyDuringUpdate: true
-        omitName: true
-        omitNameDuringUpdate: true
-        replacesArtifacts: true
-        token: ${{ secrets.GITHUB_TOKEN }}
-
-  format-taginfo-docs:
-    runs-on: ubuntu-22.04
-    steps:
-    - uses: actions/checkout@v4
-    - name: Use Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: 18
-    - name: Enable Node.js cache
-      uses: actions/cache@v4
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-    - name: Prepare environment
-      run: |
-        npm ci --ignore-scripts
-        clang-format-15 --version
-    - name: Run checks
-      run: |
-        ./scripts/check_taginfo.py taginfo.json profiles/car.lua
-        ./scripts/format.sh && ./scripts/error_on_dirty.sh
-        node ./scripts/validate_changelog.js
-        npm run docs && ./scripts/error_on_dirty.sh
-        npm audit --production
-
-  docker-image-matrix:
-    strategy:
-      matrix:
-        docker-base-image: ["debian", "alpine"]
-    needs: format-taginfo-docs
-    runs-on: ubuntu-22.04
-    continue-on-error: false
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
-      - name: Enable osm.pbf cache
-        uses: actions/cache@v4
-        with:
-          path: berlin-latest.osm.pbf
-          key: v1-berlin-osm-pbf
-          restore-keys: |
-            v1-berlin-osm-pbf
-      - name: Docker build
-        run: |
-          docker build -t osrm-backend-local -f docker/Dockerfile-${{ matrix.docker-base-image }} .
-      - name: Test Docker image
-        run: |
-          if [ ! -f "${PWD}/berlin-latest.osm.pbf" ]; then
-            wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf
-          fi
-          TAG=osrm-backend-local
-          # when `--memory-swap` value equals `--memory` it means container won't use swap
-          # see https://docs.docker.com/config/containers/resource_constraints/#--memory-swap-details
-          MEMORY_ARGS="--memory=1g --memory-swap=1g"
-          docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-extract --dump-nbg-graph -p /opt/car.lua /data/berlin-latest.osm.pbf
-          docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-components /data/berlin-latest.osrm.nbg /data/berlin-latest.geojson
-          if [ ! -s "${PWD}/berlin-latest.geojson" ]
-          then
-            >&2 echo "No berlin-latest.geojson found"
-            exit 1
-          fi
-          # removing `.osrm.nbg` to check that whole pipeline works without it
-          rm -rf "${PWD}/berlin-latest.osrm.nbg"
-
-          docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-partition /data/berlin-latest.osrm
-          docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-customize /data/berlin-latest.osrm
-          docker run $MEMORY_ARGS --name=osrm-container -t -p 5000:5000 -v "${PWD}:/data" "${TAG}" osrm-routed --algorithm mld /data/berlin-latest.osrm &
-          curl --retry-delay 3 --retry 10 --retry-all-errors "http://127.0.0.1:5000/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true"
-          docker stop osrm-container
-
-  build-test-publish:
-    needs: format-taginfo-docs
-    strategy:
-      matrix:
-        include:
-          - name: gcc-13-debug-cov
-            continue-on-error: false
-            node: 20
-            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
-            BUILD_TYPE: Debug
-            CCOMPILER: gcc-13
-            CUCUMBER_TIMEOUT: 20000
-            CXXCOMPILER: g++-13
-            ENABLE_COVERAGE: ON
-
-          - name: clang-18-debug-asan-ubsan
-            continue-on-error: false
-            node: 20
-            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
-            BUILD_TYPE: Debug
-            CCOMPILER: clang-18
-            CUCUMBER_TIMEOUT: 20000
-            CXXCOMPILER: clang++-18
-            ENABLE_SANITIZER: ON
-            TARGET_ARCH: x86_64-asan-ubsan
-            OSRM_CONNECTION_RETRIES: 10
-            OSRM_CONNECTION_EXP_BACKOFF_COEF: 1.5
-
-          - name: clang-18-release
-            continue-on-error: false
-            node: 18
-            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
-            BUILD_TYPE: Release
-            CCOMPILER: clang-18
-            CXXCOMPILER: clang++-18
-            CUCUMBER_TIMEOUT: 60000
-            ENABLE_LTO: OFF
-
-          - name: clang-18-debug
-            continue-on-error: false
-            node: 18
-            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
-            BUILD_TYPE: Debug
-            CCOMPILER: clang-18
-            CXXCOMPILER: clang++-18
-            CUCUMBER_TIMEOUT: 60000
-            ENABLE_LTO: OFF
-
-          - name: clang-18-debug-clang-tidy
-            continue-on-error: false
-            node: 18
-            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
-            BUILD_TYPE: Debug
-            CCOMPILER: clang-18
-            CXXCOMPILER: clang++-18
-            CUCUMBER_TIMEOUT: 60000
-            ENABLE_CLANG_TIDY: ON
-
-
-          - name: clang-17-release
-            continue-on-error: false
-            node: 18
-            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
-            BUILD_TYPE: Release
-            CCOMPILER: clang-17
-            CXXCOMPILER: clang++-17
-            CUCUMBER_TIMEOUT: 60000
-            ENABLE_LTO: OFF
-
-          - name: clang-16-release
-            continue-on-error: false
-            node: 18
-            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
-            BUILD_TYPE: Release
-            CCOMPILER: clang-16
-            CXXCOMPILER: clang++-16
-            CUCUMBER_TIMEOUT: 60000
-            ENABLE_LTO: OFF
-
-          - name: conan-linux-debug-asan-ubsan
-            continue-on-error: false
-            node: 18
-            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
-            BUILD_TYPE: Release
-            CCOMPILER: clang-18
-            CXXCOMPILER: clang++-18
-            ENABLE_CONAN: ON
-            ENABLE_SANITIZER: ON
-            ENABLE_LTO: OFF
-
-          - name: conan-linux-release
-            continue-on-error: false
-            node: 18
-            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
-            BUILD_TYPE: Release
-            CCOMPILER: clang-18
-            CXXCOMPILER: clang++-18
-            ENABLE_CONAN: ON
-            ENABLE_LTO: OFF
-
-          - name: gcc-14-release
-            continue-on-error: false
-            node: 20
-            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
-            BUILD_TYPE: Release
-            CCOMPILER: gcc-14
-            CXXCOMPILER: g++-14
-            CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized'
-
-          - name: gcc-13-release
-            continue-on-error: false
-            node: 20
-            runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
-            BUILD_TYPE: Release
-            CCOMPILER: gcc-13
-            CXXCOMPILER: g++-13
-            CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized'
-
-          - name: gcc-12-release
-            continue-on-error: false
-            node: 20
-            runs-on: ubuntu-22.04
-            BUILD_TOOLS: ON
-            BUILD_TYPE: Release
-            CCOMPILER: gcc-12
-            CXXCOMPILER: g++-12
-            CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized'
-
-          - name: conan-linux-release-node
-            build_node_package: true
-            continue-on-error: false
-            node: 20
-            runs-on: ubuntu-24.04
-            BUILD_TYPE: Release
-            CCOMPILER: clang-16
-            CXXCOMPILER: clang++-16
-            ENABLE_CONAN: ON
-            NODE_PACKAGE_TESTS_ONLY: ON
-
-          - name: conan-linux-debug-node
-            build_node_package: true
-            continue-on-error: false
-            node: 20
-            runs-on: ubuntu-24.04
-            BUILD_TYPE: Debug
-            CCOMPILER: clang-16
-            CXXCOMPILER: clang++-16
-            ENABLE_CONAN: ON
-            NODE_PACKAGE_TESTS_ONLY: ON
-
-          - name: conan-macos-x64-release-node
-            build_node_package: true
-            continue-on-error: true
-            node: 20
-            runs-on: macos-13 # x86_64
-            BUILD_TYPE: Release
-            CCOMPILER: clang
-            CXXCOMPILER: clang++
-            CUCUMBER_TIMEOUT: 60000
-            ENABLE_ASSERTIONS: ON
-            ENABLE_CONAN: ON
-
-          - name: conan-macos-arm64-release-node
-            build_node_package: true
-            continue-on-error: true
-            node: 20
-            runs-on: macos-14 # arm64 
-            BUILD_TYPE: Release
-            CCOMPILER: clang
-            CXXCOMPILER: clang++
-            CUCUMBER_TIMEOUT: 60000
-            ENABLE_ASSERTIONS: ON
-            ENABLE_CONAN: ON
-
-    name: ${{ matrix.name}}
-    continue-on-error: ${{ matrix.continue-on-error }}
-    runs-on: ${{ matrix.runs-on }}
-    env:
-      BUILD_TOOLS: ${{ matrix.BUILD_TOOLS }}
-      BUILD_TYPE: ${{ matrix.BUILD_TYPE }}
-      BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS }}
-      CCOMPILER: ${{ matrix.CCOMPILER }}
-      CFLAGS: ${{ matrix.CFLAGS }}
-      CUCUMBER_TIMEOUT: ${{ matrix.CUCUMBER_TIMEOUT }}
-      CXXCOMPILER: ${{ matrix.CXXCOMPILER }}
-      CXXFLAGS: ${{ matrix.CXXFLAGS }}
-      ENABLE_ASSERTIONS: ${{ matrix.ENABLE_ASSERTIONS }}
-      ENABLE_CLANG_TIDY: ${{ matrix.ENABLE_CLANG_TIDY }}
-      ENABLE_COVERAGE: ${{ matrix.ENABLE_COVERAGE }}
-      ENABLE_CONAN: ${{ matrix.ENABLE_CONAN }}
-      ENABLE_SANITIZER: ${{ matrix.ENABLE_SANITIZER }}
-      NODE_PACKAGE_TESTS_ONLY: ${{ matrix.NODE_PACKAGE_TESTS_ONLY }}
-      TARGET_ARCH: ${{ matrix.TARGET_ARCH }}
-      OSRM_CONNECTION_RETRIES: ${{ matrix.OSRM_CONNECTION_RETRIES }}
-      OSRM_CONNECTION_EXP_BACKOFF_COEF: ${{ matrix.OSRM_CONNECTION_EXP_BACKOFF_COEF }}
-      ENABLE_LTO: ${{ matrix.ENABLE_LTO }}
-    steps:
-    - uses: actions/checkout@v4
-    - name: Build machine architecture
-      run: uname -m
-    - name: Use Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: ${{ matrix.node }}
-    - name: Enable Node.js cache
-      uses: actions/cache@v4
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-    - name: Enable compiler cache
-      uses: actions/cache@v4
-      with:
-        path: ~/.ccache
-        key: ccache-${{ matrix.name }}-${{ github.sha }}
-        restore-keys: |
-          ccache-${{ matrix.name }}-
-    - name: Enable Conan cache
-      uses: actions/cache@v4
-      with:
-        path: ~/.conan
-        key: v9-conan-${{ matrix.name }}-${{ github.sha }}
-        restore-keys: |
-          v9-conan-${{ matrix.name }}-
-    - name: Enable test cache
-      uses: actions/cache@v4
-      with:
-        path: ${{github.workspace}}/test/cache
-        key: v4-test-${{ matrix.name }}-${{ github.sha }}
-        restore-keys: |
-          v4-test-${{ matrix.name }}-
-    - name: Prepare environment
-      run: |
-        echo "CCACHE_DIR=$HOME/.ccache" >> $GITHUB_ENV
-        mkdir -p $HOME/.ccache
-
-        PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)")
-        echo PUBLISH=$([[ "${GITHUB_REF:-}" == "refs/tags/v${PACKAGE_JSON_VERSION}" ]] && echo "On" || echo "Off") >> $GITHUB_ENV
-        echo "OSRM_INSTALL_DIR=${GITHUB_WORKSPACE}/install-osrm" >> $GITHUB_ENV
-        echo "OSRM_BUILD_DIR=${GITHUB_WORKSPACE}/build-osrm" >> $GITHUB_ENV
-        if [[ "$ENABLE_SANITIZER" == 'ON' ]]; then
-          # We can only set this after checkout once we know the workspace directory
-          echo "LSAN_OPTIONS=print_suppressions=0:suppressions=${GITHUB_WORKSPACE}/scripts/ci/leaksanitizer.conf" >> $GITHUB_ENV
-          echo "UBSAN_OPTIONS=symbolize=1:halt_on_error=1:print_stacktrace=1:suppressions=${GITHUB_WORKSPACE}/scripts/ci/undefinedsanitizer.conf" >> $GITHUB_ENV
-          echo "ASAN_OPTIONS=print_suppressions=0:suppressions=${GITHUB_WORKSPACE}/scripts/ci/addresssanitizer.conf" >> $GITHUB_ENV
-        fi
-
-        if [[ "${RUNNER_OS}" == "Linux" ]]; then
-          echo "JOBS=$((`nproc` + 1))" >>  $GITHUB_ENV
-        elif [[ "${RUNNER_OS}" == "macOS" ]]; then
-          echo "JOBS=$((`sysctl -n hw.ncpu` + 1))" >>  $GITHUB_ENV
-        fi
-    # See: https://github.com/actions/toolkit/issues/946#issuecomment-1590016041
-    # We need it to be able to access system folders while restoring cached Boost below
-    - name: Give tar root ownership 
-      if: runner.os == 'Linux' && matrix.ENABLE_CONAN != 'ON'
-      run: sudo chown root /bin/tar && sudo chmod u+s /bin/tar
-    - name: Cache Boost
-      if: runner.os == 'Linux' && matrix.ENABLE_CONAN != 'ON'
-      id: cache-boost
-      uses: actions/cache@v4
-      with:
-        path: |
-          /usr/local/include/boost
-          /usr/local/lib/libboost*
-        key: v1-boost-${{ runner.os }}-${{ runner.arch }}-${{ matrix.runs-on }}
-        restore-keys: |
-          v1-boost-${{ runner.os }}-${{ runner.arch }}-${{ matrix.runs-on }}
-
-    - name: Install Boost
-      if: steps.cache-boost.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ENABLE_CONAN != 'ON'
-      run: |
-        BOOST_VERSION="1.85.0"
-        BOOST_VERSION_FLAVOR="${BOOST_VERSION}-b2-nodocs"
-        wget -q https://github.com/boostorg/boost/releases/download/boost-${BOOST_VERSION}/boost-${BOOST_VERSION_FLAVOR}.tar.gz
-        tar xzf boost-${BOOST_VERSION_FLAVOR}.tar.gz
-        cd boost-${BOOST_VERSION}
-        sudo ./bootstrap.sh
-        sudo ./b2 install
-        cd ..
-        sudo rm -rf boost-${BOOST_VERSION}*
-    
-    - name: Install dev dependencies
-      run: |
-        python3 -m pip install "conan<2.0.0" || python3 -m pip install "conan<2.0.0" --break-system-packages
-
-        # workaround for issue that GitHub Actions seems to not adding it to PATH after https://github.com/actions/runner-images/pull/6499
-        # and that's why CI cannot find conan executable installed above
-        if [[ "${RUNNER_OS}" == "macOS" ]]; then
-          echo "/Library/Frameworks/Python.framework/Versions/Current/bin" >> $GITHUB_PATH
-        fi
-
-        # ccache
-        if [[ "${RUNNER_OS}" == "Linux" ]]; then
-          sudo apt-get update -y && sudo apt-get install ccache
-        elif [[ "${RUNNER_OS}" == "macOS" ]]; then
-          brew install ccache
-        fi
-
-        # Linux dev packages
-        if [ "${ENABLE_CONAN}" != "ON" ]; then
-          sudo apt-get update -y
-          sudo apt-get install -y libbz2-dev libxml2-dev libzip-dev liblua5.2-dev
-          if [[ "${CCOMPILER}" != clang-* ]]; then
-            sudo apt-get install -y ${CXXCOMPILER}
-          fi
-          if [[ "${ENABLE_COVERAGE}" == "ON" ]]; then
-            sudo apt-get install -y lcov
-          fi
-        fi
-
-        # TBB
-        TBB_VERSION=2021.12.0
-        if [[ "${RUNNER_OS}" == "Linux" ]]; then
-          TBB_URL="https://github.com/oneapi-src/oneTBB/releases/download/v${TBB_VERSION}/oneapi-tbb-${TBB_VERSION}-lin.tgz"
-        elif [[ "${RUNNER_OS}" == "macOS" ]]; then
-          TBB_URL="https://github.com/oneapi-src/oneTBB/releases/download/v${TBB_VERSION}/oneapi-tbb-${TBB_VERSION}-mac.tgz"
-        fi
-        wget --tries 5 ${TBB_URL} -O onetbb.tgz
-        tar zxvf onetbb.tgz
-        sudo cp -a oneapi-tbb-${TBB_VERSION}/lib/. /usr/local/lib/
-        sudo cp -a oneapi-tbb-${TBB_VERSION}/include/. /usr/local/include/
-    - name: Add Clang 18 to list of Conan compilers # workaround for the issue that Conan 1.x doesn't know about Clang 18
-      if: ${{ matrix.ENABLE_CONAN == 'ON' && matrix.CCOMPILER == 'clang-18' }}
-      run: |
-        sudo wget https://github.com/mikefarah/yq/releases/download/v4.9.6/yq_linux_amd64 -O /usr/bin/yq && sudo chmod +x /usr/bin/yq
-
-        conan config init
-        yq eval '.compiler.clang.version += ["18"]' -i "$HOME/.conan/settings.yml"
-    - name: Add Apple-clang 16 to list of Conan compilers # workaround for the issue that Conan 1.x doesn't know about Apple-clang 16
-      if: ${{ matrix.ENABLE_CONAN == 'ON' && matrix.runs-on == 'macos-14' }}
-      run: |
-        sudo wget https://github.com/mikefarah/yq/releases/download/v4.9.6/yq_darwin_arm64 -O /usr/local/bin/yq && sudo chmod +x /usr/local/bin/yq
-
-        conan config init
-        yq eval '.compiler.apple-clang.version += ["16.0"]' -i "$HOME/.conan/settings.yml"
-    - name: Prepare build
-      run: |
-        mkdir ${OSRM_BUILD_DIR}
-        ccache --max-size=256M
-        npm ci --ignore-scripts
-        if [[ "${ENABLE_COVERAGE}" == "ON" ]]; then
-          lcov --directory . --zerocounters # clean cached files
-        fi
-        echo "CC=${CCOMPILER}" >> $GITHUB_ENV
-        echo "CXX=${CXXCOMPILER}" >> $GITHUB_ENV
-        if [[ "${RUNNER_OS}" == "macOS" ]]; then
-          # missing from GCC path, needed for conan builds of libiconv, for example.
-          sudo xcode-select --switch /Library/Developer/CommandLineTools
-          echo "LIBRARY_PATH=${LIBRARY_PATH}:/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib" >> $GITHUB_ENV
-          echo "CPATH=${CPATH}:/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include" >> $GITHUB_ENV
-        fi
-
-    - name: Build and install OSRM
-      run: |
-        echo "Using ${JOBS} jobs"
-        pushd ${OSRM_BUILD_DIR}
-        
-        ccache --zero-stats
-        cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-                 -DENABLE_CONAN=${ENABLE_CONAN:-OFF} \
-                 -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS:-OFF} \
-                 -DENABLE_CLANG_TIDY=${ENABLE_CLANG_TIDY:-OFF} \
-                 -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} \
-                 -DENABLE_COVERAGE=${ENABLE_COVERAGE:-OFF} \
-                 -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
-                 -DENABLE_SANITIZER=${ENABLE_SANITIZER:-OFF} \
-                 -DBUILD_TOOLS=${BUILD_TOOLS:-OFF} \
-                 -DENABLE_CCACHE=ON \
-                 -DENABLE_LTO=${ENABLE_LTO:-ON} \
-                 -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
-        make --jobs=${JOBS}
-
-        if [[ "${NODE_PACKAGE_TESTS_ONLY}" != "ON" ]]; then
-          make tests --jobs=${JOBS}
-          make benchmarks --jobs=${JOBS}
-
-          sudo make install
-          if [[ "${RUNNER_OS}" == "Linux" ]]; then
-            echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${OSRM_INSTALL_DIR}/lib" >> $GITHUB_ENV
-          fi
-          echo "PKG_CONFIG_PATH=${OSRM_INSTALL_DIR}/lib/pkgconfig" >> $GITHUB_ENV
-        fi
-        popd
-    - name: Build example
-      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY != 'ON' }}
-      run: |
-        mkdir example/build && pushd example/build
-        cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
-        make --jobs=${JOBS}
-        popd
-    - name: Run all tests
-      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY != 'ON' }}
-      run: |
-        make -C test/data benchmark
-
-        # macOS SIP strips the linker path. Reset this inside the running shell
-        export LD_LIBRARY_PATH=${{ env.LD_LIBRARY_PATH }}
-        ./example/build/osrm-example test/data/mld/monaco.osrm
-
-        # All tests assume to be run from the build directory
-        pushd ${OSRM_BUILD_DIR}
-        for i in ./unit_tests/*-tests ; do echo Running $i ; $i ; done
-        if [ -z "${ENABLE_SANITIZER}" ]; then
-          npm run nodejs-tests
-        fi
-        popd
-        npm test
-
-    - name: Use Node 18
-      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }}
-      uses: actions/setup-node@v4
-      with:
-        node-version: 18
-    - name: Run Node package tests on Node 18
-      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }}
-      run: |
-        node --version
-        npm run nodejs-tests
-    - name: Use Node 20
-      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }}
-      uses: actions/setup-node@v4
-      with:
-        node-version: 20
-    - name: Run Node package tests on Node 20
-      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }}
-      run: |
-        node --version
-        npm run nodejs-tests
-    - name: Use Node latest
-      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }}
-      uses: actions/setup-node@v4
-      with:
-        node-version: latest
-    - name: Run Node package tests on Node-latest
-      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }}
-      run: |
-        node --version
-        npm run nodejs-tests
-
-    - name: Upload test logs
-      uses: actions/upload-artifact@v4
-      if: failure()
-      with:
-        name: logs
-        path: test/logs/
-
-    # - name: Generate code coverage
-    #   if: ${{ matrix.ENABLE_COVERAGE == 'ON' }}
-    #   run: |
-    #     lcov --directory . --capture --output-file coverage.info # capture coverage info
-    #     lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter out system
-    #     lcov --list coverage.info #debug info
-    
-    # # Uploading report to CodeCov
-    # - name: Upload code coverage
-    #   if: ${{ matrix.ENABLE_COVERAGE == 'ON' }}
-    #   uses: codecov/codecov-action@v4
-    #   with:
-    #     files: coverage.info
-    #     name: codecov-osrm-backend
-    #     fail_ci_if_error: true
-    #     verbose: true
-    - name: Build Node package
-      if: ${{ matrix.build_node_package }}
-      run: ./scripts/ci/node_package.sh
-    - name: Publish Node package
-      if: ${{ matrix.build_node_package && env.PUBLISH == 'On' }}
-      uses: ncipollo/release-action@v1
-      with:
-        allowUpdates: true
-        artifactErrorsFailBuild: true
-        artifacts: build/stage/**/*.tar.gz
-        omitBody: true
-        omitBodyDuringUpdate: true
-        omitName: true
-        omitNameDuringUpdate: true
-        replacesArtifacts: true
-        token: ${{ secrets.GITHUB_TOKEN }}
-    - name: Show CCache statistics
-      run: |
-        ccache -p
-        ccache -s
-
-  benchmarks:
-    if: github.event_name == 'pull_request'
-    needs: [format-taginfo-docs]
-    runs-on: self-hosted
-    env:
-      CCOMPILER: clang-16
-      CXXCOMPILER: clang++-16
-      CC: clang-16
-      CXX: clang++-16
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      PR_NUMBER: ${{ github.event.pull_request.number }}
-      GITHUB_REPOSITORY: ${{ github.repository }}
-      RUN_BIG_BENCHMARK: ${{ contains(github.event.pull_request.labels.*.name, 'Performance') }}
-    steps: 
-      - name: Checkout PR Branch
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.head_ref }}
-          path: pr
-      - name: Activate virtualenv
-        run: |
-          python3 -m venv .venv
-          source .venv/bin/activate
-          echo PATH=$PATH >> $GITHUB_ENV
-          pip install "conan<2.0.0" "requests==2.31.0" "numpy==1.26.4" 
-      - name: Prepare data
-        run: |
-          if [ "$RUN_BIG_BENCHMARK" = "true" ]; then
-              rm -rf ~/data.osm.pbf
-              wget http://download.geofabrik.de/europe/poland-latest.osm.pbf -O ~/data.osm.pbf --quiet
-              gunzip -c ./pr/test/data/poland_gps_traces.csv.gz > ~/gps_traces.csv
-          else
-              if [ ! -f "~/data.osm.pbf" ]; then
-                wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf -O ~/data.osm.pbf
-              else
-                echo "Using cached data.osm.pbf"
-              fi
-              gunzip -c ./pr/test/data/berlin_gps_traces.csv.gz > ~/gps_traces.csv
-          fi
-      - name: Prepare environment
-        run: |
-          echo "CCACHE_DIR=$HOME/.ccache" >> $GITHUB_ENV
-          mkdir -p $HOME/.ccache
-          ccache --zero-stats
-          ccache --max-size=256M
-      - name: Checkout Base Branch
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.base.ref }}
-          path: base
-      - name: Build Base Branch
-        run: |
-          cd base
-          npm ci --ignore-scripts
-          cd ..
-          mkdir base/build
-          cd base/build
-          cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_NODE_BINDINGS=ON ..
-          make -j$(nproc)
-          make -j$(nproc) benchmarks
-          cd ..
-          make -C test/data 
-      - name: Build PR Branch
-        run: |
-          cd pr
-          npm ci --ignore-scripts
-          cd ..
-          mkdir -p pr/build
-          cd pr/build
-          cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_NODE_BINDINGS=ON ..
-          make -j$(nproc) 
-          make -j$(nproc) benchmarks
-          cd ..
-          make -C test/data 
-      # we run benchmarks in tmpfs to avoid impact of disk IO
-      - name: Create folder for tmpfs 
-        run: |
-          # if by any chance it was mounted before(e.g. due to previous job failed), unmount it
-          sudo umount ~/benchmarks | true
-          rm -rf ~/benchmarks 
-          mkdir -p ~/benchmarks
-      # see https://llvm.org/docs/Benchmarking.html
-      - name: Run PR Benchmarks 
-        run: |
-          sudo cset shield -c 2-3 -k on
-          sudo mount -t tmpfs -o size=4g none ~/benchmarks
-          cp -rf pr/build ~/benchmarks/build
-          cp -rf pr/lib ~/benchmarks/lib
-          mkdir -p ~/benchmarks/test
-          cp -rf pr/test/data ~/benchmarks/test/data
-          cp -rf pr/profiles ~/benchmarks/profiles
-
-          sudo cset shield --exec -- ./pr/scripts/ci/run_benchmarks.sh -f ~/benchmarks -r $(pwd)/pr_results -s $(pwd)/pr -b ~/benchmarks/build -o ~/data.osm.pbf -g ~/gps_traces.csv
-          sudo umount ~/benchmarks
-          sudo cset shield --reset
-      - name: Run Base Benchmarks
-        run: |
-          sudo cset shield -c 2-3 -k on
-          sudo mount -t tmpfs -o size=4g none ~/benchmarks
-          cp -rf base/build ~/benchmarks/build
-          cp -rf base/lib ~/benchmarks/lib
-          mkdir -p ~/benchmarks/test
-          cp -rf base/test/data ~/benchmarks/test/data
-          cp -rf base/profiles ~/benchmarks/profiles
-
-          # TODO: remove it when base branch will have this file at needed location
-          if [ ! -f ~/benchmarks/test/data/portugal_to_korea.json ]; then
-            cp base/src/benchmarks/portugal_to_korea.json ~/benchmarks/test/data/portugal_to_korea.json
-          fi
-          # we intentionally use scripts from PR branch to be able to update them and see results in the same PR
-          sudo cset shield --exec -- cset shield --exec -- ./pr/scripts/ci/run_benchmarks.sh -f ~/benchmarks -r $(pwd)/base_results -s $(pwd)/pr -b ~/benchmarks/build -o ~/data.osm.pbf -g ~/gps_traces.csv
-          sudo umount ~/benchmarks
-          sudo cset shield --reset
-      - name: Post Benchmark Results
-        run: |
-          python3 pr/scripts/ci/post_benchmark_results.py base_results pr_results
-      - name: Show CCache statistics
-        run: |
-          ccache -p
-          ccache -s
-
-  ci-complete:
-    runs-on: ubuntu-22.04
-    needs: [build-test-publish, docker-image-matrix, windows-release-node, benchmarks]
-    steps:
-    - run: echo "CI complete"
-
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@ -1,29 +0,0 @@
-name: 'Close stale issues'
-on:
-  # NOTE: uncomment if you want to test changes to this file in PRs CI
-  # pull_request:
-  #   branches:
-  #     - master
-  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:
-          operations-per-run: 3000
-          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'
-
-  
-
--- a/.gitignore
+++ b/.gitignore
@ -1,9 +1,3 @@
-# pre compiled dependencies #
-#############################
-osrm-deps
-
-.ycm_extra_conf.py
-
 # Compiled source #
 ###################
 *.com
@ -41,12 +35,9 @@ Thumbs.db

 # build related files #
 #######################
-/_build*
 /build/
-/example/build/
-/test/data/monaco.osrm*
-/test/data/ch
-/test/data/mld
+/Util/finger_print.cpp
+/Util/git_sha.cpp
 /cmake/postinst

 # Eclipse related files #
@ -56,19 +47,31 @@ Thumbs.db
 .cproject
 .project

-# Visual Studio (Code) related files #
-######################################
-/.vs*
-/*.local.bat
-/CMakeSettings.json
-/.cache
+# stxxl related files #
+#######################
+.stxxl
+stxxl.log
+stxxl.errlog

-# Jetbrains related files #
-###########################
-.idea/
+# compiled protobuffers #
+#########################
+/DataStructures/pbf-proto/*.pb.h
+/DataStructures/pbf-proto/*.pb.cc

-# Compiled Binary Files #
+# External Libs #
+#################
+/lib/
+/win/lib
+
+# Visual Studio Temp + build Files #
 ####################################
+/win/*.user
+/win/*.ncb
+/win/*.suo
+/win/Debug/
+/win/Release/
+/win/bin/
+/win/bin-debug/
 /osrm-extract
 /osrm-io-benchmark
 /osrm-components
@ -85,23 +88,8 @@ Thumbs.db
 ###################
 /sandbox/

-# Test related files #
-######################
 /test/profile.lua
-/test/cache
-/test/speeds.csv
-/test/penalties.csv
-node_modules

 # Deprecated config file #
 ##########################
 /server.ini
-
-*.swp
-
-# local lua debugging file
-debug.lua
-
-# node-osrm artifacts
-lib/binding
-
--- a/.npmignore
+++ b/.npmignore
@ -1,16 +0,0 @@
-*
-!README.md
-!CHANGELOG.md
-!CONTRIBUTING.MD
-!LICENCE.TXT
-!package.json
-!package-lock.json
-!yarn.lock
-!docs
-!example
-!taginfo.json
-!lib/*.js
-!profiles/*
-!profiles/lib/*
-!profiles/examples/*
-!scripts/node_install.sh
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,60 @@
+language: cpp
+compiler:
+  - gcc
+#  - clang
+# Make sure CMake is installed
+install:
+ - sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
+ - sudo add-apt-repository -y ppa:boost-latest/ppa
+ - sudo apt-get update >/dev/null
+ - sudo apt-get -q install protobuf-compiler libprotoc-dev libprotobuf7 libprotobuf-dev libbz2-dev libstxxl-dev libstxxl1 libxml2-dev libzip-dev lua5.1 liblua5.1-0-dev rubygems libtbb-dev
+ - sudo apt-get -q install g++-4.8
+ - sudo apt-get install libboost1.54-all-dev
+ # luabind
+ - curl https://gist.githubusercontent.com/DennisOSRM/f2eb7b948e6fe1ae319e/raw/install-luabind.sh | sudo bash
+ # osmosis
+ - curl -s https://gist.githubusercontent.com/DennisOSRM/803a64a9178ec375069f/raw/ | sudo bash
+ # cmake
+ - curl -s https://gist.githubusercontent.com/DennisOSRM/5fad9bee5c7f09fd7fc9/raw/ | sudo bash
+ # osmpbf library
+ - curl -s https://gist.githubusercontent.com/DennisOSRM/13b1b4fe38a57ead850e/raw/install_osmpbf.sh | sudo bash
+before_script:
+ - rvm use 1.9.3
+ - gem install bundler
+ - bundle install
+ - mkdir build
+ - cd build
+ - cmake .. $CMAKEOPTIONS
+script:
+ - make -j 2
+ - make -j 2 tests
+ - ./datastructure-tests
+ - cd ..
+ - cucumber -p verify
+after_script:
+# - cd ..
+# - cucumber -p verify
+branches:
+  only:
+    - master
+    - develop
+cache:
+- bundler
+- apt
+env:
+ - CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++-4.8" OSRM_PORT=5000 OSRM_TIMEOUT=60
+ - CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=g++-4.8" OSRM_PORT=5010 OSRM_TIMEOUT=60
+notifications:
+ irc:
+  channels:
+    - irc.oftc.net#osrm
+  on_success: change
+  on_failure: always
+  use_notice: true
+  skip_join: false
+
+  recipients:
+    - dennis@mapbox.com
+  email:
+    on_success: change
+    on_failure: always
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/CODE-OF-CONDUCT.md
+++ b/CODE-OF-CONDUCT.md
@ -1,3 +0,0 @@
-# Code of conduct
-
-Everyone is invited to participate in Project OSRM’s open source projects and public discussions: we want to create a welcoming and friendly environment. Harassment of participants or other unethical and unprofessional behavior will not be tolerated in our spaces. The [Contributor Covenant](http://contributor-covenant.org) applies to all projects under the Project-OSRM organization and we ask that you please read [the full text](http://contributor-covenant.org/version/1/2/0/).
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,81 +0,0 @@
-# Everyone
-
-Please take some time to review our [code of conduct](CODE-OF-CONDUCT.md) to help guide your interactions with others on this project.
-
-# User
-
-Before you open a new issue, please search for older ones that cover the same issue.
-In general "me too" comments/issues are frowned upon.
-You can add a :+1: emoji reaction to the issue if you want to express interest in this.
-
-# Developer
-
-We use `clang-format` version `15` to consistently format the code base. There is a helper script under `scripts/format.sh`.
-The format is automatically checked by the `mason-linux-release` job of a Travis CI build.
-To save development time a local hook `.git/hooks/pre-push`
-```
-#!/bin/sh
-
-remote="$1"
-if [ x"$remote" = xorigin  ] ; then
-    if [ $(git rev-parse --abbrev-ref HEAD) = master ] ; then
-        echo "Rejected push to $remote/master" ; exit 1
-    fi
-
-    ./scripts/format.sh && ./scripts/error_on_dirty.sh
-    if [ $? -ne 0 ] ; then
-        echo "Unstaged format changes" ; exit 1
-    fi
-fi
-```
-could check code format, modify a local repository and reject push due to unstaged formatting changes.
-Also `pre-push` hook  rejects direct pushes to `origin/master`.
-
-⚠️ `scripts/format.sh` checks all local files that match `*.cpp` or `*.hpp` patterns.
-
-
-In general changes that affect the API and/or increase the memory consumption need to be discussed first.
-Often we don't include changes that would increase the memory consumption a lot if they are not generally usable (e.g. elevation data is a good example).
-
-## Pull Request
-
-Every pull-request that changes the API needs to update the docs in `docs/http.md` and add an entry to `CHANGELOG.md`.
-Breaking changes need to have a BREAKING prefix. See the [releasing documentation](docs/releasing.md) on how this affects the version.
-
-Early feedback is also important.
-You will see that a lot of the PR have tags like `[not ready]` or `[wip]`.
-We like to open PRs as soon as we are starting to work on something to make it visible to the rest of the team.
-If your work is going in entirely the wrong direction, there is a good chance someone will pick up on this before it is too late.
-Everyone is encouraged to read PRs of other people and give feedback.
-
-For every significant code change we require a pull request review before it is merged.
-If your pull request modifies the API this need to be signed of by a team discussion.
-This means you will need to find another member of the team with commit access and request a review of your pull request.
-
-Once your pull request is reviewed you can merge it! If you don't have commit access, ping someone that has commit access.
-If you do have commit access there are in general two accepted styles to merging:
-
-1. Make sure the branch is up to date with `master`. Run `git rebase master` to find out.
-2. Once that is ensured you can either:
-  - Click the nice green merge button (for a non-fast-forward merge)
-  - Merge by hand using a fast-forward merge
-
-Which merge you prefer is up to personal preference. In general it is recommended to use fast-forward merges because it creates a history that is sequential and easier to understand.
-
-# Maintainer
-
-## Doing a release
-
-There is an in-depth guide around how to push out a release once it is ready [here](docs/releasing.md).
-
-## The API
-
-Changes to the API need to be discussed and signed off by the team. Breaking changes even more so than additive changes.
-
-## Milestones
-
-If a pull request or an issue is applicable for the current or next milestone, depends on the target version number.
-Since we use semantic versioning we restrict breaking changes to major releases.
-After a Release Candidate is released we usually don't change the API anymore if it is not critical.
-Bigger code changes after a RC was released should also be avoided.
-
--- a/Doxyfile.in
+++ b/Doxyfile.in
@ -1,44 +0,0 @@
-PROJECT_NAME           = "Project OSRM"
-PROJECT_BRIEF          = "Open Source Routing Machine"
-BUILTIN_STL_SUPPORT    = YES
-
-EXTRACT_ALL            = YES
-EXTRACT_PRIVATE        = YES
-EXTRACT_PACKAGE        = YES
-EXTRACT_STATIC         = YES
-EXTRACT_LOCAL_CLASSES  = YES
-EXTRACT_ANON_NSPACES   = YES
-
-QUIET                  = YES
-
-INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@
-USE_MDFILE_AS_MAINPAGE = @CMAKE_CURRENT_SOURCE_DIR@/README.md
-FILE_PATTERNS          = *.h *.hpp *.c *.cc *.cpp *.md
-RECURSIVE              = YES
-
-EXCLUDE                = @CMAKE_CURRENT_SOURCE_DIR@/third_party \
-                         @CMAKE_CURRENT_SOURCE_DIR@/build \
-                         @CMAKE_CURRENT_SOURCE_DIR@/node_modules \
-                         @CMAKE_CURRENT_SOURCE_DIR@/unit_tests \
-			 @CMAKE_CURRENT_SOURCE_DIR@/benchmarks \
-                         @CMAKE_CURRENT_SOURCE_DIR@/features
-
-SOURCE_BROWSER         = YES
-
-CLANG_ASSISTED_PARSING = NO
-
-HTML_COLORSTYLE_HUE    = 217
-HTML_COLORSTYLE_SAT    = 71
-HTML_COLORSTYLE_GAMMA  = 50
-
-GENERATE_TREEVIEW      = YES
-
-HAVE_DOT               = @DOXYGEN_DOT_FOUND@
-CALL_GRAPH             = YES
-CALLER_GRAPH           = YES
-
-DOT_IMAGE_FORMAT       = svg
-INTERACTIVE_SVG        = YES
-DOT_GRAPH_MAX_NODES    = 500
-DOT_TRANSPARENT        = YES
-DOT_MULTI_TARGETS      = YES
--- a/7
+++ b/7
@ -0,0 +1,7 @@
+source "http://rubygems.org"
+
+gem "cucumber"
+gem "rake"
+gem "osmlib-base"
+gem "sys-proctable"
+gem "rspec-expectations"
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -0,0 +1,30 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    builder (3.2.2)
+    cucumber (1.3.8)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12.1)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.0.2)
+    diff-lcs (1.2.4)
+    gherkin (2.12.1)
+      multi_json (~> 1.3)
+    multi_json (1.8.0)
+    multi_test (0.0.2)
+    osmlib-base (0.1.4)
+    rake (10.1.0)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    sys-proctable (0.9.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber
+  osmlib-base
+  rake
+  rspec-expectations
+  sys-proctable
--- a/Include/osrm/Coordinate.h
+++ b/Include/osrm/Coordinate.h
@ -0,0 +1,113 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef FIXED_POINT_COORDINATE_H_
+#define FIXED_POINT_COORDINATE_H_
+
+#include <iosfwd> //for std::ostream
+#include <string>
+#include <type_traits>
+
+namespace
+{
+constexpr float COORDINATE_PRECISION = 1000000.f;
+}
+struct FixedPointCoordinate
+{
+    int lat;
+    int lon;
+
+    FixedPointCoordinate();
+    FixedPointCoordinate(int lat, int lon);
+
+    template<class T>
+    FixedPointCoordinate(const T &coordinate) : lat(coordinate.lat), lon(coordinate.lon)
+    {
+        static_assert(std::is_same<decltype(lat), decltype(coordinate.lat)>::value, "coordinate types incompatible");
+        static_assert(std::is_same<decltype(lon), decltype(coordinate.lon)>::value, "coordinate types incompatible");
+    }
+
+    void Reset();
+    bool isSet() const;
+    bool is_valid() const;
+    bool operator==(const FixedPointCoordinate &other) const;
+
+    static double
+    ApproximateDistance(const int lat1, const int lon1, const int lat2, const int lon2);
+
+    static double ApproximateDistance(const FixedPointCoordinate &first_coordinate,
+                                      const FixedPointCoordinate &second_coordinate);
+
+    static float ApproximateEuclideanDistance(const FixedPointCoordinate &first_coordinate,
+                                              const FixedPointCoordinate &second_coordinate);
+
+    static float
+    ApproximateEuclideanDistance(const int lat1, const int lon1, const int lat2, const int lon2);
+
+    static float ApproximateSquaredEuclideanDistance(const FixedPointCoordinate &first_coordinate,
+                                                     const FixedPointCoordinate &second_coordinate);
+
+    static void convertInternalLatLonToString(const int value, std::string &output);
+
+    static void convertInternalCoordinateToString(const FixedPointCoordinate &coordinate,
+                                                  std::string &output);
+
+    static void convertInternalReversedCoordinateToString(const FixedPointCoordinate &coordinate,
+                                                          std::string &output);
+
+    static float ComputePerpendicularDistance(const FixedPointCoordinate &segment_source,
+                                              const FixedPointCoordinate &segment_target,
+                                              const FixedPointCoordinate &query_location);
+
+    static float ComputePerpendicularDistance(const FixedPointCoordinate &segment_source,
+                                              const FixedPointCoordinate &segment_target,
+                                              const FixedPointCoordinate &query_location,
+                                              FixedPointCoordinate &nearest_location,
+                                              float &ratio);
+
+    static int
+    OrderedPerpendicularDistanceApproximation(const FixedPointCoordinate &segment_source,
+                                              const FixedPointCoordinate &segment_target,
+                                              const FixedPointCoordinate &query_location);
+
+    static float GetBearing(const FixedPointCoordinate &A, const FixedPointCoordinate &B);
+
+    float GetBearing(const FixedPointCoordinate &other) const;
+
+    void Output(std::ostream &out) const;
+
+    static float DegreeToRadian(const float degree);
+    static float RadianToDegree(const float radian);
+};
+
+inline std::ostream &operator<<(std::ostream &out_stream, FixedPointCoordinate const &coordinate)
+{
+    coordinate.Output(out_stream);
+    return out_stream;
+}
+
+#endif /* FIXED_POINT_COORDINATE_H_ */
--- a/include/engine/bearing.hpp
+++ b/include/engine/bearing.hpp
@ -1,6 +1,6 @@
 /*

-Copyright (c) 2017, Project OSRM contributors
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification,
@ -25,25 +25,29 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

-#ifndef OSRM_ENGINE_BEARING_HPP
-#define OSRM_ENGINE_BEARING_HPP
+#ifndef HTTP_HEADER_H
+#define HTTP_HEADER_H

-namespace osrm::engine
+#include <string>
+#include <algorithm>
+
+namespace http
 {
-
-struct Bearing
+struct Header
 {
-    short bearing;
-    short range;
+    Header& operator=(const Header& other) = default;
+    Header(const std::string & name, const std::string & value) : name(name), value(value) {}
+    Header(Header && other) : name(std::move(other.name)), value(std::move(other.value)) {}

-    bool IsValid() const { return bearing >= 0 && bearing <= 360 && range >= 0 && range <= 180; }
+    void Clear()
+    {
+        name.clear();
+        value.clear();
+    }
+
+    std::string name;
+    std::string value;
 };
-
-inline bool operator==(const Bearing lhs, const Bearing rhs)
-{
-    return lhs.bearing == rhs.bearing && lhs.range == rhs.range;
 }
-inline bool operator!=(const Bearing lhs, const Bearing rhs) { return !(lhs == rhs); }
-} // namespace osrm::engine

-#endif
+#endif // HTTP_HEADER_H
--- a/include/engine/api/trip_parameters.hpp
+++ b/include/engine/api/trip_parameters.hpp
@ -1,6 +1,6 @@
 /*

-Copyright (c) 2017, Project OSRM contributors
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification,
@ -25,53 +25,50 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

-#ifndef ENGINE_API_TRIP_PARAMETERS_HPP
-#define ENGINE_API_TRIP_PARAMETERS_HPP
+#ifndef REPLY_H
+#define REPLY_H

-#include "engine/api/route_parameters.hpp"
+#include "Header.h"
+
+#include <boost/asio.hpp>

-#include <optional>
 #include <vector>

-namespace osrm::engine::api
+namespace http
 {

-/**
- * Parameters specific to the OSRM Trip service.
- *
- * \see OSRM, Coordinate, Hint, Bearing, RouteParame, RouteParameters, TableParameters,
- *      NearestParameters, TripParameters, MatchParameters and TileParameters
- */
-struct TripParameters : public RouteParameters
+const char okHTML[] = "";
+const char badRequestHTML[] = "{\"status\": 400,\"status_message\":\"Bad Request\"}";
+const char internalServerErrorHTML[] =
+    "{\"status\": 500,\"status_message\":\"Internal Server Error\"}";
+const char seperators[] = {':', ' '};
+const char crlf[] = {'\r', '\n'};
+const std::string okString = "HTTP/1.0 200 OK\r\n";
+const std::string badRequestString = "HTTP/1.0 400 Bad Request\r\n";
+const std::string internalServerErrorString = "HTTP/1.0 500 Internal Server Error\r\n";
+
+class Reply
 {
-    TripParameters() = default;
-    enum class SourceType
-    {
-        Any,
-        First
-    };
-    enum class DestinationType
-    {
-        Any,
-        Last
-    };
+  public:
+    enum status_type
+    { ok = 200,
+      badRequest = 400,
+      internalServerError = 500 } status;

-    template <typename... Args>
-    TripParameters(SourceType source_,
-                   DestinationType destination_,
-                   bool roundtrip_,
-                   Args &&...args_)
-        : RouteParameters{std::forward<Args>(args_)...}, source{source_},
-          destination{destination_}, roundtrip{roundtrip_}
-    {
-    }
+    std::vector<Header> headers;
+    std::vector<boost::asio::const_buffer> ToBuffers();
+    std::vector<boost::asio::const_buffer> HeaderstoBuffers();
+    std::vector<char> content;
+    static Reply StockReply(status_type status);
+    void SetSize(const unsigned size);
+    void SetUncompressedSize();

-    SourceType source = SourceType::Any;
-    DestinationType destination = DestinationType::Any;
-    bool roundtrip = true;
+    Reply();

-    bool IsValid() const { return RouteParameters::IsValid(); }
+  private:
+    std::string ToString(Reply::status_type status);
+    boost::asio::const_buffer ToBuffer(Reply::status_type status);
 };
-} // namespace osrm::engine::api
+}

-#endif
+#endif // REPLY_H
--- a/Include/osrm/RouteParameters.h
+++ b/Include/osrm/RouteParameters.h
@ -0,0 +1,92 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef ROUTE_PARAMETERS_H
+#define ROUTE_PARAMETERS_H
+
+#include <osrm/Coordinate.h>
+
+#include <boost/fusion/container/vector/vector_fwd.hpp>
+
+#include <string>
+#include <vector>
+
+struct RouteParameters
+{
+    RouteParameters();
+
+    void setZoomLevel(const short level);
+    
+    void setNumberOfResults(const short number);
+
+    void setAlternateRouteFlag(const bool flag);
+
+    void setUTurn(const bool flag);
+
+    void setAllUTurns(const bool flag);
+
+    void setDeprecatedAPIFlag(const std::string &);
+
+    void setChecksum(const unsigned check_sum);
+
+    void setInstructionFlag(const bool flag);
+
+    void setService(const std::string &service);
+
+    void setOutputFormat(const std::string &format);
+
+    void setJSONpParameter(const std::string &parameter);
+
+    void addHint(const std::string &hint);
+
+    void setLanguage(const std::string &language);
+
+    void setGeometryFlag(const bool flag);
+
+    void setCompressionFlag(const bool flag);
+
+    void addCoordinate(const boost::fusion::vector<double, double> &coordinates);
+
+    short zoom_level;
+    bool print_instructions;
+    bool alternate_route;
+    bool geometry;
+    bool compression;
+    bool deprecatedAPI;
+    bool uturn_default;
+    unsigned check_sum;
+    short num_results;
+    std::string service;
+    std::string output_format;
+    std::string jsonp_parameter;
+    std::string language;
+    std::vector<std::string> hints;
+    std::vector<bool> uturns;
+    std::vector<FixedPointCoordinate> coordinates;
+};
+
+#endif // ROUTE_PARAMETERS_H
--- a/Include/osrm/ServerPaths.h
+++ b/Include/osrm/ServerPaths.h
@ -1,6 +1,6 @@
 /*

-Copyright (c) 2017, Project OSRM contributors
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification,
@ -25,21 +25,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

-#ifndef ENGINE_STATUS_HPP
-#define ENGINE_STATUS_HPP
+#ifndef SERVER_PATH_H
+#define SERVER_PATH_H

-namespace osrm::engine
-{
+#include <boost/filesystem.hpp>

-/**
- * Status for indicating query success or failure.
- * \see OSRM
- */
-enum class Status
-{
-    Ok,
-    Error
-};
-} // namespace osrm::engine
+#include <unordered_map>
+#include <string>

-#endif
+typedef std::unordered_map<std::string, boost::filesystem::path> ServerPaths;
+
+#endif // SERVER_PATH_H
--- a/LICENCE.TXT
+++ b/LICENCE.TXT
@ -1,4 +1,4 @@
-Copyright (c) 2017, Project OSRM contributors
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification,
--- a/Library/OSRM.h
+++ b/Library/OSRM.h
@ -0,0 +1,54 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef OSRM_H
+#define OSRM_H
+
+#include <osrm/ServerPaths.h>
+
+#include <memory>
+
+class OSRM_impl;
+struct RouteParameters;
+
+namespace http
+{
+class Reply;
+}
+
+class OSRM
+{
+  private:
+    std::unique_ptr<OSRM_impl> OSRM_pimpl_;
+
+  public:
+    explicit OSRM(ServerPaths paths, const bool use_shared_memory = false);
+    ~OSRM();
+    void RunQuery(RouteParameters &route_parameters, http::Reply &reply);
+};
+
+#endif // OSRM_H
--- a/Library/OSRM_impl.cpp
+++ b/Library/OSRM_impl.cpp
@ -0,0 +1,165 @@
+/*
+
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+namespace boost { namespace interprocess { class named_mutex; } }
+
+#include "OSRM_impl.h"
+#include "OSRM.h"
+
+#include <osrm/Reply.h>
+#include <osrm/RouteParameters.h>
+#include <osrm/ServerPaths.h>
+
+#include "../plugins/distance_table.hpp"
+#include "../plugins/hello_world.hpp"
+#include "../plugins/locate.hpp"
+#include "../plugins/nearest.hpp"
+#include "../plugins/timestamp.hpp"
+#include "../plugins/viaroute.hpp"
+#include "../Server/DataStructures/BaseDataFacade.h"
+#include "../Server/DataStructures/InternalDataFacade.h"
+#include "../Server/DataStructures/SharedBarriers.h"
+#include "../Server/DataStructures/SharedDataFacade.h"
+#include "../Util/make_unique.hpp"
+#include "../Util/ProgramOptions.h"
+#include "../Util/simple_logger.hpp"
+
+#include <boost/assert.hpp>
+#include <boost/interprocess/sync/named_condition.hpp>
+#include <boost/interprocess/sync/scoped_lock.hpp>
+
+#include <algorithm>
+#include <fstream>
+#include <utility>
+#include <vector>
+
+OSRM_impl::OSRM_impl(ServerPaths server_paths, const bool use_shared_memory)
+{
+    if (use_shared_memory)
+    {
+        barrier = osrm::make_unique<SharedBarriers>();
+        query_data_facade = new SharedDataFacade<QueryEdge::EdgeData>();
+    }
+    else
+    {
+        // populate base path
+        populate_base_path(server_paths);
+        query_data_facade = new InternalDataFacade<QueryEdge::EdgeData>(server_paths);
+    }
+
+    // The following plugins handle all requests.
+    RegisterPlugin(new DistanceTablePlugin<BaseDataFacade<QueryEdge::EdgeData>>(query_data_facade));
+    RegisterPlugin(new HelloWorldPlugin());
+    RegisterPlugin(new LocatePlugin<BaseDataFacade<QueryEdge::EdgeData>>(query_data_facade));
+    RegisterPlugin(new NearestPlugin<BaseDataFacade<QueryEdge::EdgeData>>(query_data_facade));
+    RegisterPlugin(new TimestampPlugin<BaseDataFacade<QueryEdge::EdgeData>>(query_data_facade));
+    RegisterPlugin(new ViaRoutePlugin<BaseDataFacade<QueryEdge::EdgeData>>(query_data_facade));
+}
+
+OSRM_impl::~OSRM_impl()
+{
+    delete query_data_facade;
+    for (PluginMap::value_type &plugin_pointer : plugin_map)
+    {
+        delete plugin_pointer.second;
+    }
+}
+
+void OSRM_impl::RegisterPlugin(BasePlugin *plugin)
+{
+    SimpleLogger().Write() << "loaded plugin: " << plugin->GetDescriptor();
+    if (plugin_map.find(plugin->GetDescriptor()) != plugin_map.end())
+    {
+        delete plugin_map.find(plugin->GetDescriptor())->second;
+    }
+    plugin_map.emplace(plugin->GetDescriptor(), plugin);
+}
+
+void OSRM_impl::RunQuery(RouteParameters &route_parameters, http::Reply &reply)
+{
+    const PluginMap::const_iterator &iter = plugin_map.find(route_parameters.service);
+
+    if (plugin_map.end() != iter)
+    {
+        reply.status = http::Reply::ok;
+        if (barrier)
+        {
+            // lock update pending
+            boost::interprocess::scoped_lock<boost::interprocess::named_mutex> pending_lock(
+                barrier->pending_update_mutex);
+
+            // lock query
+            boost::interprocess::scoped_lock<boost::interprocess::named_mutex> query_lock(
+                barrier->query_mutex);
+
+            // unlock update pending
+            pending_lock.unlock();
+
+            // increment query count
+            ++(barrier->number_of_queries);
+
+            (static_cast<SharedDataFacade<QueryEdge::EdgeData> *>(query_data_facade))
+                ->CheckAndReloadFacade();
+        }
+
+        iter->second->HandleRequest(route_parameters, reply);
+        if (barrier)
+        {
+            // lock query
+            boost::interprocess::scoped_lock<boost::interprocess::named_mutex> query_lock(
+                barrier->query_mutex);
+
+            // decrement query count
+            --(barrier->number_of_queries);
+            BOOST_ASSERT_MSG(0 <= barrier->number_of_queries, "invalid number of queries");
+
+            // notify all processes that were waiting for this condition
+            if (0 == barrier->number_of_queries)
+            {
+                barrier->no_running_queries_condition.notify_all();
+            }
+        }
+    }
+    else
+    {
+        reply = http::Reply::StockReply(http::Reply::badRequest);
+    }
+}
+
+// proxy code for compilation firewall
+
+OSRM::OSRM(ServerPaths paths, const bool use_shared_memory)
+    : OSRM_pimpl_(osrm::make_unique<OSRM_impl>(paths, use_shared_memory))
+{
+}
+
+OSRM::~OSRM() { OSRM_pimpl_.reset(); }
+
+void OSRM::RunQuery(RouteParameters &route_parameters, http::Reply &reply)
+{
+    OSRM_pimpl_->RunQuery(route_parameters, reply);
+}
--- a/Library/OSRM_impl.h
+++ b/Library/OSRM_impl.h
@ -0,0 +1,66 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef OSRM_IMPL_H
+#define OSRM_IMPL_H
+
+class BasePlugin;
+namespace http { class Reply; }
+struct RouteParameters;
+
+#include <osrm/ServerPaths.h>
+
+#include "../data_structures/query_edge.hpp"
+
+#include <memory>
+#include <unordered_map>
+#include <string>
+
+struct SharedBarriers;
+template <class EdgeDataT> class BaseDataFacade;
+
+class OSRM_impl
+{
+  private:
+    using PluginMap = std::unordered_map<std::string, BasePlugin *>;
+
+  public:
+    OSRM_impl(ServerPaths paths, const bool use_shared_memory);
+    OSRM_impl(const OSRM_impl &) = delete;
+    virtual ~OSRM_impl();
+    void RunQuery(RouteParameters &route_parameters, http::Reply &reply);
+
+  private:
+    void RegisterPlugin(BasePlugin *plugin);
+    PluginMap plugin_map;
+    // will only be initialized if shared memory is used
+    std::unique_ptr<SharedBarriers> barrier;
+    // base class pointer to the objects
+    BaseDataFacade<QueryEdge::EdgeData> *query_data_facade;
+};
+
+#endif // OSRM_IMPL_H
--- a/README.md
+++ b/README.md
@ -1,171 +1,12 @@
-## Open Source Routing Machine
+# Readme

+For instructions on how to compile and run OSRM, please consult the Wiki at

-[![osrm-backend CI](https://github.com/Project-OSRM/osrm-backend/actions/workflows/osrm-backend.yml/badge.svg)](https://github.com/Project-OSRM/osrm-backend/actions/workflows/osrm-backend.yml) [![Codecov](https://codecov.io/gh/Project-OSRM/osrm-backend/branch/master/graph/badge.svg)](https://codecov.io/gh/Project-OSRM/osrm-backend) [![Discord](https://img.shields.io/discord/1034487840219860992)](https://discord.gg/es9CdcCXcb)
+https://github.com/Project-OSRM/osrm-backend/wiki

-High performance routing engine written in C++ designed to run on OpenStreetMap data.
-
-The following services are available via HTTP API, C++ library interface and NodeJs wrapper:
- Nearest - Snaps coordinates to the street network and returns the nearest matches
- Route - Finds the fastest route between coordinates
- Table - Computes the duration or distances of the fastest route between all pairs of supplied coordinates
- Match - Snaps noisy GPS traces to the road network in the most plausible way
- Trip - Solves the Traveling Salesman Problem using a greedy heuristic
- Tile - Generates Mapbox Vector Tiles with internal routing metadata
-
-To quickly try OSRM use our [demo server](http://map.project-osrm.org) which comes with both the backend and a frontend on top.
-
-For a quick introduction about how the road network is represented in OpenStreetMap and how to map specific road network features have a look at [the OSM wiki on routing](https://wiki.openstreetmap.org/wiki/Routing) or [this guide about mapping for navigation](https://web.archive.org/web/20221206013651/https://labs.mapbox.com/mapping/mapping-for-navigation/).
-
-Related [Project-OSRM](https://github.com/Project-OSRM) repositories:
- [osrm-frontend](https://github.com/Project-OSRM/osrm-frontend) - User-facing frontend with map. The demo server runs this on top of the backend
- [osrm-text-instructions](https://github.com/Project-OSRM/osrm-text-instructions) - Text instructions from OSRM route response
- [osrm-backend-docker](https://github.com/project-osrm/osrm-backend/pkgs/container/osrm-backend) - Ready to use Docker images
-
-## Documentation
-
-### Full documentation
-
- [Hosted documentation](http://project-osrm.org)
- [osrm-routed HTTP API documentation](docs/http.md)
- [libosrm API documentation](docs/libosrm.md)
-
-## Contact
-
- Discord: [join](https://discord.gg/es9CdcCXcb)
- IRC: `irc.oftc.net`, channel: `#osrm` ([Webchat](https://webchat.oftc.net))
- Mailinglist: `https://lists.openstreetmap.org/listinfo/osrm-talk`
-
-## Quick Start
-
-The easiest and quickest way to setup your own routing engine is to use Docker images we provide.
-
-There are two pre-processing pipelines available:
- Contraction Hierarchies (CH)
- Multi-Level Dijkstra (MLD)
-
-we recommend using MLD by default except for special use-cases such as very large distance matrices where CH is still a better fit for the time being.
-In the following we explain the MLD pipeline.
-If you want to use the CH pipeline instead replace `osrm-partition` and `osrm-customize` with a single `osrm-contract` and change the algorithm option for `osrm-routed` to `--algorithm ch`.
-
-### Using Docker
-
-We base our Docker images ([backend](https://github.com/Project-OSRM/osrm-backend/pkgs/container/osrm-backend), [frontend](https://hub.docker.com/r/osrm/osrm-frontend/)) on Debian and make sure they are as lightweight as possible. Older backend versions can be found on [Docker Hub](https://hub.docker.com/r/osrm/osrm-backend/).
-
-Download OpenStreetMap extracts for example from [Geofabrik](http://download.geofabrik.de/)
-
-    wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf
-
-Pre-process the extract with the car profile and start a routing engine HTTP server on port 5000
-
-    docker run -t -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-extract -p /opt/car.lua /data/berlin-latest.osm.pbf || echo "osrm-extract failed"
-
-The flag `-v "${PWD}:/data"` creates the directory `/data` inside the docker container and makes the current working directory `"${PWD}"` available there. The file `/data/berlin-latest.osm.pbf` inside the container is referring to `"${PWD}/berlin-latest.osm.pbf"` on the host.
-
-    docker run -t -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-partition /data/berlin-latest.osrm || echo "osrm-partition failed"
-    docker run -t -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-customize /data/berlin-latest.osrm || echo "osrm-customize failed"
-
-Note there is no `berlin-latest.osrm` file, but multiple `berlin-latest.osrm.*` files, i.e. `berlin-latest.osrm` is not file path, but "base" path referring to set of files and there is an option to omit this `.osrm` suffix completely(e.g. `osrm-partition /data/berlin-latest`).
-
-    docker run -t -i -p 5000:5000 -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-routed --algorithm mld /data/berlin-latest.osrm
-
-Make requests against the HTTP server
-
-    curl "http://127.0.0.1:5000/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true"
-
-Optionally start a user-friendly frontend on port 9966, and open it up in your browser
-
-    docker run -p 9966:9966 osrm/osrm-frontend
-    xdg-open 'http://127.0.0.1:9966'
-
-In case Docker complains about not being able to connect to the Docker daemon make sure you are in the `docker` group.
-
-    sudo usermod -aG docker $USER
-
-After adding yourself to the `docker` group make sure to log out and back in again with your terminal.
-
-We support the following images in the Container Registry:
-
-Name | Description
-----|------
-`latest` | `master` compiled with release flag
-`latest-assertions` | `master` compiled with with release flag, assertions enabled and debug symbols
-`latest-debug` | `master` compiled with debug flag
-`<tag>` | specific tag compiled with release flag
-`<tag>-debug` | specific tag compiled with debug flag
-
-### Building from Source
-
-The following targets Ubuntu 22.04.
-For instructions how to build on different distributions, macOS or Windows see our [Wiki](https://github.com/Project-OSRM/osrm-backend/wiki).
-
-Install dependencies
-
-```bash
-sudo apt install build-essential git cmake pkg-config \
-libbz2-dev libxml2-dev libzip-dev libboost-all-dev \
-lua5.2 liblua5.2-dev libtbb-dev
-```
-
-Compile and install OSRM binaries
-
-```bash
-mkdir -p build
-cd build
-cmake ..
-cmake --build .
-sudo cmake --build . --target install
-```
-
-### Request Against the Demo Server
-
-Read the [API usage policy](https://github.com/Project-OSRM/osrm-backend/wiki/Demo-server).
-
-Simple query with instructions and alternatives on Berlin:
-
-```
-curl "https://router.project-osrm.org/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true&alternatives=true"
-```
-
-### Using the Node.js Bindings
-
-The Node.js bindings provide read-only access to the routing engine.
-We provide API documentation and examples [here](docs/nodejs/api.md).
-
-You will need a modern `libstdc++` toolchain (`>= GLIBCXX_3.4.26`) for binary compatibility if you want to use the pre-built binaries.
-For older Ubuntu systems you can upgrade your standard library for example with:
-
-```
-sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-sudo apt-get update -y
-sudo apt-get install -y libstdc++-9-dev
-```
-
-You can install the Node.js bindings via `npm install @project-osrm/osrm` or from this repository either via
-
-    npm install
-
-which will check and use pre-built binaries if they're available for this release and your Node version, or via
-
-    npm install --build-from-source
-
-to always force building the Node.js bindings from source.
-
-#### Unscoped packages
-
-Prior to v5.27.0, the `osrm` Node package was unscoped. If you are upgrading from an old package, you will need to do the following:
-
-```
-npm uninstall osrm --save
-npm install @project-osrm/osrm --save
-```
-
-#### Package docs
-
-For usage details have a look [these API docs](docs/nodejs/api.md).
-
-An exemplary implementation by a 3rd party with Docker and Node.js can be found [here](https://github.com/door2door-io/osrm-express-server-demo).
+or use our free and daily updated online service at

+http://map.project-osrm.org

 ## References in publications

@ -189,3 +30,12 @@ When using the code in a (scientific) publication, please cite
 address = {New York, NY, USA},
 }
 ```
+
+## Current build status
+
+| build config |  branch | status |
+|:-------------|:--------|:------------|
+| Linux        | master  | [![Build Status](https://travis-ci.org/Project-OSRM/osrm-backend.png?branch=master)](https://travis-ci.org/DennisOSRM/Project-OSRM) |
+| Linux        | develop | [![Build Status](https://travis-ci.org/Project-OSRM/osrm-backend.png?branch=develop)](https://travis-ci.org/DennisOSRM/Project-OSRM) |
+| Windows      | master/develop | [![Build status](https://ci.appveyor.com/api/projects/status/4iuo3s9gxprmcjjh)](https://ci.appveyor.com/project/DennisOSRM/osrm-backend) |
+| LUAbind fork | master  | [![Build Status](https://travis-ci.org/DennisOSRM/luabind.png?branch=master)](https://travis-ci.org/DennisOSRM/luabind) |
--- a/190
+++ b/190
@ -0,0 +1,190 @@
+require 'OSM/StreamParser'
+require 'socket'
+require 'digest/sha1'
+require 'cucumber/rake/task'
+require 'sys/proctable'
+
+BUILD_FOLDER = 'build'
+DATA_FOLDER = 'sandbox'
+PROFILE = 'bicycle'
+OSRM_PORT = 5000
+PROFILES_FOLDER = '../profiles'
+
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = %w{--format pretty}
+end
+
+areas = {
+  :kbh => { :country => 'denmark', :bbox => 'top=55.6972 left=12.5222 right=12.624 bottom=55.6376' },
+  :frd => { :country => 'denmark', :bbox => 'top=55.7007 left=12.4765 bottom=55.6576 right=12.5698' },
+  :regh => { :country => 'denmark', :bbox => 'top=56.164 left=11.792 bottom=55.403 right=12.731' },
+  :denmark => { :country => 'denmark', :bbox => nil },
+  :skaane => { :country => 'sweden', :bbox => 'top=56.55 left=12.4 bottom=55.3 right=14.6' }
+}
+
+
+
+osm_data_area_name = ARGV[1] ? ARGV[1].to_s.to_sym : :kbh
+raise "Unknown data area." unless areas[osm_data_area_name]
+osm_data_country = areas[osm_data_area_name][:country]
+osm_data_area_bbox = areas[osm_data_area_name][:bbox]
+
+
+task osm_data_area_name.to_sym {}   #define empty task to prevent rake from whining. will break if area has same name as a task
+
+
+def each_process name, &block
+  Sys::ProcTable.ps do |process|
+    if process.comm.strip == name.strip && process.state != 'zombie'
+      yield process.pid.to_i, process.state.strip
+    end
+  end
+end
+
+def up?
+  find_pid('osrm-routed') != nil
+end
+
+def find_pid name
+  each_process(name) { |pid,state| return pid.to_i }
+  return nil
+end
+
+def wait_for_shutdown name
+  timeout = 10
+  (timeout*10).times do
+    return if find_pid(name) == nil
+    sleep 0.1
+  end
+  raise "*** Could not terminate #{name}."
+end
+
+
+desc "Rebuild and run tests."
+task :default => [:build]
+
+desc "Build using CMake."
+task :build do
+  if Dir.exists? BUILD_FOLDER
+    Dir.chdir BUILD_FOLDER do
+      system "make"
+    end
+  else
+    system "mkdir build; cd build; cmake ..; make"
+  end
+end
+
+desc "Setup config files."
+task :setup do
+end
+
+desc "Download OSM data."
+task :download do
+  Dir.mkdir "#{DATA_FOLDER}" unless File.exist? "#{DATA_FOLDER}"
+  puts "Downloading..."
+  puts "curl http://download.geofabrik.de/europe/#{osm_data_country}-latest.osm.pbf -o #{DATA_FOLDER}/#{osm_data_country}.osm.pbf"
+  raise "Error while downloading data." unless system "curl http://download.geofabrik.de/europe/#{osm_data_country}-latest.osm.pbf -o #{DATA_FOLDER}/#{osm_data_country}.osm.pbf"
+  if osm_data_area_bbox
+    puts "Cropping and converting to protobuffer..."
+    raise "Error while cropping data." unless system "osmosis --read-pbf file=#{DATA_FOLDER}/#{osm_data_country}.osm.pbf --bounding-box #{osm_data_area_bbox} --write-pbf file=#{DATA_FOLDER}/#{osm_data_area_name}.osm.pbf omitmetadata=true"
+  end
+end
+
+desc "Crop OSM data"
+task :crop do
+  if osm_data_area_bbox
+    raise "Error while cropping data." unless system "osmosis --read-pbf file=#{DATA_FOLDER}/#{osm_data_country}.osm.pbf --bounding-box #{osm_data_area_bbox} --write-pbf file=#{DATA_FOLDER}/#{osm_data_area_name}.osm.pbf omitmetadata=true"
+  end
+end
+
+desc "Reprocess OSM data."
+task :process => [:extract,:prepare] do
+end
+
+desc "Extract OSM data."
+task :extract do
+  Dir.chdir DATA_FOLDER do
+    raise "Error while extracting data." unless system "../#{BUILD_FOLDER}/osrm-extract #{osm_data_area_name}.osm.pbf --profile ../profiles/#{PROFILE}.lua"
+  end
+end
+
+desc "Prepare OSM data."
+task :prepare do
+  Dir.chdir DATA_FOLDER do
+    raise "Error while preparing data." unless system "../#{BUILD_FOLDER}/osrm-prepare #{osm_data_area_name}.osrm --profile ../profiles/#{PROFILE}.lua"
+  end
+end
+
+desc "Delete preprocessing files."
+task :clean do
+  File.delete *Dir.glob("#{DATA_FOLDER}/*.osrm")
+  File.delete *Dir.glob("#{DATA_FOLDER}/*.osrm.*")
+end
+
+desc "Run all cucumber test"
+task :test do
+  system "cucumber"
+  puts
+end
+
+desc "Run the routing server in the terminal. Press Ctrl-C to stop."
+task :run do
+  Dir.chdir DATA_FOLDER do
+    system "../#{BUILD_FOLDER}/osrm-routed #{osm_data_area_name}.osrm --port #{OSRM_PORT}"
+  end
+end
+
+desc "Launch the routing server in the background. Use rake:down to stop it."
+task :up do
+  Dir.chdir DATA_FOLDER do
+    abort("Already up.") if up?
+    pipe = IO.popen("../#{BUILD_FOLDER}/osrm-routed #{osm_data_area_name}.osrm --port #{OSRM_PORT} 1>>osrm-routed.log 2>>osrm-routed.log")
+    timeout = 5
+    (timeout*10).times do
+      begin
+        socket = TCPSocket.new('localhost', OSRM_PORT)
+        socket.puts 'ping'
+      rescue Errno::ECONNREFUSED
+        sleep 0.1
+      end
+    end
+  end
+end
+
+desc "Stop the routing server."
+task :down do
+  pid = find_pid 'osrm-routed'
+  if pid
+    Process.kill 'TERM', pid
+  else
+    puts "Already down."
+  end 
+end
+
+desc "Kill all osrm-extract, osrm-prepare and osrm-routed processes."
+task :kill do
+  each_process('osrm-routed') { |pid,state| Process.kill 'KILL', pid }
+  each_process('osrm-prepare') { |pid,state| Process.kill 'KILL', pid }
+  each_process('osrm-extract') { |pid,state| Process.kill 'KILL', pid }
+  wait_for_shutdown 'osrm-routed'
+  wait_for_shutdown 'osrm-prepare'
+  wait_for_shutdown 'osrm-extract'  
+end
+
+desc "Get PIDs of all osrm-extract, osrm-prepare and osrm-routed processes."
+task :pid do
+  each_process 'osrm-routed' do |pid,state|
+    puts "#{pid}\t#{state}"
+  end
+end
+
+desc "Stop, reprocess and restart."
+task :update => [:down,:process,:up] do
+end
+
+
+desc "Remove test cache files."
+task :sweep do
+  system "rm test/cache/*"
+end
+
--- a/Server/APIGrammar.h
+++ b/Server/APIGrammar.h
@ -0,0 +1,74 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef APIGRAMMAR_H_
+#define APIGRAMMAR_H_
+
+#include <boost/bind.hpp>
+#include <boost/spirit/include/qi.hpp>
+#include <boost/spirit/include/qi_action.hpp>
+
+namespace qi = boost::spirit::qi;
+
+template <typename Iterator, class HandlerT>
+struct APIGrammar : qi::grammar<Iterator>
+{
+    explicit APIGrammar(HandlerT * h) : APIGrammar::base_type(api_call), handler(h)
+    {
+        api_call = qi::lit('/') >> string[boost::bind(&HandlerT::setService, handler, ::_1)] >> *(query) >> -(uturns);
+        query    = ('?') >> (+(zoom | output | jsonp | checksum | location | hint | u | cmp | language | instruction | geometry | alt_route | old_API | num_results) ) ;
+
+        zoom        = (-qi::lit('&')) >> qi::lit('z')            >> '=' >> qi::short_[boost::bind(&HandlerT::setZoomLevel, handler, ::_1)];
+        output      = (-qi::lit('&')) >> qi::lit("output")       >> '=' >> string[boost::bind(&HandlerT::setOutputFormat, handler, ::_1)];
+        jsonp       = (-qi::lit('&')) >> qi::lit("jsonp")        >> '=' >> stringwithPercent[boost::bind(&HandlerT::setJSONpParameter, handler, ::_1)];
+        checksum    = (-qi::lit('&')) >> qi::lit("checksum")     >> '=' >> qi::uint_[boost::bind(&HandlerT::setChecksum, handler, ::_1)];
+        instruction = (-qi::lit('&')) >> qi::lit("instructions") >> '=' >> qi::bool_[boost::bind(&HandlerT::setInstructionFlag, handler, ::_1)];
+        geometry    = (-qi::lit('&')) >> qi::lit("geometry")     >> '=' >> qi::bool_[boost::bind(&HandlerT::setGeometryFlag, handler, ::_1)];
+        cmp         = (-qi::lit('&')) >> qi::lit("compression")  >> '=' >> qi::bool_[boost::bind(&HandlerT::setCompressionFlag, handler, ::_1)];
+        location    = (-qi::lit('&')) >> qi::lit("loc")          >> '=' >> (qi::double_ >> qi::lit(',') >> qi::double_)[boost::bind(&HandlerT::addCoordinate, handler, ::_1)];
+        hint        = (-qi::lit('&')) >> qi::lit("hint")         >> '=' >> stringwithDot[boost::bind(&HandlerT::addHint, handler, ::_1)];
+        u           = (-qi::lit('&')) >> qi::lit("u")            >> '=' >> qi::bool_[boost::bind(&HandlerT::setUTurn, handler, ::_1)];
+        uturns      = (-qi::lit('&')) >> qi::lit("uturns")       >> '=' >> qi::bool_[boost::bind(&HandlerT::setAllUTurns, handler, ::_1)];
+        language    = (-qi::lit('&')) >> qi::lit("hl")           >> '=' >> string[boost::bind(&HandlerT::setLanguage, handler, ::_1)];
+        alt_route   = (-qi::lit('&')) >> qi::lit("alt")          >> '=' >> qi::bool_[boost::bind(&HandlerT::setAlternateRouteFlag, handler, ::_1)];
+        old_API     = (-qi::lit('&')) >> qi::lit("geomformat")   >> '=' >> string[boost::bind(&HandlerT::setDeprecatedAPIFlag, handler, ::_1)];
+        num_results = (-qi::lit('&')) >> qi::lit("num_results")  >> '=' >> qi::short_[boost::bind(&HandlerT::setNumberOfResults, handler, ::_1)];
+
+        string            = +(qi::char_("a-zA-Z"));
+        stringwithDot     = +(qi::char_("a-zA-Z0-9_.-"));
+        stringwithPercent = +(qi::char_("a-zA-Z0-9_.-") | qi::char_('[') | qi::char_(']') | (qi::char_('%') >> qi::char_("0-9A-Z") >> qi::char_("0-9A-Z") ));
+    }
+
+    qi::rule<Iterator> api_call, query;
+    qi::rule<Iterator, std::string()> service, zoom, output, string, jsonp, checksum, location, hint,
+                                      stringwithDot, stringwithPercent, language, instruction, geometry,
+                                      cmp, alt_route, u, uturns, old_API, num_results;
+
+    HandlerT * handler;
+};
+
+#endif /* APIGRAMMAR_H_ */
--- a/Server/Connection.cpp
+++ b/Server/Connection.cpp
@ -0,0 +1,174 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "Connection.h"
+#include "RequestHandler.h"
+#include "RequestParser.h"
+
+#include <boost/assert.hpp>
+#include <boost/bind.hpp>
+#include <boost/iostreams/filtering_stream.hpp>
+#include <boost/iostreams/filter/gzip.hpp>
+
+#include <string>
+#include <vector>
+
+namespace http
+{
+
+Connection::Connection(boost::asio::io_service &io_service, RequestHandler &handler)
+    : strand(io_service), TCP_socket(io_service), request_handler(handler)
+{
+}
+
+boost::asio::ip::tcp::socket &Connection::socket() { return TCP_socket; }
+
+/// Start the first asynchronous operation for the connection.
+void Connection::start()
+{
+    TCP_socket.async_read_some(
+        boost::asio::buffer(incoming_data_buffer),
+        strand.wrap(boost::bind(&Connection::handle_read,
+                                this->shared_from_this(),
+                                boost::asio::placeholders::error,
+                                boost::asio::placeholders::bytes_transferred)));
+}
+
+void Connection::handle_read(const boost::system::error_code &error, std::size_t bytes_transferred)
+{
+    if (error)
+    {
+        return;
+    }
+
+    // no error detected, let's parse the request
+    CompressionType compression_type(noCompression);
+    boost::tribool result;
+    boost::tie(result, boost::tuples::ignore) =
+        RequestParser().Parse(request,
+                              incoming_data_buffer.data(),
+                              incoming_data_buffer.data() + bytes_transferred,
+                              compression_type);
+
+    // the request has been parsed
+    if (result)
+    {
+        request.endpoint = TCP_socket.remote_endpoint().address();
+        request_handler.handle_request(request, reply);
+
+        // Header compression_header;
+        std::vector<char> compressed_output;
+        std::vector<boost::asio::const_buffer> output_buffer;
+
+        // compress the result w/ gzip/deflate if requested
+        switch (compression_type)
+        {
+        case deflateRFC1951:
+            // use deflate for compression
+            reply.headers.insert(reply.headers.begin(), {"Content-Encoding", "deflate"});
+            CompressBufferCollection(reply.content, compression_type, compressed_output);
+            reply.SetSize(static_cast<unsigned>(compressed_output.size()));
+            output_buffer = reply.HeaderstoBuffers();
+            output_buffer.push_back(boost::asio::buffer(compressed_output));
+            break;
+        case gzipRFC1952:
+            // use gzip for compression
+            reply.headers.insert(reply.headers.begin(), {"Content-Encoding", "gzip"});
+            CompressBufferCollection(reply.content, compression_type, compressed_output);
+            reply.SetSize(static_cast<unsigned>(compressed_output.size()));
+            output_buffer = reply.HeaderstoBuffers();
+            output_buffer.push_back(boost::asio::buffer(compressed_output));
+            break;
+        case noCompression:
+            // don't use any compression
+            reply.SetUncompressedSize();
+            output_buffer = reply.ToBuffers();
+            break;
+        }
+        // write result to stream
+        boost::asio::async_write(TCP_socket,
+                                 output_buffer,
+                                 strand.wrap(boost::bind(&Connection::handle_write,
+                                                         this->shared_from_this(),
+                                                         boost::asio::placeholders::error)));
+    }
+    else if (!result)
+    { // request is not parseable
+        reply = Reply::StockReply(Reply::badRequest);
+
+        boost::asio::async_write(TCP_socket,
+                                 reply.ToBuffers(),
+                                 strand.wrap(boost::bind(&Connection::handle_write,
+                                                         this->shared_from_this(),
+                                                         boost::asio::placeholders::error)));
+    }
+    else
+    {
+        // we don't have a result yet, so continue reading
+        TCP_socket.async_read_some(
+            boost::asio::buffer(incoming_data_buffer),
+            strand.wrap(boost::bind(&Connection::handle_read,
+                                    this->shared_from_this(),
+                                    boost::asio::placeholders::error,
+                                    boost::asio::placeholders::bytes_transferred)));
+    }
+}
+
+/// Handle completion of a write operation.
+void Connection::handle_write(const boost::system::error_code &error)
+{
+    if (!error)
+    {
+        // Initiate graceful connection closure.
+        boost::system::error_code ignore_error;
+        TCP_socket.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ignore_error);
+    }
+}
+
+void Connection::CompressBufferCollection(std::vector<char> uncompressed_data,
+                                          CompressionType compression_type,
+                                          std::vector<char> &compressed_data)
+{
+    boost::iostreams::gzip_params compression_parameters;
+
+    // there's a trade-off between speed and size. speed wins
+    compression_parameters.level = boost::iostreams::zlib::best_speed;
+    // check which compression flavor is used
+    if (deflateRFC1951 == compression_type)
+    {
+        compression_parameters.noheader = true;
+    }
+
+    BOOST_ASSERT(compressed_data.empty());
+    // plug data into boost's compression stream
+    boost::iostreams::filtering_ostream gzip_stream;
+    gzip_stream.push(boost::iostreams::gzip_compressor(compression_parameters));
+    gzip_stream.push(boost::iostreams::back_inserter(compressed_data));
+    gzip_stream.write(&uncompressed_data[0], uncompressed_data.size());
+    boost::iostreams::close(gzip_stream);
+}
+}
--- a/Server/Connection.h
+++ b/Server/Connection.h
@ -0,0 +1,104 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef CONNECTION_H
+#define CONNECTION_H
+
+// #include "RequestParser.h"
+#include "Http/CompressionType.h"
+#include "Http/Request.h"
+
+#include <osrm/Reply.h>
+
+#include <boost/array.hpp>
+#include <boost/asio.hpp>
+#include <boost/config.hpp>
+#include <boost/version.hpp>
+
+ #include <memory>
+ #include <vector>
+
+//workaround for incomplete std::shared_ptr compatibility in old boost versions
+#if BOOST_VERSION < 105300 || defined BOOST_NO_CXX11_SMART_PTR
+
+namespace boost {
+template<class T>
+const T* get_pointer(std::shared_ptr<T> const& p)
+{
+    return p.get();
+}
+
+template<class T>
+T* get_pointer(std::shared_ptr<T>& p)
+{
+    return p.get();
+}
+} // namespace boost
+
+#endif
+
+
+
+class RequestHandler;
+
+namespace http
+{
+
+/// Represents a single connection from a client.
+class Connection : public std::enable_shared_from_this<Connection>
+{
+  public:
+    explicit Connection(boost::asio::io_service &io_service, RequestHandler &handler);
+    Connection(const Connection &) = delete;
+    Connection() = delete;
+
+    boost::asio::ip::tcp::socket &socket();
+
+    /// Start the first asynchronous operation for the connection.
+    void start();
+
+  private:
+    void handle_read(const boost::system::error_code &e, std::size_t bytes_transferred);
+
+    /// Handle completion of a write operation.
+    void handle_write(const boost::system::error_code &e);
+
+    void CompressBufferCollection(std::vector<char> uncompressed_data,
+                                  CompressionType compression_type,
+                                  std::vector<char> &compressed_data);
+
+    boost::asio::io_service::strand strand;
+    boost::asio::ip::tcp::socket TCP_socket;
+    RequestHandler &request_handler;
+    boost::array<char, 8192> incoming_data_buffer;
+    Request request;
+    Reply reply;
+};
+
+} // namespace http
+
+#endif // CONNECTION_H
--- a/Server/DataStructures/BaseDataFacade.h
+++ b/Server/DataStructures/BaseDataFacade.h
@ -0,0 +1,126 @@
+/*
+
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef BASE_DATA_FACADE_H
+#define BASE_DATA_FACADE_H
+
+// Exposes all data access interfaces to the algorithms via base class ptr
+
+#include "../../data_structures/edge_based_node.hpp"
+#include "../../data_structures/external_memory_node.hpp"
+#include "../../data_structures/phantom_node.hpp"
+#include "../../data_structures/turn_instructions.hpp"
+#include "../../Util/integer_range.hpp"
+#include "../../Util/osrm_exception.hpp"
+#include "../../Util/string_util.hpp"
+#include "../../typedefs.h"
+
+#include <osrm/Coordinate.h>
+
+#include <string>
+
+typedef osrm::range<EdgeID> EdgeRange;
+
+template <class EdgeDataT> class BaseDataFacade
+{
+  public:
+    typedef EdgeBasedNode RTreeLeaf;
+    typedef EdgeDataT EdgeData;
+    BaseDataFacade() {}
+    virtual ~BaseDataFacade() {}
+
+    // search graph access
+    virtual unsigned GetNumberOfNodes() const = 0;
+
+    virtual unsigned GetNumberOfEdges() const = 0;
+
+    virtual unsigned GetOutDegree(const NodeID n) const = 0;
+
+    virtual NodeID GetTarget(const EdgeID e) const = 0;
+
+    // virtual EdgeDataT &GetEdgeData(const EdgeID e) = 0;
+
+    virtual const EdgeDataT &GetEdgeData(const EdgeID e) const = 0;
+
+    virtual EdgeID BeginEdges(const NodeID n) const = 0;
+
+    virtual EdgeID EndEdges(const NodeID n) const = 0;
+
+    virtual EdgeRange GetAdjacentEdgeRange(const NodeID node) const = 0;
+
+    // searches for a specific edge
+    virtual EdgeID FindEdge(const NodeID from, const NodeID to) const = 0;
+
+    virtual EdgeID FindEdgeInEitherDirection(const NodeID from, const NodeID to) const = 0;
+
+    virtual EdgeID
+    FindEdgeIndicateIfReverse(const NodeID from, const NodeID to, bool &result) const = 0;
+
+    // node and edge information access
+    virtual FixedPointCoordinate GetCoordinateOfNode(const unsigned id) const = 0;
+
+    virtual bool EdgeIsCompressed(const unsigned id) const = 0;
+
+    virtual unsigned GetGeometryIndexForEdgeID(const unsigned id) const = 0;
+
+    virtual void GetUncompressedGeometry(const unsigned id,
+                                         std::vector<unsigned> &result_nodes) const = 0;
+
+    virtual TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const = 0;
+
+    virtual TravelMode GetTravelModeForEdgeID(const unsigned id) const = 0;
+
+    virtual bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate,
+                                                    FixedPointCoordinate &result,
+                                                    const unsigned zoom_level = 18) = 0;
+
+    virtual bool
+    IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
+                                            std::vector<PhantomNode> &resulting_phantom_node_vector,
+                                            const unsigned number_of_results) = 0;
+
+    virtual bool
+    IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
+                                            PhantomNode &resulting_phantom_node) = 0;
+
+    virtual unsigned GetCheckSum() const = 0;
+
+    virtual unsigned GetNameIndexFromEdgeID(const unsigned id) const = 0;
+
+    virtual void GetName(const unsigned name_id, std::string &result) const = 0;
+
+    std::string GetEscapedNameForNameID(const unsigned name_id) const
+    {
+        std::string temporary_string;
+        GetName(name_id, temporary_string);
+        return EscapeJSONString(temporary_string);
+    }
+
+    virtual std::string GetTimestamp() const = 0;
+};
+
+#endif // BASE_DATA_FACADE_H
--- a/Server/DataStructures/InternalDataFacade.h
+++ b/Server/DataStructures/InternalDataFacade.h
@ -0,0 +1,455 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef INTERNAL_DATA_FACADE
+#define INTERNAL_DATA_FACADE
+
+// implements all data storage when shared memory is _NOT_ used
+
+#include "BaseDataFacade.h"
+
+#include "../../data_structures/original_edge_data.hpp"
+#include "../../data_structures/query_node.hpp"
+#include "../../data_structures/query_edge.hpp"
+#include "../../data_structures/shared_memory_vector_wrapper.hpp"
+#include "../../data_structures/static_graph.hpp"
+#include "../../data_structures/static_rtree.hpp"
+#include "../../data_structures/range_table.hpp"
+#include "../../Util/BoostFileSystemFix.h"
+#include "../../Util/graph_loader.hpp"
+#include "../../Util/simple_logger.hpp"
+
+#include <osrm/Coordinate.h>
+#include <osrm/ServerPaths.h>
+
+template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<EdgeDataT>
+{
+
+  private:
+    typedef BaseDataFacade<EdgeDataT> super;
+    typedef StaticGraph<typename super::EdgeData> QueryGraph;
+    typedef typename QueryGraph::InputEdge InputEdge;
+    typedef typename super::RTreeLeaf RTreeLeaf;
+
+    InternalDataFacade() {}
+
+    unsigned m_check_sum;
+    unsigned m_number_of_nodes;
+    QueryGraph *m_query_graph;
+    std::string m_timestamp;
+
+    std::shared_ptr<ShM<FixedPointCoordinate, false>::vector> m_coordinate_list;
+    ShM<NodeID, false>::vector m_via_node_list;
+    ShM<unsigned, false>::vector m_name_ID_list;
+    ShM<TurnInstruction, false>::vector m_turn_instruction_list;
+    ShM<TravelMode, false>::vector m_travel_mode_list;
+    ShM<char, false>::vector m_names_char_list;
+    ShM<bool, false>::vector m_edge_is_compressed;
+    ShM<unsigned, false>::vector m_geometry_indices;
+    ShM<unsigned, false>::vector m_geometry_list;
+
+    boost::thread_specific_ptr<
+        StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, false>::vector, false>> m_static_rtree;
+    boost::filesystem::path ram_index_path;
+    boost::filesystem::path file_index_path;
+    RangeTable<16, false> m_name_table;
+
+    void LoadTimestamp(const boost::filesystem::path &timestamp_path)
+    {
+        if (boost::filesystem::exists(timestamp_path))
+        {
+            SimpleLogger().Write() << "Loading Timestamp";
+            boost::filesystem::ifstream timestamp_stream(timestamp_path);
+            if (!timestamp_stream)
+            {
+                SimpleLogger().Write(logWARNING) << timestamp_path << " not found";
+            }
+            getline(timestamp_stream, m_timestamp);
+            timestamp_stream.close();
+        }
+        if (m_timestamp.empty())
+        {
+            m_timestamp = "n/a";
+        }
+        if (25 < m_timestamp.length())
+        {
+            m_timestamp.resize(25);
+        }
+    }
+
+    void LoadGraph(const boost::filesystem::path &hsgr_path)
+    {
+        typename ShM<typename QueryGraph::NodeArrayEntry, false>::vector node_list;
+        typename ShM<typename QueryGraph::EdgeArrayEntry, false>::vector edge_list;
+
+        SimpleLogger().Write() << "loading graph from " << hsgr_path.string();
+
+        m_number_of_nodes = readHSGRFromStream(hsgr_path, node_list, edge_list, &m_check_sum);
+
+        BOOST_ASSERT_MSG(0 != node_list.size(), "node list empty");
+        // BOOST_ASSERT_MSG(0 != edge_list.size(), "edge list empty");
+        SimpleLogger().Write() << "loaded " << node_list.size() << " nodes and " << edge_list.size()
+                               << " edges";
+        m_query_graph = new QueryGraph(node_list, edge_list);
+
+        BOOST_ASSERT_MSG(0 == node_list.size(), "node list not flushed");
+        BOOST_ASSERT_MSG(0 == edge_list.size(), "edge list not flushed");
+        SimpleLogger().Write() << "Data checksum is " << m_check_sum;
+    }
+
+    void LoadNodeAndEdgeInformation(const boost::filesystem::path &nodes_file,
+                                    const boost::filesystem::path &edges_file)
+    {
+        boost::filesystem::ifstream nodes_input_stream(nodes_file, std::ios::binary);
+
+        QueryNode current_node;
+        unsigned number_of_coordinates = 0;
+        nodes_input_stream.read((char *)&number_of_coordinates, sizeof(unsigned));
+        m_coordinate_list =
+            std::make_shared<std::vector<FixedPointCoordinate>>(number_of_coordinates);
+        for (unsigned i = 0; i < number_of_coordinates; ++i)
+        {
+            nodes_input_stream.read((char *)&current_node, sizeof(QueryNode));
+            m_coordinate_list->at(i) = FixedPointCoordinate(current_node.lat, current_node.lon);
+            BOOST_ASSERT((std::abs(m_coordinate_list->at(i).lat) >> 30) == 0);
+            BOOST_ASSERT((std::abs(m_coordinate_list->at(i).lon) >> 30) == 0);
+        }
+        nodes_input_stream.close();
+
+        boost::filesystem::ifstream edges_input_stream(edges_file, std::ios::binary);
+        unsigned number_of_edges = 0;
+        edges_input_stream.read((char *)&number_of_edges, sizeof(unsigned));
+        m_via_node_list.resize(number_of_edges);
+        m_name_ID_list.resize(number_of_edges);
+        m_turn_instruction_list.resize(number_of_edges);
+        m_travel_mode_list.resize(number_of_edges);
+        m_edge_is_compressed.resize(number_of_edges);
+
+        unsigned compressed = 0;
+
+        OriginalEdgeData current_edge_data;
+        for (unsigned i = 0; i < number_of_edges; ++i)
+        {
+            edges_input_stream.read((char *)&(current_edge_data), sizeof(OriginalEdgeData));
+            m_via_node_list[i] = current_edge_data.via_node;
+            m_name_ID_list[i] = current_edge_data.name_id;
+            m_turn_instruction_list[i] = current_edge_data.turn_instruction;
+            m_travel_mode_list[i] = current_edge_data.travel_mode;
+            m_edge_is_compressed[i] = current_edge_data.compressed_geometry;
+            if (m_edge_is_compressed[i])
+            {
+                ++compressed;
+            }
+        }
+
+        edges_input_stream.close();
+    }
+
+    void LoadGeometries(const boost::filesystem::path &geometry_file)
+    {
+        std::ifstream geometry_stream(geometry_file.string().c_str(), std::ios::binary);
+        unsigned number_of_indices = 0;
+        unsigned number_of_compressed_geometries = 0;
+
+        geometry_stream.read((char *)&number_of_indices, sizeof(unsigned));
+
+        m_geometry_indices.resize(number_of_indices);
+        if (number_of_indices > 0)
+        {
+            geometry_stream.read((char *)&(m_geometry_indices[0]),
+                                 number_of_indices * sizeof(unsigned));
+        }
+
+        geometry_stream.read((char *)&number_of_compressed_geometries, sizeof(unsigned));
+
+        BOOST_ASSERT(m_geometry_indices.back() == number_of_compressed_geometries);
+        m_geometry_list.resize(number_of_compressed_geometries);
+
+        if (number_of_compressed_geometries > 0)
+        {
+            geometry_stream.read((char *)&(m_geometry_list[0]),
+                                 number_of_compressed_geometries * sizeof(unsigned));
+        }
+        geometry_stream.close();
+    }
+
+    void LoadRTree()
+    {
+        BOOST_ASSERT_MSG(!m_coordinate_list->empty(), "coordinates must be loaded before r-tree");
+
+        m_static_rtree.reset(
+            new StaticRTree<RTreeLeaf>(ram_index_path, file_index_path, m_coordinate_list));
+    }
+
+    void LoadStreetNames(const boost::filesystem::path &names_file)
+    {
+        boost::filesystem::ifstream name_stream(names_file, std::ios::binary);
+
+        name_stream >> m_name_table;
+
+        unsigned number_of_chars = 0;
+        name_stream.read((char *)&number_of_chars, sizeof(unsigned));
+        BOOST_ASSERT_MSG(0 != number_of_chars, "name file broken");
+        m_names_char_list.resize(number_of_chars + 1); //+1 gives sentinel element
+        name_stream.read((char *)&m_names_char_list[0], number_of_chars * sizeof(char));
+        if (0 == m_names_char_list.size())
+        {
+            SimpleLogger().Write(logWARNING) << "list of street names is empty";
+        }
+        name_stream.close();
+    }
+
+  public:
+    virtual ~InternalDataFacade()
+    {
+        delete m_query_graph;
+        m_static_rtree.reset();
+    }
+
+    explicit InternalDataFacade(const ServerPaths &server_paths)
+    {
+        // generate paths of data files
+        if (server_paths.find("hsgrdata") == server_paths.end())
+        {
+            throw osrm::exception("no hsgr file given in ini file");
+        }
+        if (server_paths.find("ramindex") == server_paths.end())
+        {
+            throw osrm::exception("no ram index file given in ini file");
+        }
+        if (server_paths.find("fileindex") == server_paths.end())
+        {
+            throw osrm::exception("no leaf index file given in ini file");
+        }
+        if (server_paths.find("geometries") == server_paths.end())
+        {
+            throw osrm::exception("no geometries file given in ini file");
+        }
+        if (server_paths.find("nodesdata") == server_paths.end())
+        {
+            throw osrm::exception("no nodes file given in ini file");
+        }
+        if (server_paths.find("edgesdata") == server_paths.end())
+        {
+            throw osrm::exception("no edges file given in ini file");
+        }
+        if (server_paths.find("namesdata") == server_paths.end())
+        {
+            throw osrm::exception("no names file given in ini file");
+        }
+
+        ServerPaths::const_iterator paths_iterator = server_paths.find("hsgrdata");
+        BOOST_ASSERT(server_paths.end() != paths_iterator);
+        const boost::filesystem::path &hsgr_path = paths_iterator->second;
+        paths_iterator = server_paths.find("timestamp");
+        BOOST_ASSERT(server_paths.end() != paths_iterator);
+        const boost::filesystem::path &timestamp_path = paths_iterator->second;
+        paths_iterator = server_paths.find("ramindex");
+        BOOST_ASSERT(server_paths.end() != paths_iterator);
+        ram_index_path = paths_iterator->second;
+        paths_iterator = server_paths.find("fileindex");
+        BOOST_ASSERT(server_paths.end() != paths_iterator);
+        file_index_path = paths_iterator->second;
+        paths_iterator = server_paths.find("nodesdata");
+        BOOST_ASSERT(server_paths.end() != paths_iterator);
+        const boost::filesystem::path &nodes_data_path = paths_iterator->second;
+        paths_iterator = server_paths.find("edgesdata");
+        BOOST_ASSERT(server_paths.end() != paths_iterator);
+        const boost::filesystem::path &edges_data_path = paths_iterator->second;
+        paths_iterator = server_paths.find("namesdata");
+        BOOST_ASSERT(server_paths.end() != paths_iterator);
+        const boost::filesystem::path &names_data_path = paths_iterator->second;
+        paths_iterator = server_paths.find("geometries");
+        BOOST_ASSERT(server_paths.end() != paths_iterator);
+        const boost::filesystem::path &geometries_path = paths_iterator->second;
+
+        // load data
+        SimpleLogger().Write() << "loading graph data";
+        AssertPathExists(hsgr_path);
+        LoadGraph(hsgr_path);
+        SimpleLogger().Write() << "loading edge information";
+        AssertPathExists(nodes_data_path);
+        AssertPathExists(edges_data_path);
+        LoadNodeAndEdgeInformation(nodes_data_path, edges_data_path);
+        SimpleLogger().Write() << "loading geometries";
+        AssertPathExists(geometries_path);
+        LoadGeometries(geometries_path);
+        SimpleLogger().Write() << "loading r-tree";
+        AssertPathExists(ram_index_path);
+        AssertPathExists(file_index_path);
+        SimpleLogger().Write() << "loading timestamp";
+        LoadTimestamp(timestamp_path);
+        SimpleLogger().Write() << "loading street names";
+        AssertPathExists(names_data_path);
+        LoadStreetNames(names_data_path);
+    }
+
+    // search graph access
+    unsigned GetNumberOfNodes() const final { return m_query_graph->GetNumberOfNodes(); }
+
+    unsigned GetNumberOfEdges() const final { return m_query_graph->GetNumberOfEdges(); }
+
+    unsigned GetOutDegree(const NodeID n) const final { return m_query_graph->GetOutDegree(n); }
+
+    NodeID GetTarget(const EdgeID e) const final { return m_query_graph->GetTarget(e); }
+
+    // EdgeDataT &GetEdgeData(const EdgeID e) final { return m_query_graph->GetEdgeData(e); }
+
+    EdgeDataT &GetEdgeData(const EdgeID e) const final { return m_query_graph->GetEdgeData(e); }
+
+    EdgeID BeginEdges(const NodeID n) const final { return m_query_graph->BeginEdges(n); }
+
+    EdgeID EndEdges(const NodeID n) const final { return m_query_graph->EndEdges(n); }
+
+    EdgeRange GetAdjacentEdgeRange(const NodeID node) const final
+    {
+        return m_query_graph->GetAdjacentEdgeRange(node);
+    };
+
+    // searches for a specific edge
+    EdgeID FindEdge(const NodeID from, const NodeID to) const final
+    {
+        return m_query_graph->FindEdge(from, to);
+    }
+
+    EdgeID FindEdgeInEitherDirection(const NodeID from, const NodeID to) const final
+    {
+        return m_query_graph->FindEdgeInEitherDirection(from, to);
+    }
+
+    EdgeID FindEdgeIndicateIfReverse(const NodeID from, const NodeID to, bool &result) const final
+    {
+        return m_query_graph->FindEdgeIndicateIfReverse(from, to, result);
+    }
+
+    // node and edge information access
+    FixedPointCoordinate GetCoordinateOfNode(const unsigned id) const final
+    {
+        return m_coordinate_list->at(id);
+    };
+
+    bool EdgeIsCompressed(const unsigned id) const { return m_edge_is_compressed.at(id); }
+
+    TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const final
+    {
+        return m_turn_instruction_list.at(id);
+    }
+
+    TravelMode GetTravelModeForEdgeID(const unsigned id) const
+    {
+      return m_travel_mode_list.at(id);
+    }
+
+    bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate,
+                                            FixedPointCoordinate &result,
+                                            const unsigned zoom_level = 18) final
+    {
+        if (!m_static_rtree.get())
+        {
+            LoadRTree();
+        }
+
+        return m_static_rtree->LocateClosestEndPointForCoordinate(
+            input_coordinate, result, zoom_level);
+    }
+
+    bool
+    IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
+                                            PhantomNode &resulting_phantom_node) final
+    {
+        std::vector<PhantomNode> resulting_phantom_node_vector;
+        auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate,
+                                                              resulting_phantom_node_vector,
+                                                              1);
+        if (result)
+        {
+            BOOST_ASSERT(!resulting_phantom_node_vector.empty());
+            resulting_phantom_node = resulting_phantom_node_vector.front();
+        }
+        return result;
+    }
+
+    bool
+    IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
+                                            std::vector<PhantomNode> &resulting_phantom_node_vector,
+                                            const unsigned number_of_results) final
+    {
+        if (!m_static_rtree.get())
+        {
+            LoadRTree();
+        }
+
+        return m_static_rtree->IncrementalFindPhantomNodeForCoordinate(
+            input_coordinate, resulting_phantom_node_vector, number_of_results);
+    }
+
+    unsigned GetCheckSum() const final { return m_check_sum; }
+
+    unsigned GetNameIndexFromEdgeID(const unsigned id) const final
+    {
+        return m_name_ID_list.at(id);
+    };
+
+    void GetName(const unsigned name_id, std::string &result) const final
+    {
+        if (UINT_MAX == name_id)
+        {
+            result = "";
+            return;
+        }
+        auto range = m_name_table.GetRange(name_id);
+
+        result.clear();
+        if (range.begin() != range.end())
+        {
+            result.resize(range.back() - range.front() + 1);
+            std::copy(m_names_char_list.begin() + range.front(),
+                      m_names_char_list.begin() + range.back() + 1,
+                      result.begin());
+        }
+    }
+
+    virtual unsigned GetGeometryIndexForEdgeID(const unsigned id) const final
+    {
+        return m_via_node_list.at(id);
+    }
+
+    virtual void GetUncompressedGeometry(const unsigned id,
+                                         std::vector<unsigned> &result_nodes) const final
+    {
+        const unsigned begin = m_geometry_indices.at(id);
+        const unsigned end = m_geometry_indices.at(id + 1);
+
+        result_nodes.clear();
+        result_nodes.insert(
+            result_nodes.begin(), m_geometry_list.begin() + begin, m_geometry_list.begin() + end);
+    }
+
+    std::string GetTimestamp() const final { return m_timestamp; }
+};
+
+#endif // INTERNAL_DATA_FACADE
--- a/Server/DataStructures/SharedBarriers.h
+++ b/Server/DataStructures/SharedBarriers.h
@ -0,0 +1,60 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef SHARED_BARRIER_H
+#define SHARED_BARRIER_H
+
+#include <boost/interprocess/sync/named_mutex.hpp>
+#include <boost/interprocess/sync/named_condition.hpp>
+
+struct SharedBarriers
+{
+
+    SharedBarriers()
+        : pending_update_mutex(boost::interprocess::open_or_create, "pending_update"),
+          update_mutex(boost::interprocess::open_or_create, "update"),
+          query_mutex(boost::interprocess::open_or_create, "query"),
+          no_running_queries_condition(boost::interprocess::open_or_create, "no_running_queries"),
+          update_ongoing(false), number_of_queries(0)
+    {
+    }
+
+    // Mutex to protect access to the boolean variable
+    boost::interprocess::named_mutex pending_update_mutex;
+    boost::interprocess::named_mutex update_mutex;
+    boost::interprocess::named_mutex query_mutex;
+
+    // Condition that no update is running
+    boost::interprocess::named_condition no_running_queries_condition;
+
+    // Is there an ongoing update?
+    bool update_ongoing;
+    // Is there any query?
+    int number_of_queries;
+};
+
+#endif // SHARED_BARRIER_H
--- a/Server/DataStructures/SharedDataFacade.h
+++ b/Server/DataStructures/SharedDataFacade.h
@ -0,0 +1,431 @@
+/*
+
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef SHARED_DATA_FACADE_H
+#define SHARED_DATA_FACADE_H
+
+// implements all data storage when shared memory _IS_ used
+
+#include "BaseDataFacade.h"
+#include "SharedDataType.h"
+
+#include "../../data_structures/range_table.hpp"
+#include "../../data_structures/static_graph.hpp"
+#include "../../data_structures/static_rtree.hpp"
+#include "../../Util/BoostFileSystemFix.h"
+#include "../../Util/make_unique.hpp"
+#include "../../Util/simple_logger.hpp"
+
+#include <algorithm>
+#include <memory>
+
+template <class EdgeDataT> class SharedDataFacade : public BaseDataFacade<EdgeDataT>
+{
+
+  private:
+    typedef EdgeDataT EdgeData;
+    typedef BaseDataFacade<EdgeData> super;
+    typedef StaticGraph<EdgeData, true> QueryGraph;
+    typedef typename StaticGraph<EdgeData, true>::NodeArrayEntry GraphNode;
+    typedef typename StaticGraph<EdgeData, true>::EdgeArrayEntry GraphEdge;
+    typedef typename RangeTable<16, true>::BlockT NameIndexBlock;
+    typedef typename QueryGraph::InputEdge InputEdge;
+    typedef typename super::RTreeLeaf RTreeLeaf;
+    using SharedRTree = StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, true>::vector, true>;
+    using TimeStampedRTreePair = std::pair<unsigned, std::shared_ptr<SharedRTree>>;
+    using RTreeNode = typename SharedRTree::TreeNode;
+
+    SharedDataLayout *data_layout;
+    char *shared_memory;
+    SharedDataTimestamp *data_timestamp_ptr;
+
+    SharedDataType CURRENT_LAYOUT;
+    SharedDataType CURRENT_DATA;
+    unsigned CURRENT_TIMESTAMP;
+
+    unsigned m_check_sum;
+    std::unique_ptr<QueryGraph> m_query_graph;
+    std::unique_ptr<SharedMemory> m_layout_memory;
+    std::unique_ptr<SharedMemory> m_large_memory;
+    std::string m_timestamp;
+
+    std::shared_ptr<ShM<FixedPointCoordinate, true>::vector> m_coordinate_list;
+    ShM<NodeID, true>::vector m_via_node_list;
+    ShM<unsigned, true>::vector m_name_ID_list;
+    ShM<TurnInstruction, true>::vector m_turn_instruction_list;
+    ShM<TravelMode, true>::vector m_travel_mode_list;
+    ShM<char, true>::vector m_names_char_list;
+    ShM<unsigned, true>::vector m_name_begin_indices;
+    ShM<bool, true>::vector m_edge_is_compressed;
+    ShM<unsigned, true>::vector m_geometry_indices;
+    ShM<unsigned, true>::vector m_geometry_list;
+
+    boost::thread_specific_ptr<std::pair<unsigned, std::shared_ptr<SharedRTree>>> m_static_rtree;
+    boost::filesystem::path file_index_path;
+
+    std::shared_ptr<RangeTable<16, true>> m_name_table;
+
+    void LoadChecksum()
+    {
+        m_check_sum =
+            *data_layout->GetBlockPtr<unsigned>(shared_memory, SharedDataLayout::HSGR_CHECKSUM);
+        SimpleLogger().Write() << "set checksum: " << m_check_sum;
+    }
+
+    void LoadTimestamp()
+    {
+        char *timestamp_ptr =
+            data_layout->GetBlockPtr<char>(shared_memory, SharedDataLayout::TIMESTAMP);
+        m_timestamp.resize(data_layout->GetBlockSize(SharedDataLayout::TIMESTAMP));
+        std::copy(timestamp_ptr,
+                  timestamp_ptr + data_layout->GetBlockSize(SharedDataLayout::TIMESTAMP),
+                  m_timestamp.begin());
+    }
+
+    void LoadRTree()
+    {
+        BOOST_ASSERT_MSG(!m_coordinate_list->empty(), "coordinates must be loaded before r-tree");
+
+        RTreeNode *tree_ptr =
+            data_layout->GetBlockPtr<RTreeNode>(shared_memory, SharedDataLayout::R_SEARCH_TREE);
+        m_static_rtree.reset(new TimeStampedRTreePair(CURRENT_TIMESTAMP,
+            osrm::make_unique<SharedRTree>(
+                tree_ptr,
+                data_layout->num_entries[SharedDataLayout::R_SEARCH_TREE],
+                file_index_path,
+                m_coordinate_list)));
+    }
+
+    void LoadGraph()
+    {
+        GraphNode *graph_nodes_ptr =
+            data_layout->GetBlockPtr<GraphNode>(shared_memory, SharedDataLayout::GRAPH_NODE_LIST);
+
+        GraphEdge *graph_edges_ptr =
+            data_layout->GetBlockPtr<GraphEdge>(shared_memory, SharedDataLayout::GRAPH_EDGE_LIST);
+
+        typename ShM<GraphNode, true>::vector node_list(
+            graph_nodes_ptr, data_layout->num_entries[SharedDataLayout::GRAPH_NODE_LIST]);
+        typename ShM<GraphEdge, true>::vector edge_list(
+            graph_edges_ptr, data_layout->num_entries[SharedDataLayout::GRAPH_EDGE_LIST]);
+        m_query_graph.reset(new QueryGraph(node_list, edge_list));
+    }
+
+    void LoadNodeAndEdgeInformation()
+    {
+
+        FixedPointCoordinate *coordinate_list_ptr = data_layout->GetBlockPtr<FixedPointCoordinate>(
+            shared_memory, SharedDataLayout::COORDINATE_LIST);
+        m_coordinate_list = osrm::make_unique<ShM<FixedPointCoordinate, true>::vector>(
+            coordinate_list_ptr, data_layout->num_entries[SharedDataLayout::COORDINATE_LIST]);
+
+        TravelMode *travel_mode_list_ptr = data_layout->GetBlockPtr<TravelMode>(
+            shared_memory, SharedDataLayout::TRAVEL_MODE);
+        typename ShM<TravelMode, true>::vector travel_mode_list(
+            travel_mode_list_ptr,
+            data_layout->num_entries[SharedDataLayout::TRAVEL_MODE]);
+        m_travel_mode_list.swap(travel_mode_list);
+
+        TurnInstruction *turn_instruction_list_ptr = data_layout->GetBlockPtr<TurnInstruction>(
+            shared_memory, SharedDataLayout::TURN_INSTRUCTION);
+        typename ShM<TurnInstruction, true>::vector turn_instruction_list(
+            turn_instruction_list_ptr,
+            data_layout->num_entries[SharedDataLayout::TURN_INSTRUCTION]);
+        m_turn_instruction_list.swap(turn_instruction_list);
+
+        unsigned *name_id_list_ptr =
+            data_layout->GetBlockPtr<unsigned>(shared_memory, SharedDataLayout::NAME_ID_LIST);
+        typename ShM<unsigned, true>::vector name_id_list(
+            name_id_list_ptr, data_layout->num_entries[SharedDataLayout::NAME_ID_LIST]);
+        m_name_ID_list.swap(name_id_list);
+    }
+
+    void LoadViaNodeList()
+    {
+        NodeID *via_node_list_ptr =
+            data_layout->GetBlockPtr<NodeID>(shared_memory, SharedDataLayout::VIA_NODE_LIST);
+        typename ShM<NodeID, true>::vector via_node_list(
+            via_node_list_ptr, data_layout->num_entries[SharedDataLayout::VIA_NODE_LIST]);
+        m_via_node_list.swap(via_node_list);
+    }
+
+    void LoadNames()
+    {
+        unsigned *offsets_ptr =
+            data_layout->GetBlockPtr<unsigned>(shared_memory, SharedDataLayout::NAME_OFFSETS);
+        NameIndexBlock *blocks_ptr =
+            data_layout->GetBlockPtr<NameIndexBlock>(shared_memory, SharedDataLayout::NAME_BLOCKS);
+        typename ShM<unsigned, true>::vector name_offsets(
+            offsets_ptr, data_layout->num_entries[SharedDataLayout::NAME_OFFSETS]);
+        typename ShM<NameIndexBlock, true>::vector name_blocks(
+            blocks_ptr, data_layout->num_entries[SharedDataLayout::NAME_BLOCKS]);
+
+        char *names_list_ptr =
+            data_layout->GetBlockPtr<char>(shared_memory, SharedDataLayout::NAME_CHAR_LIST);
+        typename ShM<char, true>::vector names_char_list(
+            names_list_ptr, data_layout->num_entries[SharedDataLayout::NAME_CHAR_LIST]);
+        m_name_table = osrm::make_unique<RangeTable<16, true>>(
+            name_offsets, name_blocks, static_cast<unsigned>(names_char_list.size()));
+
+        m_names_char_list.swap(names_char_list);
+    }
+
+    void LoadGeometries()
+    {
+        unsigned *geometries_compressed_ptr = data_layout->GetBlockPtr<unsigned>(
+            shared_memory, SharedDataLayout::GEOMETRIES_INDICATORS);
+        typename ShM<bool, true>::vector edge_is_compressed(
+            geometries_compressed_ptr,
+            data_layout->num_entries[SharedDataLayout::GEOMETRIES_INDICATORS]);
+        m_edge_is_compressed.swap(edge_is_compressed);
+
+        unsigned *geometries_index_ptr =
+            data_layout->GetBlockPtr<unsigned>(shared_memory, SharedDataLayout::GEOMETRIES_INDEX);
+        typename ShM<unsigned, true>::vector geometry_begin_indices(
+            geometries_index_ptr, data_layout->num_entries[SharedDataLayout::GEOMETRIES_INDEX]);
+        m_geometry_indices.swap(geometry_begin_indices);
+
+        unsigned *geometries_list_ptr =
+            data_layout->GetBlockPtr<unsigned>(shared_memory, SharedDataLayout::GEOMETRIES_LIST);
+        typename ShM<unsigned, true>::vector geometry_list(
+            geometries_list_ptr, data_layout->num_entries[SharedDataLayout::GEOMETRIES_LIST]);
+        m_geometry_list.swap(geometry_list);
+    }
+
+  public:
+    virtual ~SharedDataFacade() {}
+
+    SharedDataFacade()
+    {
+        data_timestamp_ptr = (SharedDataTimestamp *)SharedMemoryFactory::Get(
+                                 CURRENT_REGIONS, sizeof(SharedDataTimestamp), false, false)->Ptr();
+        CURRENT_LAYOUT = LAYOUT_NONE;
+        CURRENT_DATA = DATA_NONE;
+        CURRENT_TIMESTAMP = 0;
+
+        // load data
+        CheckAndReloadFacade();
+    }
+
+    void CheckAndReloadFacade()
+    {
+        if (CURRENT_LAYOUT != data_timestamp_ptr->layout ||
+            CURRENT_DATA != data_timestamp_ptr->data ||
+            CURRENT_TIMESTAMP != data_timestamp_ptr->timestamp)
+        {
+            // release the previous shared memory segments
+            SharedMemory::Remove(CURRENT_LAYOUT);
+            SharedMemory::Remove(CURRENT_DATA);
+
+            CURRENT_LAYOUT = data_timestamp_ptr->layout;
+            CURRENT_DATA = data_timestamp_ptr->data;
+            CURRENT_TIMESTAMP = data_timestamp_ptr->timestamp;
+
+            m_layout_memory.reset(SharedMemoryFactory::Get(CURRENT_LAYOUT));
+
+            data_layout = (SharedDataLayout *)(m_layout_memory->Ptr());
+
+            m_large_memory.reset(SharedMemoryFactory::Get(CURRENT_DATA));
+            shared_memory = (char *)(m_large_memory->Ptr());
+
+            const char *file_index_ptr =
+                data_layout->GetBlockPtr<char>(shared_memory, SharedDataLayout::FILE_INDEX_PATH);
+            file_index_path = boost::filesystem::path(file_index_ptr);
+            if (!boost::filesystem::exists(file_index_path))
+            {
+                SimpleLogger().Write(logDEBUG) << "Leaf file name " << file_index_path.string();
+                throw osrm::exception("Could not load leaf index file."
+                                    "Is any data loaded into shared memory?");
+            }
+
+            LoadGraph();
+            LoadChecksum();
+            LoadNodeAndEdgeInformation();
+            LoadGeometries();
+            LoadTimestamp();
+            LoadViaNodeList();
+            LoadNames();
+
+            data_layout->PrintInformation();
+
+            SimpleLogger().Write() << "number of geometries: " << m_coordinate_list->size();
+            for (unsigned i = 0; i < m_coordinate_list->size(); ++i)
+            {
+                if (!GetCoordinateOfNode(i).is_valid())
+                {
+                    SimpleLogger().Write() << "coordinate " << i << " not valid";
+                }
+            }
+        }
+    }
+
+    // search graph access
+    unsigned GetNumberOfNodes() const final { return m_query_graph->GetNumberOfNodes(); }
+
+    unsigned GetNumberOfEdges() const final { return m_query_graph->GetNumberOfEdges(); }
+
+    unsigned GetOutDegree(const NodeID n) const final { return m_query_graph->GetOutDegree(n); }
+
+    NodeID GetTarget(const EdgeID e) const final { return m_query_graph->GetTarget(e); }
+
+    EdgeDataT &GetEdgeData(const EdgeID e) const final { return m_query_graph->GetEdgeData(e); }
+
+    EdgeID BeginEdges(const NodeID n) const final { return m_query_graph->BeginEdges(n); }
+
+    EdgeID EndEdges(const NodeID n) const final { return m_query_graph->EndEdges(n); }
+
+    EdgeRange GetAdjacentEdgeRange(const NodeID node) const final
+    {
+        return m_query_graph->GetAdjacentEdgeRange(node);
+    };
+
+    // searches for a specific edge
+    EdgeID FindEdge(const NodeID from, const NodeID to) const final
+    {
+        return m_query_graph->FindEdge(from, to);
+    }
+
+    EdgeID FindEdgeInEitherDirection(const NodeID from, const NodeID to) const final
+    {
+        return m_query_graph->FindEdgeInEitherDirection(from, to);
+    }
+
+    EdgeID FindEdgeIndicateIfReverse(const NodeID from, const NodeID to, bool &result) const final
+    {
+        return m_query_graph->FindEdgeIndicateIfReverse(from, to, result);
+    }
+
+    // node and edge information access
+    FixedPointCoordinate GetCoordinateOfNode(const NodeID id) const final
+    {
+        return m_coordinate_list->at(id);
+    };
+
+    virtual bool EdgeIsCompressed(const unsigned id) const final
+    {
+        return m_edge_is_compressed.at(id);
+    }
+
+    virtual void GetUncompressedGeometry(const unsigned id,
+                                         std::vector<unsigned> &result_nodes) const final
+    {
+        const unsigned begin = m_geometry_indices.at(id);
+        const unsigned end = m_geometry_indices.at(id + 1);
+
+        result_nodes.clear();
+        result_nodes.insert(
+            result_nodes.begin(), m_geometry_list.begin() + begin, m_geometry_list.begin() + end);
+    }
+
+    virtual unsigned GetGeometryIndexForEdgeID(const unsigned id) const final
+    {
+        return m_via_node_list.at(id);
+    }
+
+    TurnInstruction GetTurnInstructionForEdgeID(const unsigned id) const final
+    {
+        return m_turn_instruction_list.at(id);
+    }
+
+    TravelMode GetTravelModeForEdgeID(const unsigned id) const
+    {
+        return m_travel_mode_list.at(id);
+    }
+
+    bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate,
+                                            FixedPointCoordinate &result,
+                                            const unsigned zoom_level = 18) final
+    {
+        if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
+        {
+            LoadRTree();
+        }
+
+        return m_static_rtree->second->LocateClosestEndPointForCoordinate(
+            input_coordinate, result, zoom_level);
+    }
+
+    bool
+    IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
+                                            PhantomNode &resulting_phantom_node) final
+    {
+        std::vector<PhantomNode> resulting_phantom_node_vector;
+        auto result = IncrementalFindPhantomNodeForCoordinate(input_coordinate,
+                                                              resulting_phantom_node_vector,
+                                                              1);
+        if (result)
+        {
+            BOOST_ASSERT(!resulting_phantom_node_vector.empty());
+            resulting_phantom_node = resulting_phantom_node_vector.front();
+        }
+        return result;
+    }
+
+    bool
+    IncrementalFindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
+                                            std::vector<PhantomNode> &resulting_phantom_node_vector,
+                                            const unsigned number_of_results) final
+    {
+        if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
+        {
+            LoadRTree();
+        }
+
+        return m_static_rtree->second->IncrementalFindPhantomNodeForCoordinate(
+            input_coordinate, resulting_phantom_node_vector, number_of_results);
+    }
+
+    unsigned GetCheckSum() const final { return m_check_sum; }
+
+    unsigned GetNameIndexFromEdgeID(const unsigned id) const final
+    {
+        return m_name_ID_list.at(id);
+    };
+
+    void GetName(const unsigned name_id, std::string &result) const final
+    {
+        if (UINT_MAX == name_id)
+        {
+            result = "";
+            return;
+        }
+        auto range = m_name_table->GetRange(name_id);
+
+        result.clear();
+        if (range.begin() != range.end())
+        {
+            result.resize(range.back() - range.front() + 1);
+            std::copy(m_names_char_list.begin() + range.front(),
+                      m_names_char_list.begin() + range.back() + 1,
+                      result.begin());
+        }
+    }
+
+    std::string GetTimestamp() const final { return m_timestamp; }
+};
+
+#endif // SHARED_DATA_FACADE_H
--- a/Server/DataStructures/SharedDataType.h
+++ b/Server/DataStructures/SharedDataType.h
@ -0,0 +1,193 @@
+/*
+
+Copyright (c) 2015, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef SHARED_DATA_TYPE_H_
+#define SHARED_DATA_TYPE_H_
+
+#include "../../Util/osrm_exception.hpp"
+#include "../../Util/simple_logger.hpp"
+
+#include <cstdint>
+
+#include <array>
+
+// Added at the start and end of each block as sanity check
+static const char CANARY[] = "OSRM";
+
+struct SharedDataLayout
+{
+    enum BlockID {
+        NAME_OFFSETS = 0,
+        NAME_BLOCKS,
+        NAME_CHAR_LIST,
+        NAME_ID_LIST,
+        VIA_NODE_LIST,
+        GRAPH_NODE_LIST,
+        GRAPH_EDGE_LIST,
+        COORDINATE_LIST,
+        TURN_INSTRUCTION,
+        TRAVEL_MODE,
+        R_SEARCH_TREE,
+        GEOMETRIES_INDEX,
+        GEOMETRIES_LIST,
+        GEOMETRIES_INDICATORS,
+        HSGR_CHECKSUM,
+        TIMESTAMP,
+        FILE_INDEX_PATH,
+        NUM_BLOCKS
+    };
+
+    std::array<uint64_t, NUM_BLOCKS> num_entries;
+    std::array<uint64_t, NUM_BLOCKS> entry_size;
+
+    SharedDataLayout()
+    : num_entries()
+    , entry_size()
+    {
+    }
+
+    void PrintInformation() const
+    {
+        SimpleLogger().Write(logDEBUG) << "-";
+        SimpleLogger().Write(logDEBUG) << "name_offsets_size:          " << num_entries[NAME_OFFSETS];
+        SimpleLogger().Write(logDEBUG) << "name_blocks_size:           " << num_entries[NAME_BLOCKS];
+        SimpleLogger().Write(logDEBUG) << "name_char_list_size:        " << num_entries[NAME_CHAR_LIST];
+        SimpleLogger().Write(logDEBUG) << "name_id_list_size:          " << num_entries[NAME_ID_LIST];
+        SimpleLogger().Write(logDEBUG) << "via_node_list_size:         " << num_entries[VIA_NODE_LIST];
+        SimpleLogger().Write(logDEBUG) << "graph_node_list_size:       " << num_entries[GRAPH_NODE_LIST];
+        SimpleLogger().Write(logDEBUG) << "graph_edge_list_size:       " << num_entries[GRAPH_EDGE_LIST];
+        SimpleLogger().Write(logDEBUG) << "timestamp_length:           " << num_entries[TIMESTAMP];
+        SimpleLogger().Write(logDEBUG) << "coordinate_list_size:       " << num_entries[COORDINATE_LIST];
+        SimpleLogger().Write(logDEBUG) << "turn_instruction_list_size: " << num_entries[TURN_INSTRUCTION];
+        SimpleLogger().Write(logDEBUG) << "travel_mode_list_size:      " << num_entries[TRAVEL_MODE];
+        SimpleLogger().Write(logDEBUG) << "r_search_tree_size:         " << num_entries[R_SEARCH_TREE];
+        SimpleLogger().Write(logDEBUG) << "geometries_indicators:      " << num_entries[GEOMETRIES_INDICATORS]
+                                       << "/" << ((num_entries[GEOMETRIES_INDICATORS] / 8) + 1);
+        SimpleLogger().Write(logDEBUG) << "geometries_index_list_size: " << num_entries[GEOMETRIES_INDEX];
+        SimpleLogger().Write(logDEBUG) << "geometries_list_size:       " << num_entries[GEOMETRIES_LIST];
+        SimpleLogger().Write(logDEBUG) << "sizeof(checksum):           " << entry_size[HSGR_CHECKSUM];
+
+        SimpleLogger().Write(logDEBUG) << "NAME_OFFSETS         " << ": " << GetBlockSize(NAME_OFFSETS         );
+        SimpleLogger().Write(logDEBUG) << "NAME_BLOCKS          " << ": " << GetBlockSize(NAME_BLOCKS          );
+        SimpleLogger().Write(logDEBUG) << "NAME_CHAR_LIST       " << ": " << GetBlockSize(NAME_CHAR_LIST       );
+        SimpleLogger().Write(logDEBUG) << "NAME_ID_LIST         " << ": " << GetBlockSize(NAME_ID_LIST         );
+        SimpleLogger().Write(logDEBUG) << "VIA_NODE_LIST        " << ": " << GetBlockSize(VIA_NODE_LIST        );
+        SimpleLogger().Write(logDEBUG) << "GRAPH_NODE_LIST      " << ": " << GetBlockSize(GRAPH_NODE_LIST      );
+        SimpleLogger().Write(logDEBUG) << "GRAPH_EDGE_LIST      " << ": " << GetBlockSize(GRAPH_EDGE_LIST      );
+        SimpleLogger().Write(logDEBUG) << "COORDINATE_LIST      " << ": " << GetBlockSize(COORDINATE_LIST      );
+        SimpleLogger().Write(logDEBUG) << "TURN_INSTRUCTION     " << ": " << GetBlockSize(TURN_INSTRUCTION     );
+        SimpleLogger().Write(logDEBUG) << "TRAVEL_MODE          " << ": " << GetBlockSize(TRAVEL_MODE          );
+        SimpleLogger().Write(logDEBUG) << "R_SEARCH_TREE        " << ": " << GetBlockSize(R_SEARCH_TREE        );
+        SimpleLogger().Write(logDEBUG) << "GEOMETRIES_INDEX     " << ": " << GetBlockSize(GEOMETRIES_INDEX     );
+        SimpleLogger().Write(logDEBUG) << "GEOMETRIES_LIST      " << ": " << GetBlockSize(GEOMETRIES_LIST      );
+        SimpleLogger().Write(logDEBUG) << "GEOMETRIES_INDICATORS" << ": " << GetBlockSize(GEOMETRIES_INDICATORS);
+        SimpleLogger().Write(logDEBUG) << "HSGR_CHECKSUM        " << ": " << GetBlockSize(HSGR_CHECKSUM        );
+        SimpleLogger().Write(logDEBUG) << "TIMESTAMP            " << ": " << GetBlockSize(TIMESTAMP            );
+        SimpleLogger().Write(logDEBUG) << "FILE_INDEX_PATH      " << ": " << GetBlockSize(FILE_INDEX_PATH      );
+    }
+
+    template<typename T>
+    inline void SetBlockSize(BlockID bid, uint64_t entries)
+    {
+        num_entries[bid] = entries;
+        entry_size[bid] = sizeof(T);
+    }
+
+    inline uint64_t GetBlockSize(BlockID bid) const
+    {
+        // special encoding
+        if (bid == GEOMETRIES_INDICATORS)
+        {
+            return (num_entries[GEOMETRIES_INDICATORS]/32 + 1) * entry_size[GEOMETRIES_INDICATORS];
+        }
+
+        return num_entries[bid] * entry_size[bid];
+    }
+
+    inline uint64_t GetSizeOfLayout() const
+    {
+        return GetBlockOffset(NUM_BLOCKS) + NUM_BLOCKS*2*sizeof(CANARY);
+    }
+
+    inline uint64_t GetBlockOffset(BlockID bid) const
+    {
+        uint64_t result = sizeof(CANARY);
+        for (auto i = 0; i < bid; i++)
+        {
+            result += GetBlockSize((BlockID) i) + 2*sizeof(CANARY);
+        }
+        return result;
+    }
+
+    template<typename T, bool WRITE_CANARY=false>
+    inline T* GetBlockPtr(char* shared_memory, BlockID bid)
+    {
+        T* ptr = (T*)(shared_memory + GetBlockOffset(bid));
+        if (WRITE_CANARY)
+        {
+            char* start_canary_ptr = shared_memory + GetBlockOffset(bid) - sizeof(CANARY);
+            char* end_canary_ptr = shared_memory + GetBlockOffset(bid) + GetBlockSize(bid);
+            std::copy(CANARY, CANARY + sizeof(CANARY), start_canary_ptr);
+            std::copy(CANARY, CANARY + sizeof(CANARY), end_canary_ptr);
+        }
+        else
+        {
+            char* start_canary_ptr = shared_memory + GetBlockOffset(bid) - sizeof(CANARY);
+            char* end_canary_ptr = shared_memory + GetBlockOffset(bid) + GetBlockSize(bid);
+            bool start_canary_alive = std::equal(CANARY, CANARY + sizeof(CANARY), start_canary_ptr);
+            bool end_canary_alive = std::equal(CANARY, CANARY + sizeof(CANARY), end_canary_ptr);
+            if (!start_canary_alive)
+            {
+                throw osrm::exception("Start canary of block corrupted.");
+            }
+            if (!end_canary_alive)
+            {
+                throw osrm::exception("End canary of block corrupted.");
+            }
+        }
+
+        return ptr;
+    }
+};
+
+enum SharedDataType
+{ CURRENT_REGIONS,
+  LAYOUT_1,
+  DATA_1,
+  LAYOUT_2,
+  DATA_2,
+  LAYOUT_NONE,
+  DATA_NONE };
+
+struct SharedDataTimestamp
+{
+    SharedDataType layout;
+    SharedDataType data;
+    unsigned timestamp;
+};
+
+#endif /* SHARED_DATA_TYPE_H_ */
--- a/include/osrm/contractor_config.hpp
+++ b/include/osrm/contractor_config.hpp
@ -1,6 +1,6 @@
 /*

-Copyright (c) 2017, Project OSRM contributors
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification,
@ -25,14 +25,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

-#ifndef GLOBAL_CONTRACTOR_CONFIG_HPP
-#define GLOBAL_CONTRACTOR_CONFIG_HPP
+#ifndef COMPRESSION_TYPE_H
+#define COMPRESSION_TYPE_H

-#include "contractor/contractor_config.hpp"
-
-namespace osrm
+namespace http
 {
-using contractor::ContractorConfig;
+
+enum CompressionType
+{ noCompression,
+  gzipRFC1952,
+  deflateRFC1951 };
+
 }

-#endif
+#endif // COMPRESSION_TYPE_H
--- a/Server/Http/Reply.cpp
+++ b/Server/Http/Reply.cpp
@ -0,0 +1,122 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include <osrm/Reply.h>
+
+#include "../../Util/cast.hpp"
+
+namespace http
+{
+
+void Reply::SetSize(const unsigned size)
+{
+    for (Header &h : headers)
+    {
+        if ("Content-Length" == h.name)
+        {
+            h.value = cast::integral_to_string(size);
+        }
+    }
+}
+
+// Sets the size of the uncompressed output.
+void Reply::SetUncompressedSize() { SetSize(static_cast<unsigned>(content.size())); }
+
+std::vector<boost::asio::const_buffer> Reply::ToBuffers()
+{
+    std::vector<boost::asio::const_buffer> buffers;
+    buffers.push_back(ToBuffer(status));
+    for (const Header &h : headers)
+    {
+        buffers.push_back(boost::asio::buffer(h.name));
+        buffers.push_back(boost::asio::buffer(seperators));
+        buffers.push_back(boost::asio::buffer(h.value));
+        buffers.push_back(boost::asio::buffer(crlf));
+    }
+    buffers.push_back(boost::asio::buffer(crlf));
+    buffers.push_back(boost::asio::buffer(content));
+    return buffers;
+}
+
+std::vector<boost::asio::const_buffer> Reply::HeaderstoBuffers()
+{
+    std::vector<boost::asio::const_buffer> buffers;
+    buffers.push_back(ToBuffer(status));
+    for (std::size_t i = 0; i < headers.size(); ++i)
+    {
+        Header &current_header = headers[i];
+        buffers.push_back(boost::asio::buffer(current_header.name));
+        buffers.push_back(boost::asio::buffer(seperators));
+        buffers.push_back(boost::asio::buffer(current_header.value));
+        buffers.push_back(boost::asio::buffer(crlf));
+    }
+    buffers.push_back(boost::asio::buffer(crlf));
+    return buffers;
+}
+
+Reply Reply::StockReply(Reply::status_type status)
+{
+    Reply reply;
+    reply.status = status;
+    reply.content.clear();
+
+    const std::string status_string = reply.ToString(status);
+    reply.content.insert(reply.content.end(), status_string.begin(), status_string.end());
+    reply.headers.emplace_back("Access-Control-Allow-Origin", "*");
+    reply.headers.emplace_back("Content-Length", cast::integral_to_string(reply.content.size()));
+    reply.headers.emplace_back("Content-Type", "text/html");
+    return reply;
+}
+
+std::string Reply::ToString(Reply::status_type status)
+{
+    if (Reply::ok == status)
+    {
+        return okHTML;
+    }
+    if (Reply::badRequest == status)
+    {
+        return badRequestHTML;
+    }
+    return internalServerErrorHTML;
+}
+
+boost::asio::const_buffer Reply::ToBuffer(Reply::status_type status)
+{
+    if (Reply::ok == status)
+    {
+        return boost::asio::buffer(okString);
+    }
+    if (Reply::internalServerError == status)
+    {
+        return boost::asio::buffer(internalServerErrorString);
+    }
+    return boost::asio::buffer(badRequestString);
+}
+
+Reply::Reply() : status(ok) {}
+}
--- a/include/engine/approach.hpp
+++ b/include/engine/approach.hpp
@ -1,6 +1,6 @@
 /*

-Copyright (c) 2017, Project OSRM contributors
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification,
@ -25,20 +25,24 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

-#ifndef OSRM_ENGINE_APPROACH_HPP
-#define OSRM_ENGINE_APPROACH_HPP
+#ifndef REQUEST_H
+#define REQUEST_H

-#include <cstdint>
+#include <boost/asio.hpp>

-namespace osrm::engine
+#include <string>
+
+namespace http
 {

-enum class Approach : std::uint8_t
+struct Request
 {
-    CURB = 0,
-    UNRESTRICTED = 1,
-    OPPOSITE = 2
-
+    std::string uri;
+    std::string referrer;
+    std::string agent;
+    boost::asio::ip::address endpoint;
 };
-} // namespace osrm::engine
-#endif
+
+} // namespace http
+
+#endif // REQUEST_H
--- a/Server/RequestHandler.cpp
+++ b/Server/RequestHandler.cpp
@ -0,0 +1,143 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "RequestHandler.h"
+
+#include "APIGrammar.h"
+#include "Http/Request.h"
+
+#include "../data_structures/json_container.hpp"
+#include "../Library/OSRM.h"
+#include "../Util/json_renderer.hpp"
+#include "../Util/simple_logger.hpp"
+#include "../Util/string_util.hpp"
+#include "../typedefs.h"
+
+#include <osrm/Reply.h>
+#include <osrm/RouteParameters.h>
+
+#include <ctime>
+
+#include <algorithm>
+#include <iostream>
+
+RequestHandler::RequestHandler() : routing_machine(nullptr) {}
+
+void RequestHandler::handle_request(const http::Request &req, http::Reply &reply)
+{
+    // parse command
+    try
+    {
+        std::string request;
+        URIDecode(req.uri, request);
+
+        // deactivated as GCC apparently does not implement that, not even in 4.9
+        // std::time_t t = std::time(nullptr);
+        // SimpleLogger().Write() << std::put_time(std::localtime(&t), "%m-%d-%Y %H:%M:%S") <<
+        //     " " << req.endpoint.to_string() << " " <<
+        //     req.referrer << ( 0 == req.referrer.length() ? "- " :" ") <<
+        //     req.agent << ( 0 == req.agent.length() ? "- " :" ") << request;
+
+        time_t ltime;
+        struct tm *time_stamp;
+
+        ltime = time(nullptr);
+        time_stamp = localtime(&ltime);
+
+        // log timestamp
+        SimpleLogger().Write() << (time_stamp->tm_mday < 10 ? "0" : "") << time_stamp->tm_mday << "-"
+                               << (time_stamp->tm_mon + 1 < 10 ? "0" : "") << (time_stamp->tm_mon + 1) << "-"
+                               << 1900 + time_stamp->tm_year << " " << (time_stamp->tm_hour < 10 ? "0" : "")
+                               << time_stamp->tm_hour << ":" << (time_stamp->tm_min < 10 ? "0" : "") << time_stamp->tm_min
+                               << ":" << (time_stamp->tm_sec < 10 ? "0" : "") << time_stamp->tm_sec << " "
+                               << req.endpoint.to_string() << " " << req.referrer
+                               << (0 == req.referrer.length() ? "- " : " ") << req.agent
+                               << (0 == req.agent.length() ? "- " : " ") << request;
+
+        RouteParameters route_parameters;
+        APIGrammarParser api_parser(&route_parameters);
+
+        auto iter = request.begin();
+        const bool result = boost::spirit::qi::parse(iter, request.end(), api_parser);
+
+        // check if the was an error with the request
+        if (!result || (iter != request.end()))
+        {
+            reply = http::Reply::StockReply(http::Reply::badRequest);
+            reply.content.clear();
+            const auto position = std::distance(request.begin(), iter);
+            JSON::Object json_result;
+            json_result.values["status"] = 400;
+            std::string message = "Query string malformed close to position ";
+            message += cast::integral_to_string(position);
+            json_result.values["status_message"] = message;
+            JSON::render(reply.content, json_result);
+            return;
+        }
+
+        // parsing done, lets call the right plugin to handle the request
+        BOOST_ASSERT_MSG(routing_machine != nullptr, "pointer not init'ed");
+
+        if (!route_parameters.jsonp_parameter.empty())
+        { // prepend response with jsonp parameter
+            const std::string json_p = (route_parameters.jsonp_parameter + "(");
+            reply.content.insert(reply.content.end(), json_p.begin(), json_p.end());
+        }
+        routing_machine->RunQuery(route_parameters, reply);
+        if (!route_parameters.jsonp_parameter.empty())
+        { // append brace to jsonp response
+            reply.content.push_back(')');
+        }
+
+        // set headers
+        reply.headers.emplace_back("Content-Length", cast::integral_to_string(reply.content.size()));
+        if ("gpx" == route_parameters.output_format)
+        { // gpx file
+            reply.headers.emplace_back("Content-Type", "application/gpx+xml; charset=UTF-8");
+            reply.headers.emplace_back("Content-Disposition", "attachment; filename=\"route.gpx\"");
+        }
+        else if (route_parameters.jsonp_parameter.empty())
+        { // json file
+            reply.headers.emplace_back("Content-Type", "application/json; charset=UTF-8");
+            reply.headers.emplace_back("Content-Disposition", "inline; filename=\"response.json\"");
+        }
+        else
+        { // jsonp
+            reply.headers.emplace_back("Content-Type", "text/javascript; charset=UTF-8");
+            reply.headers.emplace_back("Content-Disposition", "inline; filename=\"response.js\"");
+        }
+    }
+    catch (const std::exception &e)
+    {
+        reply = http::Reply::StockReply(http::Reply::internalServerError);
+        SimpleLogger().Write(logWARNING) << "[server error] code: " << e.what()
+                                         << ", uri: " << req.uri;
+        return;
+    }
+}
+
+void RequestHandler::RegisterRoutingMachine(OSRM *osrm) { routing_machine = osrm; }
--- a/include/osrm/osrm_fwd.hpp
+++ b/include/osrm/osrm_fwd.hpp
@ -1,6 +1,6 @@
 /*

-Copyright (c) 2017, Project OSRM contributors
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification,
@ -25,35 +25,35 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

-#ifndef OSRM_FWD_HPP
-#define OSRM_FWD_HPP
+#ifndef REQUEST_HANDLER_H
+#define REQUEST_HANDLER_H

-// OSRM API forward declarations for usage in interfaces. Exposes forward declarations for:
-// osrm::util::json::Object, osrm::engine::api::XParameters
+#include <string>

-namespace osrm
-{
-
-namespace util::json
-{
-struct Object;
-} // namespace util::json
-
-namespace engine
-{
-namespace api
-{
+template <typename Iterator, class HandlerT> struct APIGrammar;
 struct RouteParameters;
-struct TableParameters;
-struct NearestParameters;
-struct TripParameters;
-struct MatchParameters;
-struct TileParameters;
-} // namespace api
+class OSRM;

-class EngineInterface;
-struct EngineConfig;
-} // namespace engine
-} // namespace osrm
+namespace http
+{
+class Reply;
+struct Request;
+}

-#endif
+class RequestHandler
+{
+
+  public:
+    using APIGrammarParser = APIGrammar<std::string::iterator, RouteParameters>;
+
+    RequestHandler();
+    RequestHandler(const RequestHandler &) = delete;
+
+    void handle_request(const http::Request &req, http::Reply &rep);
+    void RegisterRoutingMachine(OSRM *osrm);
+
+  private:
+    OSRM *routing_machine;
+};
+
+#endif // REQUEST_HANDLER_H
--- a/Server/RequestParser.cpp
+++ b/Server/RequestParser.cpp
@ -0,0 +1,310 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "RequestParser.h"
+
+#include "Http/Request.h"
+
+namespace http
+{
+
+RequestParser::RequestParser() : state_(method_start), header({"", ""}) {}
+
+void RequestParser::Reset() { state_ = method_start; }
+
+boost::tuple<boost::tribool, char *>
+RequestParser::Parse(Request &req, char *begin, char *end, http::CompressionType &compression_type)
+{
+    while (begin != end)
+    {
+        boost::tribool result = consume(req, *begin++, compression_type);
+        if (result || !result)
+        {
+            return boost::make_tuple(result, begin);
+        }
+    }
+    boost::tribool result = boost::indeterminate;
+    return boost::make_tuple(result, begin);
+}
+
+boost::tribool
+RequestParser::consume(Request &req, char input, http::CompressionType &compression_type)
+{
+    switch (state_)
+    {
+    case method_start:
+        if (!isChar(input) || isCTL(input) || isTSpecial(input))
+        {
+            return false;
+        }
+        state_ = method;
+        return boost::indeterminate;
+    case method:
+        if (input == ' ')
+        {
+            state_ = uri;
+            return boost::indeterminate;
+        }
+        if (!isChar(input) || isCTL(input) || isTSpecial(input))
+        {
+            return false;
+        }
+        return boost::indeterminate;
+    case uri_start:
+        if (isCTL(input))
+        {
+            return false;
+        }
+        state_ = uri;
+        req.uri.push_back(input);
+        return boost::indeterminate;
+    case uri:
+        if (input == ' ')
+        {
+            state_ = http_version_h;
+            return boost::indeterminate;
+        }
+        if (isCTL(input))
+        {
+            return false;
+        }
+        req.uri.push_back(input);
+        return boost::indeterminate;
+    case http_version_h:
+        if (input == 'H')
+        {
+            state_ = http_version_t_1;
+            return boost::indeterminate;
+        }
+        return false;
+    case http_version_t_1:
+        if (input == 'T')
+        {
+            state_ = http_version_t_2;
+            return boost::indeterminate;
+        }
+        return false;
+    case http_version_t_2:
+        if (input == 'T')
+        {
+            state_ = http_version_p;
+            return boost::indeterminate;
+        }
+        return false;
+    case http_version_p:
+        if (input == 'P')
+        {
+            state_ = http_version_slash;
+            return boost::indeterminate;
+        }
+        return false;
+    case http_version_slash:
+        if (input == '/')
+        {
+            state_ = http_version_major_start;
+            return boost::indeterminate;
+        }
+        return false;
+    case http_version_major_start:
+        if (isDigit(input))
+        {
+            state_ = http_version_major;
+            return boost::indeterminate;
+        }
+        return false;
+    case http_version_major:
+        if (input == '.')
+        {
+            state_ = http_version_minor_start;
+            return boost::indeterminate;
+        }
+        if (isDigit(input))
+        {
+            return boost::indeterminate;
+        }
+        return false;
+    case http_version_minor_start:
+        if (isDigit(input))
+        {
+            state_ = http_version_minor;
+            return boost::indeterminate;
+        }
+        return false;
+    case http_version_minor:
+        if (input == '\r')
+        {
+            state_ = expecting_newline_1;
+            return boost::indeterminate;
+        }
+        if (isDigit(input))
+        {
+            return boost::indeterminate;
+        }
+        return false;
+    case expecting_newline_1:
+        if (input == '\n')
+        {
+            state_ = header_line_start;
+            return boost::indeterminate;
+        }
+        return false;
+    case header_line_start:
+        if (header.name == "Accept-Encoding")
+        {
+            /* giving gzip precedence over deflate */
+            if (header.value.find("deflate") != std::string::npos)
+            {
+                compression_type = deflateRFC1951;
+            }
+            if (header.value.find("gzip") != std::string::npos)
+            {
+                compression_type = gzipRFC1952;
+            }
+        }
+
+        if ("Referer" == header.name)
+        {
+            req.referrer = header.value;
+        }
+
+        if ("User-Agent" == header.name)
+        {
+            req.agent = header.value;
+        }
+
+        if (input == '\r')
+        {
+            state_ = expecting_newline_3;
+            return boost::indeterminate;
+        }
+        if (!isChar(input) || isCTL(input) || isTSpecial(input))
+        {
+            return false;
+        }
+        state_ = header_name;
+        header.Clear();
+        header.name.push_back(input);
+        return boost::indeterminate;
+    case header_lws:
+        if (input == '\r')
+        {
+            state_ = expecting_newline_2;
+            return boost::indeterminate;
+        }
+        if (input == ' ' || input == '\t')
+        {
+            return boost::indeterminate;
+        }
+        if (isCTL(input))
+        {
+            return false;
+        }
+        state_ = header_value;
+        return boost::indeterminate;
+    case header_name:
+        if (input == ':')
+        {
+            state_ = space_before_header_value;
+            return boost::indeterminate;
+        }
+        if (!isChar(input) || isCTL(input) || isTSpecial(input))
+        {
+            return false;
+        }
+        header.name.push_back(input);
+        return boost::indeterminate;
+    case space_before_header_value:
+        if (input == ' ')
+        {
+            state_ = header_value;
+            return boost::indeterminate;
+        }
+        return false;
+    case header_value:
+        if (input == '\r')
+        {
+            state_ = expecting_newline_2;
+            return boost::indeterminate;
+        }
+        if (isCTL(input))
+        {
+            return false;
+        }
+        header.value.push_back(input);
+        return boost::indeterminate;
+    case expecting_newline_2:
+        if (input == '\n')
+        {
+            state_ = header_line_start;
+            return boost::indeterminate;
+        }
+        return false;
+    default: // expecting_newline_3:
+        return (input == '\n');
+        // default:
+        //     return false;
+    }
+}
+
+inline bool RequestParser::isChar(int character) { return character >= 0 && character <= 127; }
+
+inline bool RequestParser::isCTL(int character)
+{
+    return (character >= 0 && character <= 31) || (character == 127);
+}
+
+inline bool RequestParser::isTSpecial(int character)
+{
+    switch (character)
+    {
+    case '(':
+    case ')':
+    case '<':
+    case '>':
+    case '@':
+    case ',':
+    case ';':
+    case ':':
+    case '\\':
+    case '"':
+    case '/':
+    case '[':
+    case ']':
+    case '?':
+    case '=':
+    case '{':
+    case '}':
+    case ' ':
+    case '\t':
+        return true;
+    default:
+        return false;
+    }
+}
+
+inline bool RequestParser::isDigit(int character) { return character >= '0' && character <= '9'; }
+}
--- a/Server/RequestParser.h
+++ b/Server/RequestParser.h
@ -0,0 +1,90 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef REQUEST_PARSER_H
+#define REQUEST_PARSER_H
+
+#include "Http/CompressionType.h"
+#include <osrm/Header.h>
+
+#include <boost/logic/tribool.hpp>
+#include <boost/tuple/tuple.hpp>
+
+namespace http
+{
+
+struct Request;
+
+class RequestParser
+{
+  public:
+    RequestParser();
+    void Reset();
+
+    boost::tuple<boost::tribool, char *>
+    Parse(Request &req, char *begin, char *end, CompressionType &compression_type);
+
+  private:
+    boost::tribool consume(Request &req, char input, CompressionType &compression_type);
+
+    inline bool isChar(int c);
+
+    inline bool isCTL(int c);
+
+    inline bool isTSpecial(int c);
+
+    inline bool isDigit(int c);
+
+    enum state
+    { method_start,
+      method,
+      uri_start,
+      uri,
+      http_version_h,
+      http_version_t_1,
+      http_version_t_2,
+      http_version_p,
+      http_version_slash,
+      http_version_major_start,
+      http_version_major,
+      http_version_minor_start,
+      http_version_minor,
+      expecting_newline_1,
+      header_line_start,
+      header_lws,
+      header_name,
+      space_before_header_value,
+      header_value,
+      expecting_newline_2,
+      expecting_newline_3 } state_;
+
+    Header header;
+};
+
+} // namespace http
+
+#endif // REQUEST_PARSER_H
--- a/Server/Server.h
+++ b/Server/Server.h
@ -0,0 +1,119 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef SERVER_H
+#define SERVER_H
+
+#include "Connection.h"
+#include "RequestHandler.h"
+
+#include "../Util/cast.hpp"
+#include "../Util/make_unique.hpp"
+#include "../Util/simple_logger.hpp"
+
+#include <boost/asio.hpp>
+#include <boost/bind.hpp>
+
+#include <zlib.h>
+
+#include <functional>
+#include <memory>
+#include <thread>
+#include <vector>
+
+class Server
+{
+  public:
+
+    // Note: returns a shared instead of a unique ptr as it is captured in a lambda somewhere else
+    static std::shared_ptr<Server> CreateServer(std::string &ip_address, int ip_port, unsigned requested_num_threads)
+    {
+        SimpleLogger().Write() << "http 1.1 compression handled by zlib version " << zlibVersion();
+        const unsigned hardware_threads = std::max(1u, std::thread::hardware_concurrency());
+        const unsigned real_num_threads = std::min(hardware_threads, requested_num_threads);
+        return std::make_shared<Server>(ip_address, ip_port, real_num_threads);
+    }
+
+    explicit Server(const std::string &address, const int port, const unsigned thread_pool_size)
+        : thread_pool_size(thread_pool_size), acceptor(io_service),
+          new_connection(std::make_shared<http::Connection>(io_service, request_handler)), request_handler()
+    {
+        const std::string port_string = cast::integral_to_string(port);
+
+        boost::asio::ip::tcp::resolver resolver(io_service);
+        boost::asio::ip::tcp::resolver::query query(address, port_string);
+        boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
+
+        acceptor.open(endpoint.protocol());
+        acceptor.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
+        acceptor.bind(endpoint);
+        acceptor.listen();
+        acceptor.async_accept(
+            new_connection->socket(),
+            boost::bind(&Server::HandleAccept, this, boost::asio::placeholders::error));
+    }
+
+    void Run()
+    {
+        std::vector<std::shared_ptr<std::thread>> threads;
+        for (unsigned i = 0; i < thread_pool_size; ++i)
+        {
+            std::shared_ptr<std::thread> thread = std::make_shared<std::thread>(
+                boost::bind(&boost::asio::io_service::run, &io_service));
+            threads.push_back(thread);
+        }
+        for (auto thread : threads)
+        {
+            thread->join();
+        }
+    }
+
+    void Stop() { io_service.stop(); }
+
+    RequestHandler &GetRequestHandlerPtr() { return request_handler; }
+
+  private:
+    void HandleAccept(const boost::system::error_code &e)
+    {
+        if (!e)
+        {
+            new_connection->start();
+            new_connection = std::make_shared<http::Connection>(io_service, request_handler);
+            acceptor.async_accept(
+                new_connection->socket(),
+                boost::bind(&Server::HandleAccept, this, boost::asio::placeholders::error));
+        }
+    }
+
+    unsigned thread_pool_size;
+    boost::asio::io_service io_service;
+    boost::asio::ip::tcp::acceptor acceptor;
+    std::shared_ptr<http::Connection> new_connection;
+    RequestHandler request_handler;
+};
+
+#endif // SERVER_H
--- a/UnitTests/Algorithms/DouglasPeuckerTest.cpp
+++ b/UnitTests/Algorithms/DouglasPeuckerTest.cpp
@ -0,0 +1,109 @@
+/*
+
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "../../algorithms/douglas_peucker.hpp"
+#include "../../data_structures/segment_information.hpp"
+#include "../../Include/osrm/Coordinate.h"
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/test_case_template.hpp>
+#include <boost/mpl/list.hpp>
+
+#include <iostream>
+
+BOOST_AUTO_TEST_SUITE(douglas_peucker)
+
+SegmentInformation getTestInfo(int lat, int lon, bool necessary)
+{
+    return SegmentInformation(FixedPointCoordinate(lat, lon),
+                              0, 0, 0, TurnInstruction::HeadOn, necessary, false, 0);
+}
+
+BOOST_AUTO_TEST_CASE(all_necessary_test)
+{
+    /*
+     *     x
+     *    / \
+     *   x   \
+     *  /     \
+     * x       x
+     */
+    std::vector<SegmentInformation> info = {
+        getTestInfo(5, 5, true),
+        getTestInfo(6, 6, true),
+        getTestInfo(10, 10, true),
+        getTestInfo(5, 15, true)
+    };
+    DouglasPeucker dp;
+    for (unsigned z = 0; z < DOUGLAS_PEUCKER_THRESHOLDS.size(); z++)
+    {
+        dp.Run(info, z);
+        for (const auto& i : info)
+        {
+            BOOST_CHECK_EQUAL(i.necessary, true);
+        }
+    }
+}
+
+BOOST_AUTO_TEST_CASE(remove_second_node_test)
+{
+    DouglasPeucker dp;
+    for (unsigned z = 0; z < DOUGLAS_PEUCKER_THRESHOLDS.size(); z++)
+    {
+        /*
+         *   x--x
+         *   |   \
+         * x-x    x
+         *        |
+         *        x
+         */
+        std::vector<SegmentInformation> info = {
+            getTestInfo(5  * COORDINATE_PRECISION,
+                        5  * COORDINATE_PRECISION, true),
+            getTestInfo(5  * COORDINATE_PRECISION,
+                        5  * COORDINATE_PRECISION + DOUGLAS_PEUCKER_THRESHOLDS[z], false),
+            getTestInfo(10 * COORDINATE_PRECISION,
+                        10 * COORDINATE_PRECISION, false),
+            getTestInfo(10 * COORDINATE_PRECISION,
+                        10 + COORDINATE_PRECISION + DOUGLAS_PEUCKER_THRESHOLDS[z] * 2, false),
+            getTestInfo(5  * COORDINATE_PRECISION,
+                        15 * COORDINATE_PRECISION, false),
+            getTestInfo(5  * COORDINATE_PRECISION + DOUGLAS_PEUCKER_THRESHOLDS[z],
+                        15 * COORDINATE_PRECISION, true),
+        };
+        BOOST_TEST_MESSAGE("Threshold (" << z << "): " << DOUGLAS_PEUCKER_THRESHOLDS[z]);
+        dp.Run(info, z);
+        BOOST_CHECK_EQUAL(info[0].necessary, true);
+        BOOST_CHECK_EQUAL(info[1].necessary, false);
+        BOOST_CHECK_EQUAL(info[2].necessary, true);
+        BOOST_CHECK_EQUAL(info[3].necessary, true);
+        BOOST_CHECK_EQUAL(info[4].necessary, false);
+        BOOST_CHECK_EQUAL(info[5].necessary, true);
+    }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
--- a/UnitTests/algorithm_tests.cpp
+++ b/UnitTests/algorithm_tests.cpp
@ -1,6 +1,6 @@
 /*

-Copyright (c) 2017, Project OSRM contributors
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification,
@ -25,14 +25,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

-#ifndef OSRM_APPROACH_HPP
-#define OSRM_APPROACH_HPP
+#define BOOST_TEST_MODULE algorithm tests

-#include "engine/approach.hpp"
+#include <boost/test/unit_test.hpp>

-namespace osrm
-{
-using engine::Approach;
-}
+/*
+ * This file will contain an automatically generated main function.
+ */

-#endif
--- a/UnitTests/data_structures/BinaryHeapTest.cpp
+++ b/UnitTests/data_structures/BinaryHeapTest.cpp
@ -1,29 +1,52 @@
-#include "util/query_heap.hpp"
-#include "util/typedefs.hpp"
+/*
+
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "../../data_structures/binary_heap.hpp"
+#include "../../typedefs.h"

-#include <boost/mpl/list.hpp>
 #include <boost/test/unit_test.hpp>
+#include <boost/test/test_case_template.hpp>
+#include <boost/mpl/list.hpp>

-#include <algorithm>
-#include <limits>
 #include <random>
-#include <vector>

 BOOST_AUTO_TEST_SUITE(binary_heap)

-using namespace osrm;
-using namespace osrm::util;
-
 struct TestData
 {
    unsigned value;
 };

-using TestNodeID = NodeID;
-using TestKey = int;
-using TestWeight = int;
-using storage_types =
-    boost::mpl::list<ArrayStorage<TestNodeID, TestKey>, UnorderedMapStorage<TestNodeID, TestKey>>;
+typedef NodeID TestNodeID;
+typedef int TestKey;
+typedef int TestWeight;
+typedef boost::mpl::list<ArrayStorage<TestNodeID, TestKey>,
+                         MapStorage<TestNodeID, TestKey>,
+                         UnorderedMapStorage<TestNodeID, TestKey>> storage_types;

 template <unsigned NUM_ELEM> struct RandomDataFixture
 {
@ -53,7 +76,7 @@ constexpr unsigned NUM_NODES = 100;

 BOOST_FIXTURE_TEST_CASE_TEMPLATE(insert_test, T, storage_types, RandomDataFixture<NUM_NODES>)
 {
-    QueryHeap<TestNodeID, TestKey, TestWeight, TestData, T> heap(NUM_NODES);
+    BinaryHeap<TestNodeID, TestKey, TestWeight, TestData, T> heap(NUM_NODES);

    TestWeight min_weight = std::numeric_limits<TestWeight>::max();
    TestNodeID min_id;
@ -86,7 +109,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(insert_test, T, storage_types, RandomDataFixtur

 BOOST_FIXTURE_TEST_CASE_TEMPLATE(delete_min_test, T, storage_types, RandomDataFixture<NUM_NODES>)
 {
-    QueryHeap<TestNodeID, TestKey, TestWeight, TestData, T> heap(NUM_NODES);
+    BinaryHeap<TestNodeID, TestKey, TestWeight, TestData, T> heap(NUM_NODES);

    for (unsigned idx : order)
    {
@ -108,7 +131,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(delete_min_test, T, storage_types, RandomDataFi

 BOOST_FIXTURE_TEST_CASE_TEMPLATE(delete_all_test, T, storage_types, RandomDataFixture<NUM_NODES>)
 {
-    QueryHeap<TestNodeID, TestKey, TestWeight, TestData, T> heap(NUM_NODES);
+    BinaryHeap<TestNodeID, TestKey, TestWeight, TestData, T> heap(NUM_NODES);

    for (unsigned idx : order)
    {
@ -122,7 +145,7 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(delete_all_test, T, storage_types, RandomDataFi

 BOOST_FIXTURE_TEST_CASE_TEMPLATE(decrease_key_test, T, storage_types, RandomDataFixture<10>)
 {
-    QueryHeap<TestNodeID, TestKey, TestWeight, TestData, T> heap(10);
+    BinaryHeap<TestNodeID, TestKey, TestWeight, TestData, T> heap(10);

    for (unsigned idx : order)
    {
@ -142,7 +165,6 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(decrease_key_test, T, storage_types, RandomData
        {
            heap.DecreaseKey(id, weights[id]);
            BOOST_CHECK_EQUAL(heap.Min(), min_id);
-            BOOST_CHECK_EQUAL(heap.MinKey(), min_weight);
            weights[id]--;
        }

@ -150,7 +172,6 @@ BOOST_FIXTURE_TEST_CASE_TEMPLATE(decrease_key_test, T, storage_types, RandomData
        weights[id] -= 2;
        heap.DecreaseKey(id, weights[id]);
        BOOST_CHECK_EQUAL(heap.Min(), id);
-        BOOST_CHECK_EQUAL(heap.MinKey(), weights[id]);
    }
 }

--- a/UnitTests/data_structures/RangeTableTest.cpp
+++ b/UnitTests/data_structures/RangeTableTest.cpp
@ -1,22 +1,46 @@
-#include "util/range_table.hpp"
-#include "util/typedefs.hpp"
+/*
+
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "../../data_structures/range_table.hpp"
+#include "../../typedefs.h"

 #include <boost/test/unit_test.hpp>
+#include <boost/test/test_case_template.hpp>

 #include <numeric>
-#include <vector>
+
+constexpr unsigned BLOCK_SIZE = 16;
+typedef RangeTable<BLOCK_SIZE, false> TestRangeTable;

 BOOST_AUTO_TEST_SUITE(range_table)

-using namespace osrm;
-using namespace osrm::util;
-
-constexpr unsigned BLOCK_SIZE = 16;
-using TestRangeTable = RangeTable<BLOCK_SIZE, osrm::storage::Ownership::Container>;
-
-void ConstructionTest(const std::vector<unsigned> &lengths, const std::vector<unsigned> &offsets)
+void ConstructionTest(std::vector<unsigned> lengths, std::vector<unsigned> offsets)
 {
-    BOOST_CHECK_EQUAL(lengths.size(), offsets.size() - 1);
+    BOOST_ASSERT(lengths.size() == offsets.size() - 1);

    TestRangeTable table(lengths);

@ -28,9 +52,8 @@ void ConstructionTest(const std::vector<unsigned> &lengths, const std::vector<un
    }
 }

-void ComputeLengthsOffsets(std::vector<unsigned> &lengths,
-                           std::vector<unsigned> &offsets,
-                           unsigned num)
+void
+ComputeLengthsOffsets(std::vector<unsigned> &lengths, std::vector<unsigned> &offsets, unsigned num)
 {
    lengths.resize(num);
    offsets.resize(num + 1);
@ -50,12 +73,31 @@ void ComputeLengthsOffsets(std::vector<unsigned> &lengths,
    BOOST_TEST_MESSAGE(o_ss.str());
 }

+BOOST_AUTO_TEST_CASE(serialization_test)
+{
+    std::vector<unsigned> lengths;
+    std::vector<unsigned> offsets;
+    ComputeLengthsOffsets(lengths, offsets, (BLOCK_SIZE + 1) * 10);
+
+    TestRangeTable in_table(lengths);
+    TestRangeTable out_table;
+
+    std::stringstream ss;
+    ss << in_table;
+    ss >> out_table;
+
+    for (unsigned i = 0; i < lengths.size(); i++)
+    {
+        auto range = out_table.GetRange(i);
+        BOOST_CHECK_EQUAL(range.front(), offsets[i]);
+        BOOST_CHECK_EQUAL(range.back() + 1, offsets[i + 1]);
+    }
+}
+
 BOOST_AUTO_TEST_CASE(construction_test)
 {
    // only offset empty block
-    std::vector<unsigned> empty_lengths;
-    empty_lengths.push_back(1);
-    ConstructionTest(empty_lengths, {0, 1});
+    ConstructionTest({1}, {0, 1});
    // first block almost full => sentinel is last element of block
    // [0] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, (16)}
    std::vector<unsigned> almost_full_lengths;
--- a/UnitTests/data_structures/StaticGraphTest.cpp
+++ b/UnitTests/data_structures/StaticGraphTest.cpp
@ -0,0 +1,191 @@
+/*
+
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "../../data_structures/static_graph.hpp"
+#include "../../typedefs.h"
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/test_case_template.hpp>
+#include <boost/mpl/list.hpp>
+
+#include <random>
+#include <unordered_map>
+
+BOOST_AUTO_TEST_SUITE(static_graph)
+
+struct TestData
+{
+    EdgeID id;
+    bool shortcut;
+    unsigned distance;
+};
+
+struct TestEdge
+{
+    unsigned source;
+    unsigned target;
+    unsigned distance;
+};
+
+typedef StaticGraph<TestData> TestStaticGraph;
+typedef TestStaticGraph::NodeArrayEntry TestNodeArrayEntry;
+typedef TestStaticGraph::EdgeArrayEntry TestEdgeArrayEntry;
+typedef TestStaticGraph::InputEdge TestInputEdge;
+
+constexpr unsigned TEST_NUM_NODES = 100;
+constexpr unsigned TEST_NUM_EDGES = 500;
+// Choosen by a fair W20 dice roll (this value is completely arbitrary)
+constexpr unsigned RANDOM_SEED = 15;
+
+template <unsigned NUM_NODES, unsigned NUM_EDGES> struct RandomArrayEntryFixture
+{
+    RandomArrayEntryFixture()
+    {
+        std::mt19937 g(RANDOM_SEED);
+
+        std::uniform_int_distribution<> edge_udist(0, NUM_EDGES - 1);
+        std::vector<unsigned> offsets;
+        for (unsigned i = 0; i < NUM_NODES; i++)
+        {
+            offsets.push_back(edge_udist(g));
+        }
+        std::sort(offsets.begin(), offsets.end());
+        // add sentinel
+        offsets.push_back(offsets.back());
+
+        // extract interval lengths
+        for (unsigned i = 0; i < offsets.size() - 1; i++)
+        {
+            lengths.push_back(offsets[i + 1] - offsets[i]);
+        }
+        lengths.push_back(NUM_EDGES - offsets[NUM_NODES - 1]);
+
+        for (auto offset : offsets)
+        {
+            nodes.emplace_back(TestNodeArrayEntry{offset});
+        }
+
+        std::uniform_int_distribution<> lengths_udist(0, 100000);
+        std::uniform_int_distribution<> node_udist(0, NUM_NODES - 1);
+        for (unsigned i = 0; i < NUM_EDGES; i++)
+        {
+            edges.emplace_back(
+                TestEdgeArrayEntry{static_cast<unsigned>(node_udist(g)),
+                                   TestData{i, false, static_cast<unsigned>(lengths_udist(g))}});
+        }
+
+        for (unsigned i = 0; i < NUM_NODES; i++)
+            order.push_back(i);
+        std::shuffle(order.begin(), order.end(), g);
+    }
+
+    typename ShM<TestNodeArrayEntry, false>::vector nodes;
+    typename ShM<TestEdgeArrayEntry, false>::vector edges;
+    std::vector<unsigned> lengths;
+    std::vector<unsigned> order;
+};
+
+typedef RandomArrayEntryFixture<TEST_NUM_NODES, TEST_NUM_EDGES> TestRandomArrayEntryFixture;
+
+BOOST_FIXTURE_TEST_CASE(array_test, TestRandomArrayEntryFixture)
+{
+    auto nodes_copy = nodes;
+
+    TestStaticGraph graph(nodes, edges);
+
+    BOOST_CHECK_EQUAL(graph.GetNumberOfEdges(), TEST_NUM_EDGES);
+    BOOST_CHECK_EQUAL(graph.GetNumberOfNodes(), TEST_NUM_NODES);
+
+    for (auto idx : order)
+    {
+        BOOST_CHECK_EQUAL(graph.BeginEdges((NodeID)idx), nodes_copy[idx].first_edge);
+        BOOST_CHECK_EQUAL(graph.EndEdges((NodeID)idx), nodes_copy[idx + 1].first_edge);
+        BOOST_CHECK_EQUAL(graph.GetOutDegree((NodeID)idx), lengths[idx]);
+    }
+}
+
+TestStaticGraph GraphFromEdgeList(const std::vector<TestEdge> &edges)
+{
+    std::vector<TestInputEdge> input_edges;
+    unsigned i = 0;
+    unsigned num_nodes = 0;
+    for (const auto &e : edges)
+    {
+        input_edges.push_back(TestInputEdge{e.source, e.target, TestData{i++, false, e.distance}});
+
+        num_nodes = std::max(num_nodes, std::max(e.source, e.target));
+    }
+
+    return TestStaticGraph(num_nodes, input_edges);
+}
+
+BOOST_AUTO_TEST_CASE(find_test)
+{
+    /*
+     *  (0) -1-> (1)
+     *  ^ ^
+     *  2 1
+     *  | |
+     *  (3) -4-> (4)
+     *      <-3-
+     */
+    TestStaticGraph simple_graph = GraphFromEdgeList({TestEdge{0, 1, 1},
+                                                      TestEdge{3, 0, 2},
+                                                      TestEdge{3, 4, 4},
+                                                      TestEdge{4, 3, 3},
+                                                      TestEdge{3, 0, 1}});
+
+    auto eit = simple_graph.FindEdge(0, 1);
+    BOOST_CHECK_EQUAL(simple_graph.GetEdgeData(eit).id, 0);
+
+    eit = simple_graph.FindEdge(1, 0);
+    BOOST_CHECK_EQUAL(eit, SPECIAL_EDGEID);
+
+    eit = simple_graph.FindEdgeInEitherDirection(1, 0);
+    BOOST_CHECK_EQUAL(simple_graph.GetEdgeData(eit).id, 0);
+
+    bool reverse = false;
+    eit = simple_graph.FindEdgeIndicateIfReverse(1, 0, reverse);
+    BOOST_CHECK_EQUAL(simple_graph.GetEdgeData(eit).id, 0);
+    BOOST_CHECK(reverse);
+
+    eit = simple_graph.FindEdge(3, 1);
+    BOOST_CHECK_EQUAL(eit, SPECIAL_EDGEID);
+    eit = simple_graph.FindEdge(0, 4);
+    BOOST_CHECK_EQUAL(eit, SPECIAL_EDGEID);
+
+    eit = simple_graph.FindEdge(3, 4);
+    BOOST_CHECK_EQUAL(simple_graph.GetEdgeData(eit).id, 2);
+    eit = simple_graph.FindEdgeInEitherDirection(3, 4);
+    // I think this is wrong behaviour! Should be 3.
+    BOOST_CHECK_EQUAL(simple_graph.GetEdgeData(eit).id, 2);
+
+    eit = simple_graph.FindEdge(3, 0);
+    BOOST_CHECK_EQUAL(simple_graph.GetEdgeData(eit).id, 4);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
--- a/UnitTests/data_structures/StaticRTreeTest.cpp
+++ b/UnitTests/data_structures/StaticRTreeTest.cpp
@ -0,0 +1,488 @@
+/*
+
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "../../data_structures/static_rtree.hpp"
+#include "../../data_structures/query_node.hpp"
+#include "../../data_structures/edge_based_node.hpp"
+#include "../../Util/floating_point.hpp"
+#include "../../typedefs.h"
+
+#include <osrm/Coordinate.h>
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/test_case_template.hpp>
+#include <boost/mpl/list.hpp>
+
+#include <random>
+#include <unordered_set>
+
+BOOST_AUTO_TEST_SUITE(static_rtree)
+
+constexpr uint32_t TEST_BRANCHING_FACTOR = 8;
+constexpr uint32_t TEST_LEAF_NODE_SIZE = 64;
+
+typedef EdgeBasedNode TestData;
+typedef StaticRTree<TestData,
+                    std::vector<FixedPointCoordinate>,
+                    false,
+                    TEST_BRANCHING_FACTOR,
+                    TEST_LEAF_NODE_SIZE> TestStaticRTree;
+
+// Choosen by a fair W20 dice roll (this value is completely arbitrary)
+constexpr unsigned RANDOM_SEED = 42;
+static const int32_t WORLD_MIN_LAT = -90 * COORDINATE_PRECISION;
+static const int32_t WORLD_MAX_LAT = 90 * COORDINATE_PRECISION;
+static const int32_t WORLD_MIN_LON = -180 * COORDINATE_PRECISION;
+static const int32_t WORLD_MAX_LON = 180 * COORDINATE_PRECISION;
+
+class LinearSearchNN
+{
+  public:
+    LinearSearchNN(const std::shared_ptr<std::vector<FixedPointCoordinate>> &coords,
+                   const std::vector<TestData> &edges)
+        : coords(coords), edges(edges)
+    {
+    }
+
+    bool LocateClosestEndPointForCoordinate(const FixedPointCoordinate &input_coordinate,
+                                            FixedPointCoordinate &result_coordinate)
+    {
+        float min_dist = std::numeric_limits<float>::max();
+        FixedPointCoordinate min_coord;
+        for (const TestData &e : edges)
+        {
+            const FixedPointCoordinate &start = coords->at(e.u);
+            const FixedPointCoordinate &end = coords->at(e.v);
+            float distance = FixedPointCoordinate::ApproximateEuclideanDistance(
+                input_coordinate.lat, input_coordinate.lon, start.lat, start.lon);
+            if (distance < min_dist)
+            {
+                min_coord = start;
+                min_dist = distance;
+            }
+
+            distance = FixedPointCoordinate::ApproximateEuclideanDistance(
+                input_coordinate.lat, input_coordinate.lon, end.lat, end.lon);
+            if (distance < min_dist)
+            {
+                min_coord = end;
+                min_dist = distance;
+            }
+        }
+
+        result_coordinate = min_coord;
+        return result_coordinate.is_valid();
+    }
+
+    bool FindPhantomNodeForCoordinate(const FixedPointCoordinate &input_coordinate,
+                                      PhantomNode &result_phantom_node,
+                                      const unsigned zoom_level)
+    {
+        float min_dist = std::numeric_limits<float>::max();
+        TestData nearest_edge;
+        for (const TestData &e : edges)
+        {
+            if (e.component_id != 0)
+                continue;
+
+            float current_ratio = 0.;
+            FixedPointCoordinate nearest;
+            const float current_perpendicular_distance =
+                FixedPointCoordinate::ComputePerpendicularDistance(
+                    coords->at(e.u), coords->at(e.v), input_coordinate, nearest, current_ratio);
+
+            if ((current_perpendicular_distance < min_dist) &&
+                !osrm::epsilon_compare(current_perpendicular_distance, min_dist))
+            { // found a new minimum
+                min_dist = current_perpendicular_distance;
+                result_phantom_node = {e.forward_edge_based_node_id,
+                                       e.reverse_edge_based_node_id,
+                                       e.name_id,
+                                       e.forward_weight,
+                                       e.reverse_weight,
+                                       e.forward_offset,
+                                       e.reverse_offset,
+                                       e.packed_geometry_id,
+                                       e.component_id,
+                                       nearest,
+                                       e.fwd_segment_position,
+                                       e.forward_travel_mode,
+                                       e.backward_travel_mode};
+                nearest_edge = e;
+            }
+        }
+
+        if (result_phantom_node.location.is_valid())
+        {
+            // Hack to fix rounding errors and wandering via nodes.
+            if (1 == std::abs(input_coordinate.lon - result_phantom_node.location.lon))
+            {
+                result_phantom_node.location.lon = input_coordinate.lon;
+            }
+            if (1 == std::abs(input_coordinate.lat - result_phantom_node.location.lat))
+            {
+                result_phantom_node.location.lat = input_coordinate.lat;
+            }
+
+            const float distance_1 = FixedPointCoordinate::ApproximateEuclideanDistance(
+                coords->at(nearest_edge.u), result_phantom_node.location);
+            const float distance_2 = FixedPointCoordinate::ApproximateEuclideanDistance(
+                coords->at(nearest_edge.u), coords->at(nearest_edge.v));
+            const float ratio = std::min(1.f, distance_1 / distance_2);
+
+            if (SPECIAL_NODEID != result_phantom_node.forward_node_id)
+            {
+                result_phantom_node.forward_weight *= ratio;
+            }
+            if (SPECIAL_NODEID != result_phantom_node.reverse_node_id)
+            {
+                result_phantom_node.reverse_weight *= (1. - ratio);
+            }
+        }
+
+        return result_phantom_node.location.is_valid();
+    }
+
+  private:
+    const std::shared_ptr<std::vector<FixedPointCoordinate>> &coords;
+    const std::vector<TestData> &edges;
+};
+
+template <unsigned NUM_NODES, unsigned NUM_EDGES> struct RandomGraphFixture
+{
+    struct TupleHash
+    {
+        typedef std::pair<unsigned, unsigned> argument_type;
+        typedef std::size_t result_type;
+
+        result_type operator()(const argument_type &t) const
+        {
+            std::size_t val{0};
+            boost::hash_combine(val, t.first);
+            boost::hash_combine(val, t.second);
+            return val;
+        }
+    };
+
+    RandomGraphFixture() : coords(std::make_shared<std::vector<FixedPointCoordinate>>())
+    {
+        BOOST_TEST_MESSAGE("Constructing " << NUM_NODES << " nodes and " << NUM_EDGES << " edges.");
+
+        std::mt19937 g(RANDOM_SEED);
+
+        std::uniform_int_distribution<> lat_udist(WORLD_MIN_LAT, WORLD_MAX_LAT);
+        std::uniform_int_distribution<> lon_udist(WORLD_MIN_LON, WORLD_MAX_LON);
+
+        for (unsigned i = 0; i < NUM_NODES; i++)
+        {
+            int lat = lat_udist(g);
+            int lon = lon_udist(g);
+            nodes.emplace_back(QueryNode(lat, lon, i));
+            coords->emplace_back(FixedPointCoordinate(lat, lon));
+        }
+
+        std::uniform_int_distribution<> edge_udist(0, nodes.size() - 1);
+
+        std::unordered_set<std::pair<unsigned, unsigned>, TupleHash> used_edges;
+
+        while (edges.size() < NUM_EDGES)
+        {
+            TestData data;
+            data.u = edge_udist(g);
+            data.v = edge_udist(g);
+            if (used_edges.find(std::pair<unsigned, unsigned>(
+                    std::min(data.u, data.v), std::max(data.u, data.v))) == used_edges.end())
+            {
+                data.component_id = 0;
+                edges.emplace_back(data);
+                used_edges.emplace(std::min(data.u, data.v), std::max(data.u, data.v));
+            }
+        }
+    }
+
+    std::vector<QueryNode> nodes;
+    std::shared_ptr<std::vector<FixedPointCoordinate>> coords;
+    std::vector<TestData> edges;
+};
+
+struct GraphFixture
+{
+    GraphFixture(const std::vector<std::pair<float, float>> &input_coords,
+                 const std::vector<std::pair<unsigned, unsigned>> &input_edges)
+        : coords(std::make_shared<std::vector<FixedPointCoordinate>>())
+    {
+
+        for (unsigned i = 0; i < input_coords.size(); i++)
+        {
+            FixedPointCoordinate c(input_coords[i].first * COORDINATE_PRECISION,
+                                   input_coords[i].second * COORDINATE_PRECISION);
+            coords->emplace_back(c);
+            nodes.emplace_back(QueryNode(c.lat, c.lon, i));
+        }
+
+        for (const auto &pair : input_edges)
+        {
+            TestData d;
+            d.u = pair.first;
+            d.v = pair.second;
+            edges.emplace_back(d);
+        }
+    }
+
+    std::vector<QueryNode> nodes;
+    std::shared_ptr<std::vector<FixedPointCoordinate>> coords;
+    std::vector<TestData> edges;
+};
+
+typedef RandomGraphFixture<TEST_LEAF_NODE_SIZE * 3, TEST_LEAF_NODE_SIZE / 2>
+TestRandomGraphFixture_LeafHalfFull;
+typedef RandomGraphFixture<TEST_LEAF_NODE_SIZE * 5, TEST_LEAF_NODE_SIZE>
+TestRandomGraphFixture_LeafFull;
+typedef RandomGraphFixture<TEST_LEAF_NODE_SIZE * 10, TEST_LEAF_NODE_SIZE * 2>
+TestRandomGraphFixture_TwoLeaves;
+typedef RandomGraphFixture<TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 3,
+                           TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR>
+TestRandomGraphFixture_Branch;
+typedef RandomGraphFixture<TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 3,
+                           TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 2>
+TestRandomGraphFixture_MultipleLevels;
+
+template <typename RTreeT>
+void simple_verify_rtree(RTreeT &rtree,
+                         const std::shared_ptr<std::vector<FixedPointCoordinate>> &coords,
+                         const std::vector<TestData> &edges)
+{
+    BOOST_TEST_MESSAGE("Verify end points");
+    for (const auto &e : edges)
+    {
+        FixedPointCoordinate result_u, result_v;
+        const FixedPointCoordinate &pu = coords->at(e.u);
+        const FixedPointCoordinate &pv = coords->at(e.v);
+        bool found_u = rtree.LocateClosestEndPointForCoordinate(pu, result_u, 1);
+        bool found_v = rtree.LocateClosestEndPointForCoordinate(pv, result_v, 1);
+        BOOST_CHECK(found_u && found_v);
+        float dist_u = FixedPointCoordinate::ApproximateEuclideanDistance(
+            result_u.lat, result_u.lon, pu.lat, pu.lon);
+        BOOST_CHECK_LE(dist_u, std::numeric_limits<float>::epsilon());
+        float dist_v = FixedPointCoordinate::ApproximateEuclideanDistance(
+            result_v.lat, result_v.lon, pv.lat, pv.lon);
+        BOOST_CHECK_LE(dist_v, std::numeric_limits<float>::epsilon());
+    }
+}
+
+template <typename RTreeT>
+void sampling_verify_rtree(RTreeT &rtree, LinearSearchNN &lsnn, unsigned num_samples)
+{
+    std::mt19937 g(RANDOM_SEED);
+    std::uniform_int_distribution<> lat_udist(WORLD_MIN_LAT, WORLD_MAX_LAT);
+    std::uniform_int_distribution<> lon_udist(WORLD_MIN_LON, WORLD_MAX_LON);
+    std::vector<FixedPointCoordinate> queries;
+    for (unsigned i = 0; i < num_samples; i++)
+    {
+        queries.emplace_back(FixedPointCoordinate(lat_udist(g), lon_udist(g)));
+    }
+
+    BOOST_TEST_MESSAGE("Sampling queries");
+    for (const auto &q : queries)
+    {
+        FixedPointCoordinate result_rtree;
+        rtree.LocateClosestEndPointForCoordinate(q, result_rtree, 1);
+        FixedPointCoordinate result_ln;
+        lsnn.LocateClosestEndPointForCoordinate(q, result_ln);
+        BOOST_CHECK_EQUAL(result_ln, result_rtree);
+
+        PhantomNode phantom_rtree;
+        rtree.FindPhantomNodeForCoordinate(q, phantom_rtree, 1);
+        PhantomNode phantom_ln;
+        lsnn.FindPhantomNodeForCoordinate(q, phantom_ln, 1);
+        BOOST_CHECK_EQUAL(phantom_rtree, phantom_ln);
+    }
+}
+
+template <typename FixtureT, typename RTreeT = TestStaticRTree>
+void build_rtree(const std::string &prefix,
+                 FixtureT *fixture,
+                 std::string &leaves_path,
+                 std::string &nodes_path)
+{
+    nodes_path = prefix + ".ramIndex";
+    leaves_path = prefix + ".fileIndex";
+    const std::string coords_path = prefix + ".nodes";
+
+    boost::filesystem::ofstream node_stream(coords_path, std::ios::binary);
+    const unsigned num_nodes = fixture->nodes.size();
+    node_stream.write((char *)&num_nodes, sizeof(unsigned));
+    node_stream.write((char *)&(fixture->nodes[0]), num_nodes * sizeof(QueryNode));
+    node_stream.close();
+
+    RTreeT r(fixture->edges, nodes_path, leaves_path, fixture->nodes);
+}
+
+template <typename FixtureT, typename RTreeT = TestStaticRTree>
+void construction_test(const std::string &prefix, FixtureT *fixture)
+{
+    std::string leaves_path;
+    std::string nodes_path;
+    build_rtree<FixtureT, RTreeT>(prefix, fixture, leaves_path, nodes_path);
+    RTreeT rtree(nodes_path, leaves_path, fixture->coords);
+    LinearSearchNN lsnn(fixture->coords, fixture->edges);
+
+    simple_verify_rtree(rtree, fixture->coords, fixture->edges);
+    sampling_verify_rtree(rtree, lsnn, 100);
+}
+
+BOOST_FIXTURE_TEST_CASE(construct_half_leaf_test, TestRandomGraphFixture_LeafHalfFull)
+{
+    construction_test("test_1", this);
+}
+
+BOOST_FIXTURE_TEST_CASE(construct_full_leaf_test, TestRandomGraphFixture_LeafFull)
+{
+    construction_test("test_2", this);
+}
+
+BOOST_FIXTURE_TEST_CASE(construct_two_leaves_test, TestRandomGraphFixture_TwoLeaves)
+{
+    construction_test("test_3", this);
+}
+
+BOOST_FIXTURE_TEST_CASE(construct_branch_test, TestRandomGraphFixture_Branch)
+{
+    construction_test("test_4", this);
+}
+
+BOOST_FIXTURE_TEST_CASE(construct_multiple_levels_test, TestRandomGraphFixture_MultipleLevels)
+{
+    construction_test("test_5", this);
+}
+
+/*
+ * Bug: If you querry a point that lies between two BBs that have a gap,
+ * one BB will be pruned, even if it could contain a nearer match.
+ */
+BOOST_AUTO_TEST_CASE(regression_test)
+{
+    typedef std::pair<float, float> Coord;
+    typedef std::pair<unsigned, unsigned> Edge;
+    GraphFixture fixture({
+                          Coord(40.0, 0.0),
+                          Coord(35.0, 5.0),
+
+                          Coord(5.0, 5.0),
+                          Coord(0.0, 10.0),
+
+                          Coord(20.0, 10.0),
+                          Coord(20.0, 5.0),
+
+                          Coord(40.0, 100.0),
+                          Coord(35.0, 105.0),
+
+                          Coord(5.0, 105.0),
+                          Coord(0.0, 110.0),
+                         },
+                         {Edge(0, 1), Edge(2, 3), Edge(4, 5), Edge(6, 7), Edge(8, 9)});
+
+    typedef StaticRTree<TestData, std::vector<FixedPointCoordinate>, false, 2, 3> MiniStaticRTree;
+
+    std::string leaves_path;
+    std::string nodes_path;
+    build_rtree<GraphFixture, MiniStaticRTree>(
+        "test_regression", &fixture, leaves_path, nodes_path);
+    MiniStaticRTree rtree(nodes_path, leaves_path, fixture.coords);
+
+    // query a node just right of the center of the gap
+    FixedPointCoordinate input(20.0 * COORDINATE_PRECISION, 55.1 * COORDINATE_PRECISION);
+    FixedPointCoordinate result;
+    rtree.LocateClosestEndPointForCoordinate(input, result, 1);
+    FixedPointCoordinate result_ln;
+    LinearSearchNN lsnn(fixture.coords, fixture.edges);
+    lsnn.LocateClosestEndPointForCoordinate(input, result_ln);
+
+    // TODO: reactivate
+    // BOOST_CHECK_EQUAL(result_ln, result);
+}
+
+void TestRectangle(double width, double height, double center_lat, double center_lon)
+{
+    FixedPointCoordinate center(center_lat * COORDINATE_PRECISION,
+                                center_lon * COORDINATE_PRECISION);
+
+    TestStaticRTree::RectangleT rect;
+    rect.min_lat = center.lat - height / 2.0 * COORDINATE_PRECISION;
+    rect.max_lat = center.lat + height / 2.0 * COORDINATE_PRECISION;
+    rect.min_lon = center.lon - width / 2.0 * COORDINATE_PRECISION;
+    rect.max_lon = center.lon + width / 2.0 * COORDINATE_PRECISION;
+
+    unsigned offset = 5 * COORDINATE_PRECISION;
+    FixedPointCoordinate north(rect.max_lat + offset, center.lon);
+    FixedPointCoordinate south(rect.min_lat - offset, center.lon);
+    FixedPointCoordinate west(center.lat, rect.min_lon - offset);
+    FixedPointCoordinate east(center.lat, rect.max_lon + offset);
+    FixedPointCoordinate north_east(rect.max_lat + offset, rect.max_lon + offset);
+    FixedPointCoordinate north_west(rect.max_lat + offset, rect.min_lon - offset);
+    FixedPointCoordinate south_east(rect.min_lat - offset, rect.max_lon + offset);
+    FixedPointCoordinate south_west(rect.min_lat - offset, rect.min_lon - offset);
+
+    /* Distance to line segments of rectangle */
+    BOOST_CHECK_EQUAL(rect.GetMinDist(north),
+                      FixedPointCoordinate::ApproximateEuclideanDistance(
+                          north, FixedPointCoordinate(rect.max_lat, north.lon)));
+    BOOST_CHECK_EQUAL(rect.GetMinDist(south),
+                      FixedPointCoordinate::ApproximateEuclideanDistance(
+                          south, FixedPointCoordinate(rect.min_lat, south.lon)));
+    BOOST_CHECK_EQUAL(rect.GetMinDist(west),
+                      FixedPointCoordinate::ApproximateEuclideanDistance(
+                          west, FixedPointCoordinate(west.lat, rect.min_lon)));
+    BOOST_CHECK_EQUAL(rect.GetMinDist(east),
+                      FixedPointCoordinate::ApproximateEuclideanDistance(
+                          east, FixedPointCoordinate(east.lat, rect.max_lon)));
+
+    /* Distance to corner points */
+    BOOST_CHECK_EQUAL(rect.GetMinDist(north_east),
+                      FixedPointCoordinate::ApproximateEuclideanDistance(
+                          north_east, FixedPointCoordinate(rect.max_lat, rect.max_lon)));
+    BOOST_CHECK_EQUAL(rect.GetMinDist(north_west),
+                      FixedPointCoordinate::ApproximateEuclideanDistance(
+                          north_west, FixedPointCoordinate(rect.max_lat, rect.min_lon)));
+    BOOST_CHECK_EQUAL(rect.GetMinDist(south_east),
+                      FixedPointCoordinate::ApproximateEuclideanDistance(
+                          south_east, FixedPointCoordinate(rect.min_lat, rect.max_lon)));
+    BOOST_CHECK_EQUAL(rect.GetMinDist(south_west),
+                      FixedPointCoordinate::ApproximateEuclideanDistance(
+                          south_west, FixedPointCoordinate(rect.min_lat, rect.min_lon)));
+}
+
+BOOST_AUTO_TEST_CASE(rectangle_test)
+{
+    TestRectangle(10, 10, 5, 5);
+    TestRectangle(10, 10, -5, 5);
+    TestRectangle(10, 10, 5, -5);
+    TestRectangle(10, 10, -5, -5);
+    TestRectangle(10, 10, 0, 0);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
--- a/UnitTests/datastructure_tests.cpp
+++ b/UnitTests/datastructure_tests.cpp
@ -0,0 +1,34 @@
+/*
+
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#define BOOST_TEST_MODULE datastructure tests
+
+#include <boost/test/unit_test.hpp>
+
+/*
+ * This file will contain an automatically generated main function.
+ */
--- a/Util/BoostFileSystemFix.h
+++ b/Util/BoostFileSystemFix.h
@ -0,0 +1,144 @@
+/*
+
+Copyright (c) 2015, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef BOOST_FILE_SYSTEM_FIX_H
+#define BOOST_FILE_SYSTEM_FIX_H
+
+#include "osrm_exception.hpp"
+
+// #include <boost/any.hpp>
+#include <boost/filesystem.hpp>
+// #include <boost/program_options.hpp>
+
+// This is one big workaround for latest boost renaming woes.
+
+#if BOOST_FILESYSTEM_VERSION < 3
+#warning Boost Installation with Filesystem3 missing, activating workaround
+#include <cstdio>
+#endif
+
+namespace boost
+{
+namespace filesystem
+{
+
+// Validator for boost::filesystem::path, that verifies that the file
+// exists. The validate() function must be defined in the same namespace
+// as the target type, (boost::filesystem::path in this case), otherwise
+// it is not called
+// inline void validate(
+//     boost::any & v,
+//     const std::vector<std::string> & values,
+//     boost::filesystem::path *,
+//     int
+// ) {
+//     boost::program_options::validators::check_first_occurrence(v);
+//     const std::string & input_string =
+//         boost::program_options::validators::get_single_string(values);
+//     if(boost::filesystem::is_regular_file(input_string)) {
+//         v = boost::any(boost::filesystem::path(input_string));
+//     } else {
+//         throw osrm::exception(input_string + " not found");
+//     }
+// }
+
+// adapted from:
+// http://stackoverflow.com/questions/1746136/how-do-i-normalize-a-pathname-using-boostfilesystem
+inline boost::filesystem::path
+portable_canonical(const boost::filesystem::path &relative_path,
+                   const boost::filesystem::path &current_path = boost::filesystem::current_path())
+{
+    const boost::filesystem::path absolute_path =
+        boost::filesystem::absolute(relative_path, current_path);
+
+    boost::filesystem::path canonical_path;
+    for (auto path_iterator = absolute_path.begin(); path_iterator != absolute_path.end();
+         ++path_iterator)
+    {
+        if (".." == path_iterator->string())
+        {
+            // /a/b/.. is not necessarily /a if b is a symbolic link
+            if (boost::filesystem::is_symlink(canonical_path))
+            {
+                canonical_path /= *path_iterator;
+            }
+            else if (".." == canonical_path.filename())
+            {
+                // /a/b/../.. is not /a/b/.. under most circumstances
+                // We can end up with ..s in our result because of symbolic links
+                canonical_path /= *path_iterator;
+            }
+            else
+            {
+                // Otherwise it should be safe to resolve the parent
+                canonical_path = canonical_path.parent_path();
+            }
+        }
+        else if ("." == path_iterator->string())
+        {
+            // Ignore
+        }
+        else
+        {
+            // Just cat other path entries
+            canonical_path /= *path_iterator;
+        }
+    }
+    BOOST_ASSERT(canonical_path.is_absolute());
+    BOOST_ASSERT(boost::filesystem::exists(canonical_path));
+    return canonical_path;
+}
+
+#if BOOST_FILESYSTEM_VERSION < 3
+
+inline path temp_directory_path()
+{
+    char *buffer;
+    buffer = tmpnam(nullptr);
+
+    return path(buffer);
+}
+
+inline path unique_path(const path &) { return temp_directory_path(); }
+
+#endif
+}
+}
+
+#ifndef BOOST_FILESYSTEM_VERSION
+#define BOOST_FILESYSTEM_VERSION 3
+#endif
+
+inline void AssertPathExists(const boost::filesystem::path &path)
+{
+    if (!boost::filesystem::is_regular_file(path))
+    {
+        throw osrm::exception(path.string() + " not found.");
+    }
+}
+
+#endif /* BOOST_FILE_SYSTEM_FIX_H */
--- a/Util/DataStoreOptions.h
+++ b/Util/DataStoreOptions.h
@ -0,0 +1,279 @@
+/*
+
+Copyright (c) 2015, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef DATA_STORE_OPTIONS_H
+#define DATA_STORE_OPTIONS_H
+
+#include "BoostFileSystemFix.h"
+#include "git_sha.hpp"
+#include "IniFileUtil.h"
+#include "osrm_exception.hpp"
+#include "simple_logger.hpp"
+
+#include <osrm/ServerPaths.h>
+
+#include <boost/any.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/program_options.hpp>
+
+#include <string>
+
+// generate boost::program_options object for the routing part
+bool GenerateDataStoreOptions(const int argc, const char *argv[], ServerPaths &paths)
+{
+    // declare a group of options that will be allowed only on command line
+    boost::program_options::options_description generic_options("Options");
+    generic_options.add_options()("version,v", "Show version")("help,h", "Show this help message")
+        ("springclean,s", "Remove all regions in shared memory")("config,c",
+        boost::program_options::value<boost::filesystem::path>(&paths["config"])
+            ->default_value("server.ini"),
+        "Path to a configuration file");
+
+    // declare a group of options that will be allowed both on command line
+    // as well as in a config file
+    boost::program_options::options_description config_options("Configuration");
+    config_options.add_options()(
+        "hsgrdata",
+        boost::program_options::value<boost::filesystem::path>(&paths["hsgrdata"]),
+        ".hsgr file")("nodesdata",
+                      boost::program_options::value<boost::filesystem::path>(&paths["nodesdata"]),
+                      ".nodes file")(
+        "edgesdata",
+        boost::program_options::value<boost::filesystem::path>(&paths["edgesdata"]),
+        ".edges file")("geometry",
+                       boost::program_options::value<boost::filesystem::path>(&paths["geometry"]),
+                       ".geometry file")(
+        "ramindex",
+        boost::program_options::value<boost::filesystem::path>(&paths["ramindex"]),
+        ".ramIndex file")(
+        "fileindex",
+        boost::program_options::value<boost::filesystem::path>(&paths["fileindex"]),
+        ".fileIndex file")(
+        "namesdata",
+        boost::program_options::value<boost::filesystem::path>(&paths["namesdata"]),
+        ".names file")("timestamp",
+                       boost::program_options::value<boost::filesystem::path>(&paths["timestamp"]),
+                       ".timestamp file");
+
+    // hidden options, will be allowed both on command line and in config
+    // file, but will not be shown to the user
+    boost::program_options::options_description hidden_options("Hidden options");
+    hidden_options.add_options()(
+        "base,b",
+        boost::program_options::value<boost::filesystem::path>(&paths["base"]),
+        "base path to .osrm file");
+
+    // positional option
+    boost::program_options::positional_options_description positional_options;
+    positional_options.add("base", 1);
+
+    // combine above options for parsing
+    boost::program_options::options_description cmdline_options;
+    cmdline_options.add(generic_options).add(config_options).add(hidden_options);
+
+    boost::program_options::options_description config_file_options;
+    config_file_options.add(config_options).add(hidden_options);
+
+    boost::program_options::options_description visible_options(
+        boost::filesystem::basename(argv[0]) + " [<options>] <configuration>");
+    visible_options.add(generic_options).add(config_options);
+
+    // parse command line options
+    boost::program_options::variables_map option_variables;
+    boost::program_options::store(boost::program_options::command_line_parser(argc, argv)
+                                      .options(cmdline_options)
+                                      .positional(positional_options)
+                                      .run(),
+                                  option_variables);
+
+    if (option_variables.count("version"))
+    {
+        SimpleLogger().Write() << g_GIT_DESCRIPTION;
+        return false;
+    }
+
+    if (option_variables.count("help"))
+    {
+        SimpleLogger().Write() << visible_options;
+        return false;
+    }
+
+    boost::program_options::notify(option_variables);
+
+    const bool parameter_present = (paths.find("hsgrdata") != paths.end() &&
+                                    !paths.find("hsgrdata")->second.string().empty()) ||
+                                   (paths.find("nodesdata") != paths.end() &&
+                                    !paths.find("nodesdata")->second.string().empty()) ||
+                                   (paths.find("edgesdata") != paths.end() &&
+                                    !paths.find("edgesdata")->second.string().empty()) ||
+                                   (paths.find("geometry") != paths.end() &&
+                                    !paths.find("geometry")->second.string().empty()) ||
+                                   (paths.find("ramindex") != paths.end() &&
+                                    !paths.find("ramindex")->second.string().empty()) ||
+                                   (paths.find("fileindex") != paths.end() &&
+                                    !paths.find("fileindex")->second.string().empty()) ||
+                                   (paths.find("timestamp") != paths.end() &&
+                                    !paths.find("timestamp")->second.string().empty());
+
+    if (parameter_present)
+    {
+        if ((paths.find("config") != paths.end() &&
+             boost::filesystem::is_regular_file(paths.find("config")->second)) ||
+            option_variables.count("base"))
+        {
+            SimpleLogger().Write(logWARNING) << "conflicting parameters";
+            SimpleLogger().Write() << visible_options;
+            return false;
+        }
+    }
+
+    // parse config file
+    ServerPaths::iterator path_iterator = paths.find("config");
+    if (path_iterator != paths.end() && boost::filesystem::is_regular_file(path_iterator->second) &&
+        !option_variables.count("base"))
+    {
+        SimpleLogger().Write() << "Reading options from: " << path_iterator->second.string();
+        std::string ini_file_contents = ReadIniFileAndLowerContents(path_iterator->second);
+        std::stringstream config_stream(ini_file_contents);
+        boost::program_options::store(parse_config_file(config_stream, config_file_options),
+                                      option_variables);
+        boost::program_options::notify(option_variables);
+    }
+    else if (option_variables.count("base"))
+    {
+        path_iterator = paths.find("base");
+        BOOST_ASSERT(paths.end() != path_iterator);
+        std::string base_string = path_iterator->second.string();
+
+        path_iterator = paths.find("hsgrdata");
+        if (path_iterator != paths.end())
+        {
+            path_iterator->second = base_string + ".hsgr";
+        }
+
+        path_iterator = paths.find("nodesdata");
+        if (path_iterator != paths.end())
+        {
+            path_iterator->second = base_string + ".nodes";
+        }
+
+        path_iterator = paths.find("edgesdata");
+        if (path_iterator != paths.end())
+        {
+            path_iterator->second = base_string + ".edges";
+        }
+
+        path_iterator = paths.find("geometry");
+        if (path_iterator != paths.end())
+        {
+            path_iterator->second = base_string + ".geometry";
+        }
+
+        path_iterator = paths.find("ramindex");
+        if (path_iterator != paths.end())
+        {
+            path_iterator->second = base_string + ".ramIndex";
+        }
+
+        path_iterator = paths.find("fileindex");
+        if (path_iterator != paths.end())
+        {
+            path_iterator->second = base_string + ".fileIndex";
+        }
+
+        path_iterator = paths.find("namesdata");
+        if (path_iterator != paths.end())
+        {
+            path_iterator->second = base_string + ".names";
+        }
+
+        path_iterator = paths.find("timestamp");
+        if (path_iterator != paths.end())
+        {
+            path_iterator->second = base_string + ".timestamp";
+        }
+    }
+
+    path_iterator = paths.find("hsgrdata");
+    if (path_iterator == paths.end() || path_iterator->second.string().empty())
+    {
+        throw osrm::exception(".hsgr file must be specified");
+    }
+    AssertPathExists(path_iterator->second);
+
+    path_iterator = paths.find("nodesdata");
+    if (path_iterator == paths.end() || path_iterator->second.string().empty())
+    {
+        throw osrm::exception(".nodes file must be specified");
+    }
+    AssertPathExists(path_iterator->second);
+
+    path_iterator = paths.find("edgesdata");
+    if (path_iterator == paths.end() || path_iterator->second.string().empty())
+    {
+        throw osrm::exception(".edges file must be specified");
+    }
+    AssertPathExists(path_iterator->second);
+
+    path_iterator = paths.find("geometry");
+    if (path_iterator == paths.end() || path_iterator->second.string().empty())
+    {
+        throw osrm::exception(".geometry file must be specified");
+    }
+    AssertPathExists(path_iterator->second);
+
+    path_iterator = paths.find("ramindex");
+    if (path_iterator == paths.end() || path_iterator->second.string().empty())
+    {
+        throw osrm::exception(".ramindex file must be specified");
+    }
+    AssertPathExists(path_iterator->second);
+
+    path_iterator = paths.find("fileindex");
+    if (path_iterator == paths.end() || path_iterator->second.string().empty())
+    {
+        throw osrm::exception(".fileindex file must be specified");
+    }
+    AssertPathExists(path_iterator->second);
+
+    path_iterator = paths.find("namesdata");
+    if (path_iterator == paths.end() || path_iterator->second.string().empty())
+    {
+        throw osrm::exception(".names file must be specified");
+    }
+    AssertPathExists(path_iterator->second);
+
+    path_iterator = paths.find("timestamp");
+    if (path_iterator == paths.end() || path_iterator->second.string().empty())
+    {
+        throw osrm::exception(".timestamp file must be specified");
+    }
+
+    return true;
+}
+
+#endif /* DATA_STORE_OPTIONS_H */
--- a/include/engine/api/nearest_parameters.hpp
+++ b/include/engine/api/nearest_parameters.hpp
@ -1,6 +1,6 @@
 /*

-Copyright (c) 2017, Project OSRM contributors
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification,
@ -25,29 +25,35 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

-#ifndef ENGINE_API_NEAREST_PARAMETERS_HPP
-#define ENGINE_API_NEAREST_PARAMETERS_HPP
+#ifndef FINGERPRINT_H
+#define FINGERPRINT_H

-#include "engine/api/base_parameters.hpp"
+#include <boost/uuid/uuid.hpp>

-namespace osrm::engine::api
+// implements a singleton, i.e. there is one and only one conviguration object
+class FingerPrint
 {
+  public:
+    FingerPrint();
+    FingerPrint(const FingerPrint&) = delete;
+    ~FingerPrint();
+    const boost::uuids::uuid &GetFingerPrint() const;
+    bool IsMagicNumberOK() const;
+    bool TestGraphUtil(const FingerPrint &other) const;
+    bool TestPrepare(const FingerPrint &other) const;
+    bool TestRTree(const FingerPrint &other) const;
+    bool TestQueryObjects(const FingerPrint &other) const;

-/**
- * Parameters specific to the OSRM Nearest service.
- *
- * Holds member attributes:
- *  - number of results: number of nearest segments that should be returned
- *
- * \see OSRM, Coordinate, Hint, Bearing, RouteParame, RouteParameters, TableParameters,
- *      NearestParameters, TripParameters, MatchParameters and TileParameters
- */
-struct NearestParameters : public BaseParameters
-{
-    unsigned number_of_results = 1;
+  private:
+    const unsigned magic_number;
+    char md5_prepare[33];
+    char md5_tree[33];
+    char md5_graph[33];
+    char md5_objects[33];

-    bool IsValid() const { return BaseParameters::IsValid() && number_of_results >= 1; }
+    // initialize to {6ba7b810-9dad-11d1-80b4-00c04fd430c8}
+    boost::uuids::uuid named_uuid;
+    bool has_64_bits;
 };
-} // namespace osrm::engine::api

-#endif // ENGINE_API_NEAREST_PARAMETERS_HPP
+#endif /* FingerPrint_H */
--- a/Util/IniFileUtil.h
+++ b/Util/IniFileUtil.h
@ -0,0 +1,49 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef INI_FILE_UTIL_H
+#define INI_FILE_UTIL_H
+
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
+#include <boost/regex.hpp>
+
+#include <regex>
+#include <string>
+
+// support old capitalized option names by down-casing them with a regex replace
+inline std::string ReadIniFileAndLowerContents(const boost::filesystem::path &path)
+{
+    boost::filesystem::fstream config_stream(path);
+    std::string ini_file_content((std::istreambuf_iterator<char>(config_stream)),
+                          std::istreambuf_iterator<char>());
+    boost::regex regex( "^([^=]*)" ); //match from start of line to '='
+    std::string format( "\\L$1\\E" ); //replace with downcased substring
+    return boost::regex_replace( ini_file_content, regex, format );
+}
+
+#endif // INI_FILE_UTIL_H
--- a/Util/MercatorUtil.h
+++ b/Util/MercatorUtil.h
@ -0,0 +1,43 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef MERCATOR_UTIL_H
+#define MERCATOR_UTIL_H
+
+#include <cmath>
+
+inline double y2lat(const double a)
+{
+    return 180. * M_1_PI * (2. * std::atan(std::exp(a * M_PI / 180.)) - M_PI_2);
+}
+
+inline double lat2y(const double a)
+{
+    return 180. * M_1_PI * std::log(std::tan(M_PI_4 + a * (M_PI / 180.) / 2.));
+}
+
+#endif // MERCATOR_UTIL_H
--- a/Util/ProgramOptions.h
+++ b/Util/ProgramOptions.h
@ -0,0 +1,279 @@
+/*
+
+Copyright (c) 2015, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef PROGAM_OPTIONS_H
+#define PROGAM_OPTIONS_H
+
+#include "git_sha.hpp"
+#include "IniFileUtil.h"
+#include "osrm_exception.hpp"
+#include "simple_logger.hpp"
+
+#include <osrm/ServerPaths.h>
+
+#include <boost/any.hpp>
+#include <boost/program_options.hpp>
+
+#include <fstream>
+#include <string>
+
+const static unsigned INIT_OK_START_ENGINE = 0;
+const static unsigned INIT_OK_DO_NOT_START_ENGINE = 1;
+const static unsigned INIT_FAILED = -1;
+
+inline void populate_base_path(ServerPaths &server_paths)
+{
+    // populate the server_path object
+    auto path_iterator = server_paths.find("base");
+
+    // if a base path has been set, we populate it.
+    if (path_iterator != server_paths.end())
+    {
+        const std::string base_string = path_iterator->second.string();
+        SimpleLogger().Write() << "populating base path: " << base_string;
+
+        server_paths["hsgrdata"] = base_string + ".hsgr";
+        BOOST_ASSERT(server_paths.find("hsgrdata") != server_paths.end());
+        server_paths["nodesdata"] = base_string + ".nodes";
+        BOOST_ASSERT(server_paths.find("nodesdata") != server_paths.end());
+        server_paths["edgesdata"] = base_string + ".edges";
+        BOOST_ASSERT(server_paths.find("edgesdata") != server_paths.end());
+        server_paths["geometries"] = base_string + ".geometry";
+        BOOST_ASSERT(server_paths.find("geometries") != server_paths.end());
+        server_paths["ramindex"] = base_string + ".ramIndex";
+        BOOST_ASSERT(server_paths.find("ramindex") != server_paths.end());
+        server_paths["fileindex"] = base_string + ".fileIndex";
+        BOOST_ASSERT(server_paths.find("fileindex") != server_paths.end());
+        server_paths["namesdata"] = base_string + ".names";
+        BOOST_ASSERT(server_paths.find("namesdata") != server_paths.end());
+        server_paths["timestamp"] = base_string + ".timestamp";
+        BOOST_ASSERT(server_paths.find("timestamp") != server_paths.end());
+    }
+
+    // check if files are give and whether they exist at all
+    path_iterator = server_paths.find("hsgrdata");
+    if (path_iterator == server_paths.end() ||
+        !boost::filesystem::is_regular_file(path_iterator->second))
+    {
+        if (path_iterator == server_paths.end())
+        {
+            SimpleLogger().Write() << "hsgrdata unset";
+        }
+        if (!boost::filesystem::is_regular_file(path_iterator->second))
+        {
+            SimpleLogger().Write() << "not a regular file";
+        }
+
+        throw osrm::exception(".hsgr not found: " + path_iterator->second.string());
+    }
+
+    path_iterator = server_paths.find("nodesdata");
+    if (path_iterator == server_paths.end() ||
+        !boost::filesystem::is_regular_file(path_iterator->second))
+    {
+        throw osrm::exception(".nodes not found");
+    }
+
+    path_iterator = server_paths.find("edgesdata");
+    if (path_iterator == server_paths.end() ||
+        !boost::filesystem::is_regular_file(path_iterator->second))
+    {
+        throw osrm::exception(".edges not found");
+    }
+
+    path_iterator = server_paths.find("geometries");
+    if (path_iterator == server_paths.end() ||
+        !boost::filesystem::is_regular_file(path_iterator->second))
+    {
+        throw osrm::exception(".geometry not found");
+    }
+
+    path_iterator = server_paths.find("ramindex");
+    if (path_iterator == server_paths.end() ||
+        !boost::filesystem::is_regular_file(path_iterator->second))
+    {
+        throw osrm::exception(".ramIndex not found");
+    }
+
+    path_iterator = server_paths.find("fileindex");
+    if (path_iterator == server_paths.end() ||
+        !boost::filesystem::is_regular_file(path_iterator->second))
+    {
+        throw osrm::exception(".fileIndex not found");
+    }
+
+    path_iterator = server_paths.find("namesdata");
+    if (path_iterator == server_paths.end() ||
+        !boost::filesystem::is_regular_file(path_iterator->second))
+    {
+        throw osrm::exception(".namesIndex not found");
+    }
+
+    SimpleLogger().Write() << "HSGR file:\t" << server_paths["hsgrdata"];
+    SimpleLogger().Write(logDEBUG) << "Nodes file:\t" << server_paths["nodesdata"];
+    SimpleLogger().Write(logDEBUG) << "Edges file:\t" << server_paths["edgesdata"];
+    SimpleLogger().Write(logDEBUG) << "Geometry file:\t" << server_paths["geometries"];
+    SimpleLogger().Write(logDEBUG) << "RAM file:\t" << server_paths["ramindex"];
+    SimpleLogger().Write(logDEBUG) << "Index file:\t" << server_paths["fileindex"];
+    SimpleLogger().Write(logDEBUG) << "Names file:\t" << server_paths["namesdata"];
+    SimpleLogger().Write(logDEBUG) << "Timestamp file:\t" << server_paths["timestamp"];
+}
+
+// generate boost::program_options object for the routing part
+inline unsigned GenerateServerProgramOptions(const int argc,
+                                             const char *argv[],
+                                             ServerPaths &paths,
+                                             std::string &ip_address,
+                                             int &ip_port,
+                                             int &requested_num_threads,
+                                             bool &use_shared_memory,
+                                             bool &trial)
+{
+    // declare a group of options that will be allowed only on command line
+    boost::program_options::options_description generic_options("Options");
+    generic_options.add_options()("version,v", "Show version")("help,h", "Show this help message")(
+        "config,c",
+        boost::program_options::value<boost::filesystem::path>(&paths["config"])
+            ->default_value("server.ini"),
+        "Path to a configuration file")(
+        "trial",
+        boost::program_options::value<bool>(&trial)->implicit_value(true),
+        "Quit after initialization");
+
+    // declare a group of options that will be allowed both on command line
+    // as well as in a config file
+    boost::program_options::options_description config_options("Configuration");
+    config_options.add_options()(
+        "hsgrdata",
+        boost::program_options::value<boost::filesystem::path>(&paths["hsgrdata"]),
+        ".hsgr file")("nodesdata",
+                      boost::program_options::value<boost::filesystem::path>(&paths["nodesdata"]),
+                      ".nodes file")(
+        "edgesdata",
+        boost::program_options::value<boost::filesystem::path>(&paths["edgesdata"]),
+        ".edges file")("geometry",
+                       boost::program_options::value<boost::filesystem::path>(&paths["geometries"]),
+                       ".geometry file")(
+        "ramindex",
+        boost::program_options::value<boost::filesystem::path>(&paths["ramindex"]),
+        ".ramIndex file")(
+        "fileindex",
+        boost::program_options::value<boost::filesystem::path>(&paths["fileindex"]),
+        "File index file")(
+        "namesdata",
+        boost::program_options::value<boost::filesystem::path>(&paths["namesdata"]),
+        ".names file")("timestamp",
+                       boost::program_options::value<boost::filesystem::path>(&paths["timestamp"]),
+                       ".timestamp file")(
+        "ip,i",
+        boost::program_options::value<std::string>(&ip_address)->default_value("0.0.0.0"),
+        "IP address")(
+        "port,p", boost::program_options::value<int>(&ip_port)->default_value(5000), "TCP/IP port")(
+        "threads,t",
+        boost::program_options::value<int>(&requested_num_threads)->default_value(8),
+        "Number of threads to use")(
+        "sharedmemory,s",
+        boost::program_options::value<bool>(&use_shared_memory)->implicit_value(true),
+        "Load data from shared memory");
+
+    // hidden options, will be allowed both on command line and in config
+    // file, but will not be shown to the user
+    boost::program_options::options_description hidden_options("Hidden options");
+    hidden_options.add_options()(
+        "base,b",
+        boost::program_options::value<boost::filesystem::path>(&paths["base"]),
+        "base path to .osrm file");
+
+    // positional option
+    boost::program_options::positional_options_description positional_options;
+    positional_options.add("base", 1);
+
+    // combine above options for parsing
+    boost::program_options::options_description cmdline_options;
+    cmdline_options.add(generic_options).add(config_options).add(hidden_options);
+
+    boost::program_options::options_description config_file_options;
+    config_file_options.add(config_options).add(hidden_options);
+
+    boost::program_options::options_description visible_options(
+        boost::filesystem::basename(argv[0]) + " <base.osrm> [<options>]");
+    visible_options.add(generic_options).add(config_options);
+
+    // parse command line options
+    boost::program_options::variables_map option_variables;
+    boost::program_options::store(boost::program_options::command_line_parser(argc, argv)
+                                      .options(cmdline_options)
+                                      .positional(positional_options)
+                                      .run(),
+                                  option_variables);
+
+    if (option_variables.count("version"))
+    {
+        SimpleLogger().Write() << g_GIT_DESCRIPTION;
+        return INIT_OK_DO_NOT_START_ENGINE;
+    }
+
+    if (option_variables.count("help"))
+    {
+        SimpleLogger().Write() << visible_options;
+        return INIT_OK_DO_NOT_START_ENGINE;
+    }
+
+    boost::program_options::notify(option_variables);
+
+    // parse config file
+    ServerPaths::iterator path_iterator = paths.find("config");
+    if (path_iterator != paths.end() && boost::filesystem::is_regular_file(path_iterator->second) &&
+        !option_variables.count("base"))
+    {
+        SimpleLogger().Write() << "Reading options from: " << path_iterator->second.string();
+        std::string ini_file_contents = ReadIniFileAndLowerContents(path_iterator->second);
+        std::stringstream config_stream(ini_file_contents);
+        boost::program_options::store(parse_config_file(config_stream, config_file_options),
+                                      option_variables);
+        boost::program_options::notify(option_variables);
+        return INIT_OK_START_ENGINE;
+    }
+
+    if (1 > requested_num_threads)
+    {
+        throw osrm::exception("Number of threads must be a positive number");
+    }
+
+    if (!use_shared_memory && option_variables.count("base"))
+    {
+        return INIT_OK_START_ENGINE;
+    }
+    if (use_shared_memory && !option_variables.count("base"))
+    {
+        return INIT_OK_START_ENGINE;
+    }
+    SimpleLogger().Write() << visible_options;
+    return INIT_OK_DO_NOT_START_ENGINE;
+}
+
+#endif /* PROGRAM_OPTIONS_H */
--- a/Util/TrigonometryTables.h
+++ b/Util/TrigonometryTables.h
@ -0,0 +1,790 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef TRIGONOMETRY_TABLES_H
+#define TRIGONOMETRY_TABLES_H
+
+#include "../typedefs.h"
+#include <cmath>
+
+#include <limits>
+
+constexpr unsigned short atan_table[4096] = {
+0x0000,  0x0014,  0x0028,  0x003d,  0x0051,  0x0065,
+0x007a,  0x008e,  0x00a3,  0x00b7,  0x00cb,  0x00e0,
+0x00f4,  0x0108,  0x011d,  0x0131,  0x0146,  0x015a,
+0x016e,  0x0183,  0x0197,  0x01ab,  0x01c0,  0x01d4,
+0x01e9,  0x01fd,  0x0211,  0x0226,  0x023a,  0x024e,
+0x0263,  0x0277,  0x028c,  0x02a0,  0x02b4,  0x02c9,
+0x02dd,  0x02f1,  0x0306,  0x031a,  0x032f,  0x0343,
+0x0357,  0x036c,  0x0380,  0x0394,  0x03a9,  0x03bd,
+0x03d2,  0x03e6,  0x03fa,  0x040f,  0x0423,  0x0437,
+0x044c,  0x0460,  0x0475,  0x0489,  0x049d,  0x04b2,
+0x04c6,  0x04da,  0x04ef,  0x0503,  0x0517,  0x052c,
+0x0540,  0x0555,  0x0569,  0x057d,  0x0592,  0x05a6,
+0x05ba,  0x05cf,  0x05e3,  0x05f8,  0x060c,  0x0620,
+0x0635,  0x0649,  0x065d,  0x0672,  0x0686,  0x069b,
+0x06af,  0x06c3,  0x06d8,  0x06ec,  0x0700,  0x0715,
+0x0729,  0x073d,  0x0752,  0x0766,  0x077b,  0x078f,
+0x07a3,  0x07b8,  0x07cc,  0x07e0,  0x07f5,  0x0809,
+0x081d,  0x0832,  0x0846,  0x085b,  0x086f,  0x0883,
+0x0898,  0x08ac,  0x08c0,  0x08d5,  0x08e9,  0x08fd,
+0x0912,  0x0926,  0x093b,  0x094f,  0x0963,  0x0978,
+0x098c,  0x09a0,  0x09b5,  0x09c9,  0x09dd,  0x09f2,
+0x0a06,  0x0a1a,  0x0a2f,  0x0a43,  0x0a58,  0x0a6c,
+0x0a80,  0x0a95,  0x0aa9,  0x0abd,  0x0ad2,  0x0ae6,
+0x0afa,  0x0b0f,  0x0b23,  0x0b37,  0x0b4c,  0x0b60,
+0x0b75,  0x0b89,  0x0b9d,  0x0bb2,  0x0bc6,  0x0bda,
+0x0bef,  0x0c03,  0x0c17,  0x0c2c,  0x0c40,  0x0c54,
+0x0c69,  0x0c7d,  0x0c91,  0x0ca6,  0x0cba,  0x0cce,
+0x0ce3,  0x0cf7,  0x0d0b,  0x0d20,  0x0d34,  0x0d48,
+0x0d5d,  0x0d71,  0x0d86,  0x0d9a,  0x0dae,  0x0dc3,
+0x0dd7,  0x0deb,  0x0e00,  0x0e14,  0x0e28,  0x0e3d,
+0x0e51,  0x0e65,  0x0e7a,  0x0e8e,  0x0ea2,  0x0eb7,
+0x0ecb,  0x0edf,  0x0ef4,  0x0f08,  0x0f1c,  0x0f31,
+0x0f45,  0x0f59,  0x0f6e,  0x0f82,  0x0f96,  0x0fab,
+0x0fbf,  0x0fd3,  0x0fe8,  0x0ffc,  0x1010,  0x1025,
+0x1039,  0x104d,  0x1062,  0x1076,  0x108a,  0x109e,
+0x10b3,  0x10c7,  0x10db,  0x10f0,  0x1104,  0x1118,
+0x112d,  0x1141,  0x1155,  0x116a,  0x117e,  0x1192,
+0x11a7,  0x11bb,  0x11cf,  0x11e4,  0x11f8,  0x120c,
+0x1221,  0x1235,  0x1249,  0x125d,  0x1272,  0x1286,
+0x129a,  0x12af,  0x12c3,  0x12d7,  0x12ec,  0x1300,
+0x1314,  0x1329,  0x133d,  0x1351,  0x1365,  0x137a,
+0x138e,  0x13a2,  0x13b7,  0x13cb,  0x13df,  0x13f4,
+0x1408,  0x141c,  0x1431,  0x1445,  0x1459,  0x146d,
+0x1482,  0x1496,  0x14aa,  0x14bf,  0x14d3,  0x14e7,
+0x14fb,  0x1510,  0x1524,  0x1538,  0x154d,  0x1561,
+0x1575,  0x1589,  0x159e,  0x15b2,  0x15c6,  0x15db,
+0x15ef,  0x1603,  0x1617,  0x162c,  0x1640,  0x1654,
+0x1669,  0x167d,  0x1691,  0x16a5,  0x16ba,  0x16ce,
+0x16e2,  0x16f7,  0x170b,  0x171f,  0x1733,  0x1748,
+0x175c,  0x1770,  0x1784,  0x1799,  0x17ad,  0x17c1,
+0x17d6,  0x17ea,  0x17fe,  0x1812,  0x1827,  0x183b,
+0x184f,  0x1863,  0x1878,  0x188c,  0x18a0,  0x18b4,
+0x18c9,  0x18dd,  0x18f1,  0x1905,  0x191a,  0x192e,
+0x1942,  0x1957,  0x196b,  0x197f,  0x1993,  0x19a8,
+0x19bc,  0x19d0,  0x19e4,  0x19f9,  0x1a0d,  0x1a21,
+0x1a35,  0x1a49,  0x1a5e,  0x1a72,  0x1a86,  0x1a9a,
+0x1aaf,  0x1ac3,  0x1ad7,  0x1aeb,  0x1b00,  0x1b14,
+0x1b28,  0x1b3c,  0x1b51,  0x1b65,  0x1b79,  0x1b8d,
+0x1ba2,  0x1bb6,  0x1bca,  0x1bde,  0x1bf2,  0x1c07,
+0x1c1b,  0x1c2f,  0x1c43,  0x1c58,  0x1c6c,  0x1c80,
+0x1c94,  0x1ca8,  0x1cbd,  0x1cd1,  0x1ce5,  0x1cf9,
+0x1d0e,  0x1d22,  0x1d36,  0x1d4a,  0x1d5e,  0x1d73,
+0x1d87,  0x1d9b,  0x1daf,  0x1dc3,  0x1dd8,  0x1dec,
+0x1e00,  0x1e14,  0x1e28,  0x1e3d,  0x1e51,  0x1e65,
+0x1e79,  0x1e8d,  0x1ea2,  0x1eb6,  0x1eca,  0x1ede,
+0x1ef2,  0x1f07,  0x1f1b,  0x1f2f,  0x1f43,  0x1f57,
+0x1f6c,  0x1f80,  0x1f94,  0x1fa8,  0x1fbc,  0x1fd1,
+0x1fe5,  0x1ff9,  0x200d,  0x2021,  0x2035,  0x204a,
+0x205e,  0x2072,  0x2086,  0x209a,  0x20ae,  0x20c3,
+0x20d7,  0x20eb,  0x20ff,  0x2113,  0x2127,  0x213c,
+0x2150,  0x2164,  0x2178,  0x218c,  0x21a0,  0x21b5,
+0x21c9,  0x21dd,  0x21f1,  0x2205,  0x2219,  0x222e,
+0x2242,  0x2256,  0x226a,  0x227e,  0x2292,  0x22a6,
+0x22bb,  0x22cf,  0x22e3,  0x22f7,  0x230b,  0x231f,
+0x2333,  0x2348,  0x235c,  0x2370,  0x2384,  0x2398,
+0x23ac,  0x23c0,  0x23d5,  0x23e9,  0x23fd,  0x2411,
+0x2425,  0x2439,  0x244d,  0x2461,  0x2476,  0x248a,
+0x249e,  0x24b2,  0x24c6,  0x24da,  0x24ee,  0x2502,
+0x2517,  0x252b,  0x253f,  0x2553,  0x2567,  0x257b,
+0x258f,  0x25a3,  0x25b7,  0x25cb,  0x25e0,  0x25f4,
+0x2608,  0x261c,  0x2630,  0x2644,  0x2658,  0x266c,
+0x2680,  0x2694,  0x26a9,  0x26bd,  0x26d1,  0x26e5,
+0x26f9,  0x270d,  0x2721,  0x2735,  0x2749,  0x275d,
+0x2771,  0x2785,  0x279a,  0x27ae,  0x27c2,  0x27d6,
+0x27ea,  0x27fe,  0x2812,  0x2826,  0x283a,  0x284e,
+0x2862,  0x2876,  0x288a,  0x289e,  0x28b3,  0x28c7,
+0x28db,  0x28ef,  0x2903,  0x2917,  0x292b,  0x293f,
+0x2953,  0x2967,  0x297b,  0x298f,  0x29a3,  0x29b7,
+0x29cb,  0x29df,  0x29f3,  0x2a07,  0x2a1b,  0x2a2f,
+0x2a43,  0x2a58,  0x2a6c,  0x2a80,  0x2a94,  0x2aa8,
+0x2abc,  0x2ad0,  0x2ae4,  0x2af8,  0x2b0c,  0x2b20,
+0x2b34,  0x2b48,  0x2b5c,  0x2b70,  0x2b84,  0x2b98,
+0x2bac,  0x2bc0,  0x2bd4,  0x2be8,  0x2bfc,  0x2c10,
+0x2c24,  0x2c38,  0x2c4c,  0x2c60,  0x2c74,  0x2c88,
+0x2c9c,  0x2cb0,  0x2cc4,  0x2cd8,  0x2cec,  0x2d00,
+0x2d14,  0x2d28,  0x2d3c,  0x2d50,  0x2d64,  0x2d78,
+0x2d8c,  0x2da0,  0x2db4,  0x2dc8,  0x2ddc,  0x2df0,
+0x2e04,  0x2e18,  0x2e2c,  0x2e40,  0x2e54,  0x2e68,
+0x2e7c,  0x2e90,  0x2ea3,  0x2eb7,  0x2ecb,  0x2edf,
+0x2ef3,  0x2f07,  0x2f1b,  0x2f2f,  0x2f43,  0x2f57,
+0x2f6b,  0x2f7f,  0x2f93,  0x2fa7,  0x2fbb,  0x2fcf,
+0x2fe3,  0x2ff7,  0x300b,  0x301e,  0x3032,  0x3046,
+0x305a,  0x306e,  0x3082,  0x3096,  0x30aa,  0x30be,
+0x30d2,  0x30e6,  0x30fa,  0x310e,  0x3122,  0x3135,
+0x3149,  0x315d,  0x3171,  0x3185,  0x3199,  0x31ad,
+0x31c1,  0x31d5,  0x31e9,  0x31fd,  0x3210,  0x3224,
+0x3238,  0x324c,  0x3260,  0x3274,  0x3288,  0x329c,
+0x32b0,  0x32c3,  0x32d7,  0x32eb,  0x32ff,  0x3313,
+0x3327,  0x333b,  0x334f,  0x3363,  0x3376,  0x338a,
+0x339e,  0x33b2,  0x33c6,  0x33da,  0x33ee,  0x3401,
+0x3415,  0x3429,  0x343d,  0x3451,  0x3465,  0x3479,
+0x348c,  0x34a0,  0x34b4,  0x34c8,  0x34dc,  0x34f0,
+0x3504,  0x3517,  0x352b,  0x353f,  0x3553,  0x3567,
+0x357b,  0x358e,  0x35a2,  0x35b6,  0x35ca,  0x35de,
+0x35f2,  0x3605,  0x3619,  0x362d,  0x3641,  0x3655,
+0x3668,  0x367c,  0x3690,  0x36a4,  0x36b8,  0x36cb,
+0x36df,  0x36f3,  0x3707,  0x371b,  0x372f,  0x3742,
+0x3756,  0x376a,  0x377e,  0x3791,  0x37a5,  0x37b9,
+0x37cd,  0x37e1,  0x37f4,  0x3808,  0x381c,  0x3830,
+0x3844,  0x3857,  0x386b,  0x387f,  0x3893,  0x38a6,
+0x38ba,  0x38ce,  0x38e2,  0x38f5,  0x3909,  0x391d,
+0x3931,  0x3944,  0x3958,  0x396c,  0x3980,  0x3993,
+0x39a7,  0x39bb,  0x39cf,  0x39e2,  0x39f6,  0x3a0a,
+0x3a1e,  0x3a31,  0x3a45,  0x3a59,  0x3a6d,  0x3a80,
+0x3a94,  0x3aa8,  0x3abb,  0x3acf,  0x3ae3,  0x3af7,
+0x3b0a,  0x3b1e,  0x3b32,  0x3b45,  0x3b59,  0x3b6d,
+0x3b81,  0x3b94,  0x3ba8,  0x3bbc,  0x3bcf,  0x3be3,
+0x3bf7,  0x3c0b,  0x3c1e,  0x3c32,  0x3c46,  0x3c59,
+0x3c6d,  0x3c81,  0x3c94,  0x3ca8,  0x3cbc,  0x3ccf,
+0x3ce3,  0x3cf7,  0x3d0a,  0x3d1e,  0x3d32,  0x3d45,
+0x3d59,  0x3d6d,  0x3d80,  0x3d94,  0x3da8,  0x3dbb,
+0x3dcf,  0x3de3,  0x3df6,  0x3e0a,  0x3e1e,  0x3e31,
+0x3e45,  0x3e59,  0x3e6c,  0x3e80,  0x3e93,  0x3ea7,
+0x3ebb,  0x3ece,  0x3ee2,  0x3ef6,  0x3f09,  0x3f1d,
+0x3f30,  0x3f44,  0x3f58,  0x3f6b,  0x3f7f,  0x3f93,
+0x3fa6,  0x3fba,  0x3fcd,  0x3fe1,  0x3ff5,  0x4008,
+0x401c,  0x402f,  0x4043,  0x4057,  0x406a,  0x407e,
+0x4091,  0x40a5,  0x40b8,  0x40cc,  0x40e0,  0x40f3,
+0x4107,  0x411a,  0x412e,  0x4142,  0x4155,  0x4169,
+0x417c,  0x4190,  0x41a3,  0x41b7,  0x41ca,  0x41de,
+0x41f2,  0x4205,  0x4219,  0x422c,  0x4240,  0x4253,
+0x4267,  0x427a,  0x428e,  0x42a1,  0x42b5,  0x42c9,
+0x42dc,  0x42f0,  0x4303,  0x4317,  0x432a,  0x433e,
+0x4351,  0x4365,  0x4378,  0x438c,  0x439f,  0x43b3,
+0x43c6,  0x43da,  0x43ed,  0x4401,  0x4414,  0x4428,
+0x443b,  0x444f,  0x4462,  0x4476,  0x4489,  0x449d,
+0x44b0,  0x44c4,  0x44d7,  0x44eb,  0x44fe,  0x4512,
+0x4525,  0x4539,  0x454c,  0x4560,  0x4573,  0x4586,
+0x459a,  0x45ad,  0x45c1,  0x45d4,  0x45e8,  0x45fb,
+0x460f,  0x4622,  0x4636,  0x4649,  0x465c,  0x4670,
+0x4683,  0x4697,  0x46aa,  0x46be,  0x46d1,  0x46e5,
+0x46f8,  0x470b,  0x471f,  0x4732,  0x4746,  0x4759,
+0x476c,  0x4780,  0x4793,  0x47a7,  0x47ba,  0x47cd,
+0x47e1,  0x47f4,  0x4808,  0x481b,  0x482e,  0x4842,
+0x4855,  0x4869,  0x487c,  0x488f,  0x48a3,  0x48b6,
+0x48ca,  0x48dd,  0x48f0,  0x4904,  0x4917,  0x492a,
+0x493e,  0x4951,  0x4965,  0x4978,  0x498b,  0x499f,
+0x49b2,  0x49c5,  0x49d9,  0x49ec,  0x49ff,  0x4a13,
+0x4a26,  0x4a39,  0x4a4d,  0x4a60,  0x4a73,  0x4a87,
+0x4a9a,  0x4aad,  0x4ac1,  0x4ad4,  0x4ae7,  0x4afb,
+0x4b0e,  0x4b21,  0x4b35,  0x4b48,  0x4b5b,  0x4b6f,
+0x4b82,  0x4b95,  0x4ba8,  0x4bbc,  0x4bcf,  0x4be2,
+0x4bf6,  0x4c09,  0x4c1c,  0x4c2f,  0x4c43,  0x4c56,
+0x4c69,  0x4c7d,  0x4c90,  0x4ca3,  0x4cb6,  0x4cca,
+0x4cdd,  0x4cf0,  0x4d03,  0x4d17,  0x4d2a,  0x4d3d,
+0x4d50,  0x4d64,  0x4d77,  0x4d8a,  0x4d9d,  0x4db1,
+0x4dc4,  0x4dd7,  0x4dea,  0x4dfe,  0x4e11,  0x4e24,
+0x4e37,  0x4e4b,  0x4e5e,  0x4e71,  0x4e84,  0x4e97,
+0x4eab,  0x4ebe,  0x4ed1,  0x4ee4,  0x4ef7,  0x4f0b,
+0x4f1e,  0x4f31,  0x4f44,  0x4f57,  0x4f6b,  0x4f7e,
+0x4f91,  0x4fa4,  0x4fb7,  0x4fcb,  0x4fde,  0x4ff1,
+0x5004,  0x5017,  0x502a,  0x503e,  0x5051,  0x5064,
+0x5077,  0x508a,  0x509d,  0x50b1,  0x50c4,  0x50d7,
+0x50ea,  0x50fd,  0x5110,  0x5123,  0x5137,  0x514a,
+0x515d,  0x5170,  0x5183,  0x5196,  0x51a9,  0x51bc,
+0x51d0,  0x51e3,  0x51f6,  0x5209,  0x521c,  0x522f,
+0x5242,  0x5255,  0x5268,  0x527c,  0x528f,  0x52a2,
+0x52b5,  0x52c8,  0x52db,  0x52ee,  0x5301,  0x5314,
+0x5327,  0x533a,  0x534e,  0x5361,  0x5374,  0x5387,
+0x539a,  0x53ad,  0x53c0,  0x53d3,  0x53e6,  0x53f9,
+0x540c,  0x541f,  0x5432,  0x5445,  0x5458,  0x546b,
+0x547e,  0x5491,  0x54a5,  0x54b8,  0x54cb,  0x54de,
+0x54f1,  0x5504,  0x5517,  0x552a,  0x553d,  0x5550,
+0x5563,  0x5576,  0x5589,  0x559c,  0x55af,  0x55c2,
+0x55d5,  0x55e8,  0x55fb,  0x560e,  0x5621,  0x5634,
+0x5647,  0x565a,  0x566d,  0x5680,  0x5693,  0x56a6,
+0x56b9,  0x56cb,  0x56de,  0x56f1,  0x5704,  0x5717,
+0x572a,  0x573d,  0x5750,  0x5763,  0x5776,  0x5789,
+0x579c,  0x57af,  0x57c2,  0x57d5,  0x57e8,  0x57fb,
+0x580e,  0x5820,  0x5833,  0x5846,  0x5859,  0x586c,
+0x587f,  0x5892,  0x58a5,  0x58b8,  0x58cb,  0x58de,
+0x58f0,  0x5903,  0x5916,  0x5929,  0x593c,  0x594f,
+0x5962,  0x5975,  0x5988,  0x599a,  0x59ad,  0x59c0,
+0x59d3,  0x59e6,  0x59f9,  0x5a0c,  0x5a1f,  0x5a31,
+0x5a44,  0x5a57,  0x5a6a,  0x5a7d,  0x5a90,  0x5aa2,
+0x5ab5,  0x5ac8,  0x5adb,  0x5aee,  0x5b01,  0x5b13,
+0x5b26,  0x5b39,  0x5b4c,  0x5b5f,  0x5b72,  0x5b84,
+0x5b97,  0x5baa,  0x5bbd,  0x5bd0,  0x5be2,  0x5bf5,
+0x5c08,  0x5c1b,  0x5c2e,  0x5c40,  0x5c53,  0x5c66,
+0x5c79,  0x5c8c,  0x5c9e,  0x5cb1,  0x5cc4,  0x5cd7,
+0x5ce9,  0x5cfc,  0x5d0f,  0x5d22,  0x5d34,  0x5d47,
+0x5d5a,  0x5d6d,  0x5d7f,  0x5d92,  0x5da5,  0x5db8,
+0x5dca,  0x5ddd,  0x5df0,  0x5e03,  0x5e15,  0x5e28,
+0x5e3b,  0x5e4d,  0x5e60,  0x5e73,  0x5e86,  0x5e98,
+0x5eab,  0x5ebe,  0x5ed0,  0x5ee3,  0x5ef6,  0x5f09,
+0x5f1b,  0x5f2e,  0x5f41,  0x5f53,  0x5f66,  0x5f79,
+0x5f8b,  0x5f9e,  0x5fb1,  0x5fc3,  0x5fd6,  0x5fe9,
+0x5ffb,  0x600e,  0x6021,  0x6033,  0x6046,  0x6059,
+0x606b,  0x607e,  0x6091,  0x60a3,  0x60b6,  0x60c8,
+0x60db,  0x60ee,  0x6100,  0x6113,  0x6126,  0x6138,
+0x614b,  0x615d,  0x6170,  0x6183,  0x6195,  0x61a8,
+0x61ba,  0x61cd,  0x61e0,  0x61f2,  0x6205,  0x6217,
+0x622a,  0x623d,  0x624f,  0x6262,  0x6274,  0x6287,
+0x6299,  0x62ac,  0x62bf,  0x62d1,  0x62e4,  0x62f6,
+0x6309,  0x631b,  0x632e,  0x6340,  0x6353,  0x6366,
+0x6378,  0x638b,  0x639d,  0x63b0,  0x63c2,  0x63d5,
+0x63e7,  0x63fa,  0x640c,  0x641f,  0x6431,  0x6444,
+0x6456,  0x6469,  0x647b,  0x648e,  0x64a0,  0x64b3,
+0x64c5,  0x64d8,  0x64ea,  0x64fd,  0x650f,  0x6522,
+0x6534,  0x6547,  0x6559,  0x656c,  0x657e,  0x6591,
+0x65a3,  0x65b5,  0x65c8,  0x65da,  0x65ed,  0x65ff,
+0x6612,  0x6624,  0x6637,  0x6649,  0x665b,  0x666e,
+0x6680,  0x6693,  0x66a5,  0x66b8,  0x66ca,  0x66dc,
+0x66ef,  0x6701,  0x6714,  0x6726,  0x6738,  0x674b,
+0x675d,  0x6770,  0x6782,  0x6794,  0x67a7,  0x67b9,
+0x67cc,  0x67de,  0x67f0,  0x6803,  0x6815,  0x6827,
+0x683a,  0x684c,  0x685e,  0x6871,  0x6883,  0x6896,
+0x68a8,  0x68ba,  0x68cd,  0x68df,  0x68f1,  0x6904,
+0x6916,  0x6928,  0x693b,  0x694d,  0x695f,  0x6972,
+0x6984,  0x6996,  0x69a8,  0x69bb,  0x69cd,  0x69df,
+0x69f2,  0x6a04,  0x6a16,  0x6a29,  0x6a3b,  0x6a4d,
+0x6a5f,  0x6a72,  0x6a84,  0x6a96,  0x6aa9,  0x6abb,
+0x6acd,  0x6adf,  0x6af2,  0x6b04,  0x6b16,  0x6b28,
+0x6b3b,  0x6b4d,  0x6b5f,  0x6b71,  0x6b84,  0x6b96,
+0x6ba8,  0x6bba,  0x6bcd,  0x6bdf,  0x6bf1,  0x6c03,
+0x6c15,  0x6c28,  0x6c3a,  0x6c4c,  0x6c5e,  0x6c70,
+0x6c83,  0x6c95,  0x6ca7,  0x6cb9,  0x6ccb,  0x6cde,
+0x6cf0,  0x6d02,  0x6d14,  0x6d26,  0x6d39,  0x6d4b,
+0x6d5d,  0x6d6f,  0x6d81,  0x6d93,  0x6da6,  0x6db8,
+0x6dca,  0x6ddc,  0x6dee,  0x6e00,  0x6e12,  0x6e25,
+0x6e37,  0x6e49,  0x6e5b,  0x6e6d,  0x6e7f,  0x6e91,
+0x6ea3,  0x6eb6,  0x6ec8,  0x6eda,  0x6eec,  0x6efe,
+0x6f10,  0x6f22,  0x6f34,  0x6f46,  0x6f58,  0x6f6b,
+0x6f7d,  0x6f8f,  0x6fa1,  0x6fb3,  0x6fc5,  0x6fd7,
+0x6fe9,  0x6ffb,  0x700d,  0x701f,  0x7031,  0x7043,
+0x7055,  0x7068,  0x707a,  0x708c,  0x709e,  0x70b0,
+0x70c2,  0x70d4,  0x70e6,  0x70f8,  0x710a,  0x711c,
+0x712e,  0x7140,  0x7152,  0x7164,  0x7176,  0x7188,
+0x719a,  0x71ac,  0x71be,  0x71d0,  0x71e2,  0x71f4,
+0x7206,  0x7218,  0x722a,  0x723c,  0x724e,  0x7260,
+0x7272,  0x7284,  0x7296,  0x72a8,  0x72ba,  0x72cc,
+0x72dd,  0x72ef,  0x7301,  0x7313,  0x7325,  0x7337,
+0x7349,  0x735b,  0x736d,  0x737f,  0x7391,  0x73a3,
+0x73b5,  0x73c7,  0x73d8,  0x73ea,  0x73fc,  0x740e,
+0x7420,  0x7432,  0x7444,  0x7456,  0x7468,  0x747a,
+0x748b,  0x749d,  0x74af,  0x74c1,  0x74d3,  0x74e5,
+0x74f7,  0x7509,  0x751a,  0x752c,  0x753e,  0x7550,
+0x7562,  0x7574,  0x7585,  0x7597,  0x75a9,  0x75bb,
+0x75cd,  0x75df,  0x75f0,  0x7602,  0x7614,  0x7626,
+0x7638,  0x764a,  0x765b,  0x766d,  0x767f,  0x7691,
+0x76a3,  0x76b4,  0x76c6,  0x76d8,  0x76ea,  0x76fb,
+0x770d,  0x771f,  0x7731,  0x7743,  0x7754,  0x7766,
+0x7778,  0x778a,  0x779b,  0x77ad,  0x77bf,  0x77d1,
+0x77e2,  0x77f4,  0x7806,  0x7818,  0x7829,  0x783b,
+0x784d,  0x785e,  0x7870,  0x7882,  0x7894,  0x78a5,
+0x78b7,  0x78c9,  0x78da,  0x78ec,  0x78fe,  0x7910,
+0x7921,  0x7933,  0x7945,  0x7956,  0x7968,  0x797a,
+0x798b,  0x799d,  0x79af,  0x79c0,  0x79d2,  0x79e4,
+0x79f5,  0x7a07,  0x7a19,  0x7a2a,  0x7a3c,  0x7a4e,
+0x7a5f,  0x7a71,  0x7a82,  0x7a94,  0x7aa6,  0x7ab7,
+0x7ac9,  0x7adb,  0x7aec,  0x7afe,  0x7b0f,  0x7b21,
+0x7b33,  0x7b44,  0x7b56,  0x7b67,  0x7b79,  0x7b8b,
+0x7b9c,  0x7bae,  0x7bbf,  0x7bd1,  0x7be2,  0x7bf4,
+0x7c06,  0x7c17,  0x7c29,  0x7c3a,  0x7c4c,  0x7c5d,
+0x7c6f,  0x7c81,  0x7c92,  0x7ca4,  0x7cb5,  0x7cc7,
+0x7cd8,  0x7cea,  0x7cfb,  0x7d0d,  0x7d1e,  0x7d30,
+0x7d41,  0x7d53,  0x7d64,  0x7d76,  0x7d87,  0x7d99,
+0x7daa,  0x7dbc,  0x7dcd,  0x7ddf,  0x7df0,  0x7e02,
+0x7e13,  0x7e25,  0x7e36,  0x7e48,  0x7e59,  0x7e6b,
+0x7e7c,  0x7e8e,  0x7e9f,  0x7eb0,  0x7ec2,  0x7ed3,
+0x7ee5,  0x7ef6,  0x7f08,  0x7f19,  0x7f2b,  0x7f3c,
+0x7f4d,  0x7f5f,  0x7f70,  0x7f82,  0x7f93,  0x7fa4,
+0x7fb6,  0x7fc7,  0x7fd9,  0x7fea,  0x7ffb,  0x800d,
+0x801e,  0x8030,  0x8041,  0x8052,  0x8064,  0x8075,
+0x8086,  0x8098,  0x80a9,  0x80bb,  0x80cc,  0x80dd,
+0x80ef,  0x8100,  0x8111,  0x8123,  0x8134,  0x8145,
+0x8157,  0x8168,  0x8179,  0x818b,  0x819c,  0x81ad,
+0x81bf,  0x81d0,  0x81e1,  0x81f3,  0x8204,  0x8215,
+0x8226,  0x8238,  0x8249,  0x825a,  0x826c,  0x827d,
+0x828e,  0x829f,  0x82b1,  0x82c2,  0x82d3,  0x82e5,
+0x82f6,  0x8307,  0x8318,  0x832a,  0x833b,  0x834c,
+0x835d,  0x836f,  0x8380,  0x8391,  0x83a2,  0x83b3,
+0x83c5,  0x83d6,  0x83e7,  0x83f8,  0x840a,  0x841b,
+0x842c,  0x843d,  0x844e,  0x8460,  0x8471,  0x8482,
+0x8493,  0x84a4,  0x84b6,  0x84c7,  0x84d8,  0x84e9,
+0x84fa,  0x850b,  0x851d,  0x852e,  0x853f,  0x8550,
+0x8561,  0x8572,  0x8584,  0x8595,  0x85a6,  0x85b7,
+0x85c8,  0x85d9,  0x85ea,  0x85fb,  0x860d,  0x861e,
+0x862f,  0x8640,  0x8651,  0x8662,  0x8673,  0x8684,
+0x8695,  0x86a7,  0x86b8,  0x86c9,  0x86da,  0x86eb,
+0x86fc,  0x870d,  0x871e,  0x872f,  0x8740,  0x8751,
+0x8762,  0x8773,  0x8784,  0x8796,  0x87a7,  0x87b8,
+0x87c9,  0x87da,  0x87eb,  0x87fc,  0x880d,  0x881e,
+0x882f,  0x8840,  0x8851,  0x8862,  0x8873,  0x8884,
+0x8895,  0x88a6,  0x88b7,  0x88c8,  0x88d9,  0x88ea,
+0x88fb,  0x890c,  0x891d,  0x892e,  0x893f,  0x8950,
+0x8961,  0x8972,  0x8983,  0x8994,  0x89a5,  0x89b6,
+0x89c6,  0x89d7,  0x89e8,  0x89f9,  0x8a0a,  0x8a1b,
+0x8a2c,  0x8a3d,  0x8a4e,  0x8a5f,  0x8a70,  0x8a81,
+0x8a92,  0x8aa3,  0x8ab3,  0x8ac4,  0x8ad5,  0x8ae6,
+0x8af7,  0x8b08,  0x8b19,  0x8b2a,  0x8b3b,  0x8b4b,
+0x8b5c,  0x8b6d,  0x8b7e,  0x8b8f,  0x8ba0,  0x8bb1,
+0x8bc1,  0x8bd2,  0x8be3,  0x8bf4,  0x8c05,  0x8c16,
+0x8c27,  0x8c37,  0x8c48,  0x8c59,  0x8c6a,  0x8c7b,
+0x8c8c,  0x8c9c,  0x8cad,  0x8cbe,  0x8ccf,  0x8ce0,
+0x8cf0,  0x8d01,  0x8d12,  0x8d23,  0x8d34,  0x8d44,
+0x8d55,  0x8d66,  0x8d77,  0x8d87,  0x8d98,  0x8da9,
+0x8dba,  0x8dca,  0x8ddb,  0x8dec,  0x8dfd,  0x8e0d,
+0x8e1e,  0x8e2f,  0x8e40,  0x8e50,  0x8e61,  0x8e72,
+0x8e83,  0x8e93,  0x8ea4,  0x8eb5,  0x8ec5,  0x8ed6,
+0x8ee7,  0x8ef8,  0x8f08,  0x8f19,  0x8f2a,  0x8f3a,
+0x8f4b,  0x8f5c,  0x8f6c,  0x8f7d,  0x8f8e,  0x8f9e,
+0x8faf,  0x8fc0,  0x8fd0,  0x8fe1,  0x8ff2,  0x9002,
+0x9013,  0x9024,  0x9034,  0x9045,  0x9056,  0x9066,
+0x9077,  0x9088,  0x9098,  0x90a9,  0x90b9,  0x90ca,
+0x90db,  0x90eb,  0x90fc,  0x910c,  0x911d,  0x912e,
+0x913e,  0x914f,  0x915f,  0x9170,  0x9181,  0x9191,
+0x91a2,  0x91b2,  0x91c3,  0x91d3,  0x91e4,  0x91f5,
+0x9205,  0x9216,  0x9226,  0x9237,  0x9247,  0x9258,
+0x9268,  0x9279,  0x9289,  0x929a,  0x92aa,  0x92bb,
+0x92cc,  0x92dc,  0x92ed,  0x92fd,  0x930e,  0x931e,
+0x932f,  0x933f,  0x9350,  0x9360,  0x9370,  0x9381,
+0x9391,  0x93a2,  0x93b2,  0x93c3,  0x93d3,  0x93e4,
+0x93f4,  0x9405,  0x9415,  0x9426,  0x9436,  0x9447,
+0x9457,  0x9467,  0x9478,  0x9488,  0x9499,  0x94a9,
+0x94ba,  0x94ca,  0x94da,  0x94eb,  0x94fb,  0x950c,
+0x951c,  0x952c,  0x953d,  0x954d,  0x955e,  0x956e,
+0x957e,  0x958f,  0x959f,  0x95af,  0x95c0,  0x95d0,
+0x95e1,  0x95f1,  0x9601,  0x9612,  0x9622,  0x9632,
+0x9643,  0x9653,  0x9663,  0x9674,  0x9684,  0x9694,
+0x96a5,  0x96b5,  0x96c5,  0x96d6,  0x96e6,  0x96f6,
+0x9707,  0x9717,  0x9727,  0x9738,  0x9748,  0x9758,
+0x9768,  0x9779,  0x9789,  0x9799,  0x97aa,  0x97ba,
+0x97ca,  0x97da,  0x97eb,  0x97fb,  0x980b,  0x981b,
+0x982c,  0x983c,  0x984c,  0x985c,  0x986d,  0x987d,
+0x988d,  0x989d,  0x98ad,  0x98be,  0x98ce,  0x98de,
+0x98ee,  0x98ff,  0x990f,  0x991f,  0x992f,  0x993f,
+0x9950,  0x9960,  0x9970,  0x9980,  0x9990,  0x99a0,
+0x99b1,  0x99c1,  0x99d1,  0x99e1,  0x99f1,  0x9a01,
+0x9a12,  0x9a22,  0x9a32,  0x9a42,  0x9a52,  0x9a62,
+0x9a72,  0x9a83,  0x9a93,  0x9aa3,  0x9ab3,  0x9ac3,
+0x9ad3,  0x9ae3,  0x9af3,  0x9b04,  0x9b14,  0x9b24,
+0x9b34,  0x9b44,  0x9b54,  0x9b64,  0x9b74,  0x9b84,
+0x9b94,  0x9ba4,  0x9bb5,  0x9bc5,  0x9bd5,  0x9be5,
+0x9bf5,  0x9c05,  0x9c15,  0x9c25,  0x9c35,  0x9c45,
+0x9c55,  0x9c65,  0x9c75,  0x9c85,  0x9c95,  0x9ca5,
+0x9cb5,  0x9cc5,  0x9cd5,  0x9ce5,  0x9cf5,  0x9d05,
+0x9d15,  0x9d25,  0x9d35,  0x9d45,  0x9d55,  0x9d65,
+0x9d75,  0x9d85,  0x9d95,  0x9da5,  0x9db5,  0x9dc5,
+0x9dd5,  0x9de5,  0x9df5,  0x9e05,  0x9e15,  0x9e25,
+0x9e35,  0x9e45,  0x9e55,  0x9e65,  0x9e74,  0x9e84,
+0x9e94,  0x9ea4,  0x9eb4,  0x9ec4,  0x9ed4,  0x9ee4,
+0x9ef4,  0x9f04,  0x9f14,  0x9f23,  0x9f33,  0x9f43,
+0x9f53,  0x9f63,  0x9f73,  0x9f83,  0x9f93,  0x9fa3,
+0x9fb2,  0x9fc2,  0x9fd2,  0x9fe2,  0x9ff2,  0xa002,
+0xa012,  0xa021,  0xa031,  0xa041,  0xa051,  0xa061,
+0xa071,  0xa080,  0xa090,  0xa0a0,  0xa0b0,  0xa0c0,
+0xa0cf,  0xa0df,  0xa0ef,  0xa0ff,  0xa10f,  0xa11e,
+0xa12e,  0xa13e,  0xa14e,  0xa15e,  0xa16d,  0xa17d,
+0xa18d,  0xa19d,  0xa1ac,  0xa1bc,  0xa1cc,  0xa1dc,
+0xa1eb,  0xa1fb,  0xa20b,  0xa21b,  0xa22a,  0xa23a,
+0xa24a,  0xa25a,  0xa269,  0xa279,  0xa289,  0xa298,
+0xa2a8,  0xa2b8,  0xa2c8,  0xa2d7,  0xa2e7,  0xa2f7,
+0xa306,  0xa316,  0xa326,  0xa335,  0xa345,  0xa355,
+0xa364,  0xa374,  0xa384,  0xa393,  0xa3a3,  0xa3b3,
+0xa3c2,  0xa3d2,  0xa3e2,  0xa3f1,  0xa401,  0xa411,
+0xa420,  0xa430,  0xa440,  0xa44f,  0xa45f,  0xa46e,
+0xa47e,  0xa48e,  0xa49d,  0xa4ad,  0xa4bc,  0xa4cc,
+0xa4dc,  0xa4eb,  0xa4fb,  0xa50a,  0xa51a,  0xa52a,
+0xa539,  0xa549,  0xa558,  0xa568,  0xa577,  0xa587,
+0xa597,  0xa5a6,  0xa5b6,  0xa5c5,  0xa5d5,  0xa5e4,
+0xa5f4,  0xa603,  0xa613,  0xa622,  0xa632,  0xa641,
+0xa651,  0xa660,  0xa670,  0xa67f,  0xa68f,  0xa69e,
+0xa6ae,  0xa6bd,  0xa6cd,  0xa6dc,  0xa6ec,  0xa6fb,
+0xa70b,  0xa71a,  0xa72a,  0xa739,  0xa749,  0xa758,
+0xa768,  0xa777,  0xa787,  0xa796,  0xa7a5,  0xa7b5,
+0xa7c4,  0xa7d4,  0xa7e3,  0xa7f3,  0xa802,  0xa812,
+0xa821,  0xa830,  0xa840,  0xa84f,  0xa85f,  0xa86e,
+0xa87d,  0xa88d,  0xa89c,  0xa8ac,  0xa8bb,  0xa8ca,
+0xa8da,  0xa8e9,  0xa8f8,  0xa908,  0xa917,  0xa927,
+0xa936,  0xa945,  0xa955,  0xa964,  0xa973,  0xa983,
+0xa992,  0xa9a1,  0xa9b1,  0xa9c0,  0xa9cf,  0xa9df,
+0xa9ee,  0xa9fd,  0xaa0d,  0xaa1c,  0xaa2b,  0xaa3b,
+0xaa4a,  0xaa59,  0xaa69,  0xaa78,  0xaa87,  0xaa96,
+0xaaa6,  0xaab5,  0xaac4,  0xaad4,  0xaae3,  0xaaf2,
+0xab01,  0xab11,  0xab20,  0xab2f,  0xab3e,  0xab4e,
+0xab5d,  0xab6c,  0xab7b,  0xab8b,  0xab9a,  0xaba9,
+0xabb8,  0xabc7,  0xabd7,  0xabe6,  0xabf5,  0xac04,
+0xac14,  0xac23,  0xac32,  0xac41,  0xac50,  0xac60,
+0xac6f,  0xac7e,  0xac8d,  0xac9c,  0xacab,  0xacbb,
+0xacca,  0xacd9,  0xace8,  0xacf7,  0xad06,  0xad16,
+0xad25,  0xad34,  0xad43,  0xad52,  0xad61,  0xad70,
+0xad80,  0xad8f,  0xad9e,  0xadad,  0xadbc,  0xadcb,
+0xadda,  0xade9,  0xadf8,  0xae08,  0xae17,  0xae26,
+0xae35,  0xae44,  0xae53,  0xae62,  0xae71,  0xae80,
+0xae8f,  0xae9e,  0xaead,  0xaebd,  0xaecc,  0xaedb,
+0xaeea,  0xaef9,  0xaf08,  0xaf17,  0xaf26,  0xaf35,
+0xaf44,  0xaf53,  0xaf62,  0xaf71,  0xaf80,  0xaf8f,
+0xaf9e,  0xafad,  0xafbc,  0xafcb,  0xafda,  0xafe9,
+0xaff8,  0xb007,  0xb016,  0xb025,  0xb034,  0xb043,
+0xb052,  0xb061,  0xb070,  0xb07f,  0xb08e,  0xb09d,
+0xb0ac,  0xb0bb,  0xb0ca,  0xb0d9,  0xb0e8,  0xb0f6,
+0xb105,  0xb114,  0xb123,  0xb132,  0xb141,  0xb150,
+0xb15f,  0xb16e,  0xb17d,  0xb18c,  0xb19b,  0xb1aa,
+0xb1b8,  0xb1c7,  0xb1d6,  0xb1e5,  0xb1f4,  0xb203,
+0xb212,  0xb221,  0xb22f,  0xb23e,  0xb24d,  0xb25c,
+0xb26b,  0xb27a,  0xb289,  0xb297,  0xb2a6,  0xb2b5,
+0xb2c4,  0xb2d3,  0xb2e2,  0xb2f1,  0xb2ff,  0xb30e,
+0xb31d,  0xb32c,  0xb33b,  0xb349,  0xb358,  0xb367,
+0xb376,  0xb385,  0xb393,  0xb3a2,  0xb3b1,  0xb3c0,
+0xb3cf,  0xb3dd,  0xb3ec,  0xb3fb,  0xb40a,  0xb418,
+0xb427,  0xb436,  0xb445,  0xb453,  0xb462,  0xb471,
+0xb480,  0xb48e,  0xb49d,  0xb4ac,  0xb4bb,  0xb4c9,
+0xb4d8,  0xb4e7,  0xb4f6,  0xb504,  0xb513,  0xb522,
+0xb530,  0xb53f,  0xb54e,  0xb55c,  0xb56b,  0xb57a,
+0xb588,  0xb597,  0xb5a6,  0xb5b5,  0xb5c3,  0xb5d2,
+0xb5e1,  0xb5ef,  0xb5fe,  0xb60d,  0xb61b,  0xb62a,
+0xb638,  0xb647,  0xb656,  0xb664,  0xb673,  0xb682,
+0xb690,  0xb69f,  0xb6ae,  0xb6bc,  0xb6cb,  0xb6d9,
+0xb6e8,  0xb6f7,  0xb705,  0xb714,  0xb722,  0xb731,
+0xb740,  0xb74e,  0xb75d,  0xb76b,  0xb77a,  0xb788,
+0xb797,  0xb7a6,  0xb7b4,  0xb7c3,  0xb7d1,  0xb7e0,
+0xb7ee,  0xb7fd,  0xb80b,  0xb81a,  0xb829,  0xb837,
+0xb846,  0xb854,  0xb863,  0xb871,  0xb880,  0xb88e,
+0xb89d,  0xb8ab,  0xb8ba,  0xb8c8,  0xb8d7,  0xb8e5,
+0xb8f4,  0xb902,  0xb911,  0xb91f,  0xb92e,  0xb93c,
+0xb94b,  0xb959,  0xb968,  0xb976,  0xb984,  0xb993,
+0xb9a1,  0xb9b0,  0xb9be,  0xb9cd,  0xb9db,  0xb9ea,
+0xb9f8,  0xba06,  0xba15,  0xba23,  0xba32,  0xba40,
+0xba4f,  0xba5d,  0xba6b,  0xba7a,  0xba88,  0xba97,
+0xbaa5,  0xbab3,  0xbac2,  0xbad0,  0xbade,  0xbaed,
+0xbafb,  0xbb0a,  0xbb18,  0xbb26,  0xbb35,  0xbb43,
+0xbb51,  0xbb60,  0xbb6e,  0xbb7c,  0xbb8b,  0xbb99,
+0xbba8,  0xbbb6,  0xbbc4,  0xbbd3,  0xbbe1,  0xbbef,
+0xbbfd,  0xbc0c,  0xbc1a,  0xbc28,  0xbc37,  0xbc45,
+0xbc53,  0xbc62,  0xbc70,  0xbc7e,  0xbc8c,  0xbc9b,
+0xbca9,  0xbcb7,  0xbcc6,  0xbcd4,  0xbce2,  0xbcf0,
+0xbcff,  0xbd0d,  0xbd1b,  0xbd29,  0xbd38,  0xbd46,
+0xbd54,  0xbd62,  0xbd71,  0xbd7f,  0xbd8d,  0xbd9b,
+0xbdaa,  0xbdb8,  0xbdc6,  0xbdd4,  0xbde2,  0xbdf1,
+0xbdff,  0xbe0d,  0xbe1b,  0xbe29,  0xbe38,  0xbe46,
+0xbe54,  0xbe62,  0xbe70,  0xbe7f,  0xbe8d,  0xbe9b,
+0xbea9,  0xbeb7,  0xbec5,  0xbed4,  0xbee2,  0xbef0,
+0xbefe,  0xbf0c,  0xbf1a,  0xbf28,  0xbf37,  0xbf45,
+0xbf53,  0xbf61,  0xbf6f,  0xbf7d,  0xbf8b,  0xbf99,
+0xbfa7,  0xbfb6,  0xbfc4,  0xbfd2,  0xbfe0,  0xbfee,
+0xbffc,  0xc00a,  0xc018,  0xc026,  0xc034,  0xc042,
+0xc051,  0xc05f,  0xc06d,  0xc07b,  0xc089,  0xc097,
+0xc0a5,  0xc0b3,  0xc0c1,  0xc0cf,  0xc0dd,  0xc0eb,
+0xc0f9,  0xc107,  0xc115,  0xc123,  0xc131,  0xc13f,
+0xc14d,  0xc15b,  0xc169,  0xc177,  0xc185,  0xc193,
+0xc1a1,  0xc1af,  0xc1bd,  0xc1cb,  0xc1d9,  0xc1e7,
+0xc1f5,  0xc203,  0xc211,  0xc21f,  0xc22d,  0xc23b,
+0xc249,  0xc257,  0xc265,  0xc273,  0xc281,  0xc28f,
+0xc29d,  0xc2ab,  0xc2b8,  0xc2c6,  0xc2d4,  0xc2e2,
+0xc2f0,  0xc2fe,  0xc30c,  0xc31a,  0xc328,  0xc336,
+0xc344,  0xc352,  0xc35f,  0xc36d,  0xc37b,  0xc389,
+0xc397,  0xc3a5,  0xc3b3,  0xc3c1,  0xc3ce,  0xc3dc,
+0xc3ea,  0xc3f8,  0xc406,  0xc414,  0xc422,  0xc42f,
+0xc43d,  0xc44b,  0xc459,  0xc467,  0xc475,  0xc482,
+0xc490,  0xc49e,  0xc4ac,  0xc4ba,  0xc4c7,  0xc4d5,
+0xc4e3,  0xc4f1,  0xc4ff,  0xc50d,  0xc51a,  0xc528,
+0xc536,  0xc544,  0xc551,  0xc55f,  0xc56d,  0xc57b,
+0xc589,  0xc596,  0xc5a4,  0xc5b2,  0xc5c0,  0xc5cd,
+0xc5db,  0xc5e9,  0xc5f7,  0xc604,  0xc612,  0xc620,
+0xc62d,  0xc63b,  0xc649,  0xc657,  0xc664,  0xc672,
+0xc680,  0xc68d,  0xc69b,  0xc6a9,  0xc6b7,  0xc6c4,
+0xc6d2,  0xc6e0,  0xc6ed,  0xc6fb,  0xc709,  0xc716,
+0xc724,  0xc732,  0xc73f,  0xc74d,  0xc75b,  0xc768,
+0xc776,  0xc784,  0xc791,  0xc79f,  0xc7ad,  0xc7ba,
+0xc7c8,  0xc7d6,  0xc7e3,  0xc7f1,  0xc7fe,  0xc80c,
+0xc81a,  0xc827,  0xc835,  0xc842,  0xc850,  0xc85e,
+0xc86b,  0xc879,  0xc886,  0xc894,  0xc8a2,  0xc8af,
+0xc8bd,  0xc8ca,  0xc8d8,  0xc8e5,  0xc8f3,  0xc901,
+0xc90e,  0xc91c,  0xc929,  0xc937,  0xc944,  0xc952,
+0xc95f,  0xc96d,  0xc97b,  0xc988,  0xc996,  0xc9a3,
+0xc9b1,  0xc9be,  0xc9cc,  0xc9d9,  0xc9e7,  0xc9f4,
+0xca02,  0xca0f,  0xca1d,  0xca2a,  0xca38,  0xca45,
+0xca53,  0xca60,  0xca6e,  0xca7b,  0xca89,  0xca96,
+0xcaa4,  0xcab1,  0xcabe,  0xcacc,  0xcad9,  0xcae7,
+0xcaf4,  0xcb02,  0xcb0f,  0xcb1d,  0xcb2a,  0xcb37,
+0xcb45,  0xcb52,  0xcb60,  0xcb6d,  0xcb7b,  0xcb88,
+0xcb95,  0xcba3,  0xcbb0,  0xcbbe,  0xcbcb,  0xcbd8,
+0xcbe6,  0xcbf3,  0xcc01,  0xcc0e,  0xcc1b,  0xcc29,
+0xcc36,  0xcc43,  0xcc51,  0xcc5e,  0xcc6c,  0xcc79,
+0xcc86,  0xcc94,  0xcca1,  0xccae,  0xccbc,  0xccc9,
+0xccd6,  0xcce4,  0xccf1,  0xccfe,  0xcd0c,  0xcd19,
+0xcd26,  0xcd34,  0xcd41,  0xcd4e,  0xcd5b,  0xcd69,
+0xcd76,  0xcd83,  0xcd91,  0xcd9e,  0xcdab,  0xcdb9,
+0xcdc6,  0xcdd3,  0xcde0,  0xcdee,  0xcdfb,  0xce08,
+0xce15,  0xce23,  0xce30,  0xce3d,  0xce4a,  0xce58,
+0xce65,  0xce72,  0xce7f,  0xce8d,  0xce9a,  0xcea7,
+0xceb4,  0xcec2,  0xcecf,  0xcedc,  0xcee9,  0xcef6,
+0xcf04,  0xcf11,  0xcf1e,  0xcf2b,  0xcf38,  0xcf46,
+0xcf53,  0xcf60,  0xcf6d,  0xcf7a,  0xcf87,  0xcf95,
+0xcfa2,  0xcfaf,  0xcfbc,  0xcfc9,  0xcfd6,  0xcfe4,
+0xcff1,  0xcffe,  0xd00b,  0xd018,  0xd025,  0xd032,
+0xd040,  0xd04d,  0xd05a,  0xd067,  0xd074,  0xd081,
+0xd08e,  0xd09b,  0xd0a9,  0xd0b6,  0xd0c3,  0xd0d0,
+0xd0dd,  0xd0ea,  0xd0f7,  0xd104,  0xd111,  0xd11e,
+0xd12b,  0xd139,  0xd146,  0xd153,  0xd160,  0xd16d,
+0xd17a,  0xd187,  0xd194,  0xd1a1,  0xd1ae,  0xd1bb,
+0xd1c8,  0xd1d5,  0xd1e2,  0xd1ef,  0xd1fc,  0xd209,
+0xd216,  0xd223,  0xd230,  0xd23d,  0xd24a,  0xd257,
+0xd264,  0xd271,  0xd27e,  0xd28b,  0xd298,  0xd2a5,
+0xd2b2,  0xd2bf,  0xd2cc,  0xd2d9,  0xd2e6,  0xd2f3,
+0xd300,  0xd30d,  0xd31a,  0xd327,  0xd334,  0xd341,
+0xd34e,  0xd35b,  0xd368,  0xd375,  0xd382,  0xd38f,
+0xd39c,  0xd3a8,  0xd3b5,  0xd3c2,  0xd3cf,  0xd3dc,
+0xd3e9,  0xd3f6,  0xd403,  0xd410,  0xd41d,  0xd42a,
+0xd436,  0xd443,  0xd450,  0xd45d,  0xd46a,  0xd477,
+0xd484,  0xd491,  0xd49e,  0xd4aa,  0xd4b7,  0xd4c4,
+0xd4d1,  0xd4de,  0xd4eb,  0xd4f8,  0xd504,  0xd511,
+0xd51e,  0xd52b,  0xd538,  0xd545,  0xd551,  0xd55e,
+0xd56b,  0xd578,  0xd585,  0xd591,  0xd59e,  0xd5ab,
+0xd5b8,  0xd5c5,  0xd5d1,  0xd5de,  0xd5eb,  0xd5f8,
+0xd605,  0xd611,  0xd61e,  0xd62b,  0xd638,  0xd645,
+0xd651,  0xd65e,  0xd66b,  0xd678,  0xd684,  0xd691,
+0xd69e,  0xd6ab,  0xd6b7,  0xd6c4,  0xd6d1,  0xd6de,
+0xd6ea,  0xd6f7,  0xd704,  0xd710,  0xd71d,  0xd72a,
+0xd737,  0xd743,  0xd750,  0xd75d,  0xd769,  0xd776,
+0xd783,  0xd78f,  0xd79c,  0xd7a9,  0xd7b6,  0xd7c2,
+0xd7cf,  0xd7dc,  0xd7e8,  0xd7f5,  0xd802,  0xd80e,
+0xd81b,  0xd828,  0xd834,  0xd841,  0xd84e,  0xd85a,
+0xd867,  0xd873,  0xd880,  0xd88d,  0xd899,  0xd8a6,
+0xd8b3,  0xd8bf,  0xd8cc,  0xd8d8,  0xd8e5,  0xd8f2,
+0xd8fe,  0xd90b,  0xd917,  0xd924,  0xd931,  0xd93d,
+0xd94a,  0xd956,  0xd963,  0xd970,  0xd97c,  0xd989,
+0xd995,  0xd9a2,  0xd9ae,  0xd9bb,  0xd9c8,  0xd9d4,
+0xd9e1,  0xd9ed,  0xd9fa,  0xda06,  0xda13,  0xda1f,
+0xda2c,  0xda38,  0xda45,  0xda51,  0xda5e,  0xda6a,
+0xda77,  0xda84,  0xda90,  0xda9d,  0xdaa9,  0xdab6,
+0xdac2,  0xdacf,  0xdadb,  0xdae7,  0xdaf4,  0xdb00,
+0xdb0d,  0xdb19,  0xdb26,  0xdb32,  0xdb3f,  0xdb4b,
+0xdb58,  0xdb64,  0xdb71,  0xdb7d,  0xdb8a,  0xdb96,
+0xdba2,  0xdbaf,  0xdbbb,  0xdbc8,  0xdbd4,  0xdbe1,
+0xdbed,  0xdbf9,  0xdc06,  0xdc12,  0xdc1f,  0xdc2b,
+0xdc38,  0xdc44,  0xdc50,  0xdc5d,  0xdc69,  0xdc76,
+0xdc82,  0xdc8e,  0xdc9b,  0xdca7,  0xdcb3,  0xdcc0,
+0xdccc,  0xdcd9,  0xdce5,  0xdcf1,  0xdcfe,  0xdd0a,
+0xdd16,  0xdd23,  0xdd2f,  0xdd3b,  0xdd48,  0xdd54,
+0xdd60,  0xdd6d,  0xdd79,  0xdd85,  0xdd92,  0xdd9e,
+0xddaa,  0xddb7,  0xddc3,  0xddcf,  0xdddc,  0xdde8,
+0xddf4,  0xde01,  0xde0d,  0xde19,  0xde25,  0xde32,
+0xde3e,  0xde4a,  0xde57,  0xde63,  0xde6f,  0xde7b,
+0xde88,  0xde94,  0xdea0,  0xdeac,  0xdeb9,  0xdec5,
+0xded1,  0xdedd,  0xdeea,  0xdef6,  0xdf02,  0xdf0e,
+0xdf1b,  0xdf27,  0xdf33,  0xdf3f,  0xdf4c,  0xdf58,
+0xdf64,  0xdf70,  0xdf7c,  0xdf89,  0xdf95,  0xdfa1,
+0xdfad,  0xdfb9,  0xdfc6,  0xdfd2,  0xdfde,  0xdfea,
+0xdff6,  0xe003,  0xe00f,  0xe01b,  0xe027,  0xe033,
+0xe03f,  0xe04c,  0xe058,  0xe064,  0xe070,  0xe07c,
+0xe088,  0xe094,  0xe0a1,  0xe0ad,  0xe0b9,  0xe0c5,
+0xe0d1,  0xe0dd,  0xe0e9,  0xe0f5,  0xe102,  0xe10e,
+0xe11a,  0xe126,  0xe132,  0xe13e,  0xe14a,  0xe156,
+0xe162,  0xe16e,  0xe17b,  0xe187,  0xe193,  0xe19f,
+0xe1ab,  0xe1b7,  0xe1c3,  0xe1cf,  0xe1db,  0xe1e7,
+0xe1f3,  0xe1ff,  0xe20b,  0xe217,  0xe223,  0xe22f,
+0xe23c,  0xe248,  0xe254,  0xe260,  0xe26c,  0xe278,
+0xe284,  0xe290,  0xe29c,  0xe2a8,  0xe2b4,  0xe2c0,
+0xe2cc,  0xe2d8,  0xe2e4,  0xe2f0,  0xe2fc,  0xe308,
+0xe314,  0xe320,  0xe32c,  0xe338,  0xe344,  0xe350,
+0xe35c,  0xe368,  0xe374,  0xe380,  0xe38b,  0xe397,
+0xe3a3,  0xe3af,  0xe3bb,  0xe3c7,  0xe3d3,  0xe3df,
+0xe3eb,  0xe3f7,  0xe403,  0xe40f,  0xe41b,  0xe427,
+0xe433,  0xe43f,  0xe44a,  0xe456,  0xe462,  0xe46e,
+0xe47a,  0xe486,  0xe492,  0xe49e,  0xe4aa,  0xe4b6,
+0xe4c1,  0xe4cd,  0xe4d9,  0xe4e5,  0xe4f1,  0xe4fd,
+0xe509,  0xe515,  0xe520,  0xe52c,  0xe538,  0xe544,
+0xe550,  0xe55c,  0xe567,  0xe573,  0xe57f,  0xe58b,
+0xe597,  0xe5a3,  0xe5af,  0xe5ba,  0xe5c6,  0xe5d2,
+0xe5de,  0xe5ea,  0xe5f5,  0xe601,  0xe60d,  0xe619,
+0xe625,  0xe630,  0xe63c,  0xe648,  0xe654,  0xe660,
+0xe66b,  0xe677,  0xe683,  0xe68f,  0xe69a,  0xe6a6,
+0xe6b2,  0xe6be,  0xe6ca,  0xe6d5,  0xe6e1,  0xe6ed,
+0xe6f9,  0xe704,  0xe710,  0xe71c,  0xe727,  0xe733,
+0xe73f,  0xe74b,  0xe756,  0xe762,  0xe76e,  0xe77a,
+0xe785,  0xe791,  0xe79d,  0xe7a8,  0xe7b4,  0xe7c0,
+0xe7cb,  0xe7d7,  0xe7e3,  0xe7ef,  0xe7fa,  0xe806,
+0xe812,  0xe81d,  0xe829,  0xe835,  0xe840,  0xe84c,
+0xe858,  0xe863,  0xe86f,  0xe87b,  0xe886,  0xe892,
+0xe89e,  0xe8a9,  0xe8b5,  0xe8c0,  0xe8cc,  0xe8d8,
+0xe8e3,  0xe8ef,  0xe8fb,  0xe906,  0xe912,  0xe91d,
+0xe929,  0xe935,  0xe940,  0xe94c,  0xe958,  0xe963,
+0xe96f,  0xe97a,  0xe986,  0xe991,  0xe99d,  0xe9a9,
+0xe9b4,  0xe9c0,  0xe9cb,  0xe9d7,  0xe9e3,  0xe9ee,
+0xe9fa,  0xea05,  0xea11,  0xea1c,  0xea28,  0xea33,
+0xea3f,  0xea4a,  0xea56,  0xea62,  0xea6d,  0xea79,
+0xea84,  0xea90,  0xea9b,  0xeaa7,  0xeab2,  0xeabe,
+0xeac9,  0xead5,  0xeae0,  0xeaec,  0xeaf7,  0xeb03,
+0xeb0e,  0xeb1a,  0xeb25,  0xeb31,  0xeb3c,  0xeb48,
+0xeb53,  0xeb5f,  0xeb6a,  0xeb76,  0xeb81,  0xeb8d,
+0xeb98,  0xeba3,  0xebaf,  0xebba,  0xebc6,  0xebd1,
+0xebdd,  0xebe8,  0xebf4,  0xebff,  0xec0a,  0xec16,
+0xec21,  0xec2d,  0xec38,  0xec44,  0xec4f,  0xec5a,
+0xec66,  0xec71,  0xec7d,  0xec88,  0xec93,  0xec9f,
+0xecaa,  0xecb6,  0xecc1,  0xeccc,  0xecd8,  0xece3,
+0xecef,  0xecfa,  0xed05,  0xed11,  0xed1c,  0xed27,
+0xed33,  0xed3e,  0xed4a,  0xed55,  0xed60,  0xed6c,
+0xed77,  0xed82,  0xed8e,  0xed99,  0xeda4,  0xedb0,
+0xedbb,  0xedc6,  0xedd2,  0xeddd,  0xede8,  0xedf4,
+0xedff,  0xee0a,  0xee15,  0xee21,  0xee2c,  0xee37,
+0xee43,  0xee4e,  0xee59,  0xee65,  0xee70,  0xee7b,
+0xee86,  0xee92,  0xee9d,  0xeea8,  0xeeb3,  0xeebf,
+0xeeca,  0xeed5,  0xeee1,  0xeeec,  0xeef7,  0xef02,
+0xef0e,  0xef19,  0xef24,  0xef2f,  0xef3a,  0xef46,
+0xef51,  0xef5c,  0xef67,  0xef73,  0xef7e,  0xef89,
+0xef94,  0xef9f,  0xefab,  0xefb6,  0xefc1,  0xefcc,
+0xefd7,  0xefe3,  0xefee,  0xeff9,  0xf004,  0xf00f,
+0xf01b,  0xf026,  0xf031,  0xf03c,  0xf047,  0xf052,
+0xf05e,  0xf069,  0xf074,  0xf07f,  0xf08a,  0xf095,
+0xf0a1,  0xf0ac,  0xf0b7,  0xf0c2,  0xf0cd,  0xf0d8,
+0xf0e3,  0xf0ef,  0xf0fa,  0xf105,  0xf110,  0xf11b,
+0xf126,  0xf131,  0xf13c,  0xf147,  0xf153,  0xf15e,
+0xf169,  0xf174,  0xf17f,  0xf18a,  0xf195,  0xf1a0,
+0xf1ab,  0xf1b6,  0xf1c2,  0xf1cd,  0xf1d8,  0xf1e3,
+0xf1ee,  0xf1f9,  0xf204,  0xf20f,  0xf21a,  0xf225,
+0xf230,  0xf23b,  0xf246,  0xf251,  0xf25c,  0xf267,
+0xf272,  0xf27d,  0xf288,  0xf293,  0xf29f,  0xf2aa,
+0xf2b5,  0xf2c0,  0xf2cb,  0xf2d6,  0xf2e1,  0xf2ec,
+0xf2f7,  0xf302,  0xf30d,  0xf318,  0xf323,  0xf32e,
+0xf339,  0xf344,  0xf34f,  0xf35a,  0xf364,  0xf36f,
+0xf37a,  0xf385,  0xf390,  0xf39b,  0xf3a6,  0xf3b1,
+0xf3bc,  0xf3c7,  0xf3d2,  0xf3dd,  0xf3e8,  0xf3f3,
+0xf3fe,  0xf409,  0xf414,  0xf41f,  0xf42a,  0xf435,
+0xf43f,  0xf44a,  0xf455,  0xf460,  0xf46b,  0xf476,
+0xf481,  0xf48c,  0xf497,  0xf4a2,  0xf4ad,  0xf4b7,
+0xf4c2,  0xf4cd,  0xf4d8,  0xf4e3,  0xf4ee,  0xf4f9,
+0xf504,  0xf50f,  0xf519,  0xf524,  0xf52f,  0xf53a,
+0xf545,  0xf550,  0xf55b,  0xf565,  0xf570,  0xf57b,
+0xf586,  0xf591,  0xf59c,  0xf5a6,  0xf5b1,  0xf5bc,
+0xf5c7,  0xf5d2,  0xf5dd,  0xf5e7,  0xf5f2,  0xf5fd,
+0xf608,  0xf613,  0xf61d,  0xf628,  0xf633,  0xf63e,
+0xf649,  0xf653,  0xf65e,  0xf669,  0xf674,  0xf67f,
+0xf689,  0xf694,  0xf69f,  0xf6aa,  0xf6b4,  0xf6bf,
+0xf6ca,  0xf6d5,  0xf6e0,  0xf6ea,  0xf6f5,  0xf700,
+0xf70b,  0xf715,  0xf720,  0xf72b,  0xf736,  0xf740,
+0xf74b,  0xf756,  0xf760,  0xf76b,  0xf776,  0xf781,
+0xf78b,  0xf796,  0xf7a1,  0xf7ab,  0xf7b6,  0xf7c1,
+0xf7cc,  0xf7d6,  0xf7e1,  0xf7ec,  0xf7f6,  0xf801,
+0xf80c,  0xf816,  0xf821,  0xf82c,  0xf836,  0xf841,
+0xf84c,  0xf856,  0xf861,  0xf86c,  0xf876,  0xf881,
+0xf88c,  0xf896,  0xf8a1,  0xf8ac,  0xf8b6,  0xf8c1,
+0xf8cc,  0xf8d6,  0xf8e1,  0xf8ec,  0xf8f6,  0xf901,
+0xf90b,  0xf916,  0xf921,  0xf92b,  0xf936,  0xf941,
+0xf94b,  0xf956,  0xf960,  0xf96b,  0xf976,  0xf980,
+0xf98b,  0xf995,  0xf9a0,  0xf9aa,  0xf9b5,  0xf9c0,
+0xf9ca,  0xf9d5,  0xf9df,  0xf9ea,  0xf9f4,  0xf9ff,
+0xfa0a,  0xfa14,  0xfa1f,  0xfa29,  0xfa34,  0xfa3e,
+0xfa49,  0xfa53,  0xfa5e,  0xfa69,  0xfa73,  0xfa7e,
+0xfa88,  0xfa93,  0xfa9d,  0xfaa8,  0xfab2,  0xfabd,
+0xfac7,  0xfad2,  0xfadc,  0xfae7,  0xfaf1,  0xfafc,
+0xfb06,  0xfb11,  0xfb1b,  0xfb26,  0xfb30,  0xfb3b,
+0xfb45,  0xfb50,  0xfb5a,  0xfb65,  0xfb6f,  0xfb7a,
+0xfb84,  0xfb8f,  0xfb99,  0xfba4,  0xfbae,  0xfbb8,
+0xfbc3,  0xfbcd,  0xfbd8,  0xfbe2,  0xfbed,  0xfbf7,
+0xfc02,  0xfc0c,  0xfc16,  0xfc21,  0xfc2b,  0xfc36,
+0xfc40,  0xfc4b,  0xfc55,  0xfc5f,  0xfc6a,  0xfc74,
+0xfc7f,  0xfc89,  0xfc93,  0xfc9e,  0xfca8,  0xfcb3,
+0xfcbd,  0xfcc7,  0xfcd2,  0xfcdc,  0xfce7,  0xfcf1,
+0xfcfb,  0xfd06,  0xfd10,  0xfd1a,  0xfd25,  0xfd2f,
+0xfd3a,  0xfd44,  0xfd4e,  0xfd59,  0xfd63,  0xfd6d,
+0xfd78,  0xfd82,  0xfd8c,  0xfd97,  0xfda1,  0xfdab,
+0xfdb6,  0xfdc0,  0xfdca,  0xfdd5,  0xfddf,  0xfde9,
+0xfdf4,  0xfdfe,  0xfe08,  0xfe13,  0xfe1d,  0xfe27,
+0xfe32,  0xfe3c,  0xfe46,  0xfe50,  0xfe5b,  0xfe65,
+0xfe6f,  0xfe7a,  0xfe84,  0xfe8e,  0xfe98,  0xfea3,
+0xfead,  0xfeb7,  0xfec1,  0xfecc,  0xfed6,  0xfee0,
+0xfeeb,  0xfef5,  0xfeff,  0xff09,  0xff14,  0xff1e,
+0xff28,  0xff32,  0xff3c,  0xff47,  0xff51,  0xff5b,
+0xff65,  0xff70,  0xff7a,  0xff84,  0xff8e,  0xff98,
+0xffa3,  0xffad,  0xffb7,  0xffc1,  0xffcc,  0xffd6,
+0xffe0,  0xffea,  0xfff4,  0xffff
+};
+
+// max value is pi/4
+constexpr double SCALING_FACTOR = 4. / M_PI * 0xFFFF;
+
+inline double atan2_lookup(double y, double x)
+{
+    if (std::abs(x) < std::numeric_limits<double>::epsilon())
+    {
+        if (y >= 0.)
+        {
+            return M_PI / 2.;
+        }
+        else
+        {
+            return -M_PI / 2.;
+        }
+    }
+
+    unsigned octant = 0;
+
+    if (x < 0.)
+    {
+        octant = 1;
+        x = -x;
+    }
+    if (y < 0.)
+    {
+        octant |= 2;
+        y = -y;
+    }
+
+    double t = y / x;
+    if (t > 1.0)
+    {
+        octant |= 4;
+        t = 1.0 / t;
+    }
+
+    double angle = atan_table[(unsigned)(t * 4095)] / SCALING_FACTOR;
+
+    switch (octant)
+    {
+    case 0:
+        break;
+    case 1:
+        angle = M_PI - angle;
+        break;
+    case 2:
+        angle = -angle;
+        break;
+    case 3:
+        angle = -M_PI + angle;
+        break;
+    case 4:
+        angle = M_PI / 2.0 - angle;
+        break;
+    case 5:
+        angle = M_PI / 2.0 + angle;
+        break;
+    case 6:
+        angle = -M_PI / 2.0 + angle;
+        break;
+    case 7:
+        angle = -M_PI / 2.0 - angle;
+        break;
+    }
+    return angle;
+}
+
+#endif // TRIGONOMETRY_TABLES_H
--- a/Util/bearing.cpp
+++ b/Util/bearing.cpp
@ -0,0 +1,65 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "bearing.hpp"
+
+std::string Bearing::Get(const double heading)
+{
+    if (heading <= 202.5)
+    {
+        if (heading >= 0. && heading <= 22.5)
+        {
+            return "N";
+        }
+        if (heading > 22.5 && heading <= 67.5)
+        {
+            return "NE";
+        }
+        if (heading > 67.5 && heading <= 112.5)
+        {
+            return "E";
+        }
+        if (heading > 112.5 && heading <= 157.5)
+        {
+            return "SE";
+        }
+        return "S";
+    }
+    if (heading > 202.5 && heading <= 247.5)
+    {
+        return "SW";
+    }
+    if (heading > 247.5 && heading <= 292.5)
+    {
+        return "W";
+    }
+    if (heading > 292.5 && heading <= 337.5)
+    {
+        return "NW";
+    }
+    return "N";
+}
--- a/include/osrm/engine_config.hpp
+++ b/include/osrm/engine_config.hpp
@ -1,6 +1,6 @@
 /*

-Copyright (c) 2017, Project OSRM contributors
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification,
@ -25,14 +25,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

-#ifndef GLOBAL_ENGINE_CONFIG_HPP
-#define GLOBAL_ENGINE_CONFIG_HPP
+#ifndef BEARING_HPP_
+#define BEARING_HPP_

-#include "engine/engine_config.hpp"
+#include <string>

-namespace osrm
+struct Bearing
 {
-using engine::EngineConfig;
-}
+    static std::string Get(const double heading);
+};

-#endif
+#endif // BEARING_HPP_
--- a/Util/cast.hpp
+++ b/Util/cast.hpp
@ -0,0 +1,188 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef CAST_HPP
+#define CAST_HPP
+
+#include <boost/spirit/include/karma.hpp>
+#include <boost/spirit/include/qi.hpp>
+
+#include <string>
+#include <type_traits>
+
+struct cast
+{
+    // convert scoped enums to integers
+    template <typename Enumeration>
+    static auto enum_to_underlying(Enumeration const value) -> typename std::underlying_type<Enumeration>::type
+    {
+        return static_cast<typename std::underlying_type<Enumeration>::type>(value);
+    }
+
+    template <typename Number>
+    static typename std::enable_if<std::is_integral<Number>::value, std::string>::type
+    integral_to_string(const Number value)
+    {
+        std::string output;
+        std::back_insert_iterator<std::string> sink(output);
+
+        if (8 == sizeof(Number))
+        {
+            boost::spirit::karma::generate(sink, boost::spirit::karma::long_long, value);
+        }
+        else
+        {
+            if (std::is_signed<Number>::value)
+            {
+                boost::spirit::karma::generate(sink, boost::spirit::karma::int_, value);
+            }
+            else
+            {
+                boost::spirit::karma::generate(sink, boost::spirit::karma::uint_, value);
+            }
+        }
+        return output;
+    }
+
+    static int string_to_int(const std::string &input)
+    {
+        auto first_digit = input.begin();
+        // Delete any trailing white-spaces
+        while (first_digit != input.end() && std::isspace(*first_digit))
+        {
+            ++first_digit;
+        }
+        int value = 0;
+        boost::spirit::qi::parse(first_digit, input.end(), boost::spirit::int_, value);
+        return value;
+    }
+
+    static unsigned string_to_uint(const std::string &input)
+    {
+        auto first_digit = input.begin();
+        // Delete any trailing white-spaces
+        while (first_digit != input.end() && (std::isspace(*first_digit) || '-' == *first_digit))
+        {
+            ++first_digit;
+        }
+        unsigned value = 0;
+        boost::spirit::qi::parse(first_digit, input.end(), boost::spirit::uint_, value);
+        return value;
+    }
+
+    static uint64_t string_to_uint64(const std::string &input)
+    {
+        auto first_digit = input.begin();
+        // Delete any trailing white-spaces
+        while (first_digit != input.end() && std::isspace(*first_digit))
+        {
+            ++first_digit;
+        }
+        uint64_t value = 0;
+        boost::spirit::qi::parse(first_digit, input.end(), boost::spirit::long_long, value);
+        return value;
+    }
+
+    // source: http://tinodidriksen.com/2011/05/28/cpp-convert-string-to-double-speed/
+    static double string_to_double(const char *p)
+    {
+        double r = 0.0;
+        bool neg = false;
+        if (*p == '-')
+        {
+            neg = true;
+            ++p;
+        }
+        while (*p >= '0' && *p <= '9')
+        {
+            r = (r * 10.0) + (*p - '0');
+            ++p;
+        }
+        if (*p == '.')
+        {
+            double f = 0.0;
+            int n = 0;
+            ++p;
+            while (*p >= '0' && *p <= '9')
+            {
+                f = (f * 10.0) + (*p - '0');
+                ++p;
+                ++n;
+            }
+            r += f / std::pow(10.0, n);
+        }
+        if (neg)
+        {
+            r = -r;
+        }
+        return r;
+    }
+
+    template <typename T> struct scientific_policy : boost::spirit::karma::real_policies<T>
+    {
+        //  we want the numbers always to be in fixed format
+        static int floatfield(T)
+        {
+            return boost::spirit::karma::real_policies<T>::fmtflags::fixed;
+        }
+        static unsigned int precision(T) { return 6; }
+    };
+    typedef boost::spirit::karma::real_generator<double, scientific_policy<double>> science_type;
+
+    static std::string double_fixed_to_string(const double value)
+    {
+        std::string output;
+        std::back_insert_iterator<std::string> sink(output);
+        boost::spirit::karma::generate(sink, science_type(), value);
+        if (output.size() >= 2 && output[output.size() - 2] == '.' &&
+            output[output.size() - 1] == '0')
+        {
+            output.resize(output.size() - 2);
+        }
+        return output;
+    }
+
+    static std::string double_to_string(const double value)
+    {
+        std::string output;
+        std::back_insert_iterator<std::string> sink(output);
+        boost::spirit::karma::generate(sink, value);
+        return output;
+    }
+
+    static void double_with_two_digits_to_string(const double value,
+                                                              std::string &output)
+    {
+        // The largest 32-bit integer is 4294967295, that is 10 chars
+        // On the safe side, add 1 for sign, and 1 for trailing zero
+        char buffer[12];
+        sprintf(buffer, "%g", value);
+        output = buffer;
+    }
+};
+
+#endif // CAST_HPP
--- a/Util/compute_angle.cpp
+++ b/Util/compute_angle.cpp
@ -0,0 +1,51 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "compute_angle.hpp"
+
+#include "TrigonometryTables.h"
+#include "../Util/MercatorUtil.h"
+#include <osrm/Coordinate.h>
+
+#include <cmath>
+
+double ComputeAngle::OfThreeFixedPointCoordinates(const FixedPointCoordinate &A,
+                                                  const FixedPointCoordinate &C,
+                                                  const FixedPointCoordinate &B)
+{
+    const double v1x = (A.lon - C.lon) / COORDINATE_PRECISION;
+    const double v1y = lat2y(A.lat / COORDINATE_PRECISION) - lat2y(C.lat / COORDINATE_PRECISION);
+    const double v2x = (B.lon - C.lon) / COORDINATE_PRECISION;
+    const double v2y = lat2y(B.lat / COORDINATE_PRECISION) - lat2y(C.lat / COORDINATE_PRECISION);
+
+    double angle = (atan2_lookup(v2y, v2x) - atan2_lookup(v1y, v1x)) * 180. / M_PI;
+    while (angle < 0.)
+    {
+        angle += 360.;
+    }
+    return angle;
+}
--- a/Util/compute_angle.hpp
+++ b/Util/compute_angle.hpp
@ -0,0 +1,41 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef COMPUTE_ANGLE_HPP
+#define COMPUTE_ANGLE_HPP
+
+struct FixedPointCoordinate;
+struct NodeInfo;
+
+struct ComputeAngle
+{
+    /* Get angle of line segment (A,C)->(C,B), atan2 magic, formerly cosine theorem*/
+    static double OfThreeFixedPointCoordinates(const FixedPointCoordinate &A,
+                                               const FixedPointCoordinate &C,
+                                               const FixedPointCoordinate &B);
+};
+#endif // COMPUTE_ANGLE_HPP
--- a/Util/container.hpp
+++ b/Util/container.hpp
@ -0,0 +1,82 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef CONTAINER_HPP_
+#define CONTAINER_HPP_
+
+#include <algorithm>
+#include <iterator>
+#include <vector>
+
+namespace osrm
+{
+template <typename T> void sort_unique_resize(std::vector<T> &vector)
+{
+    std::sort(vector.begin(), vector.end());
+    const auto number_of_unique_elements = std::unique(vector.begin(), vector.end()) - vector.begin();
+    vector.resize(number_of_unique_elements);
+}
+
+// template <typename T> inline void sort_unique_resize_shrink_vector(std::vector<T> &vector)
+// {
+//     sort_unique_resize(vector);
+//     vector.shrink_to_fit();
+// }
+
+// template <typename T> inline void remove_consecutive_duplicates_from_vector(std::vector<T> &vector)
+// {
+//     const auto number_of_unique_elements = std::unique(vector.begin(), vector.end()) - vector.begin();
+//     vector.resize(number_of_unique_elements);
+// }
+
+template <typename ForwardIterator, typename Function>
+Function for_each_pair(ForwardIterator begin, ForwardIterator end, Function function)
+{
+    if (begin == end)
+    {
+        return function;
+    }
+
+    auto next = begin;
+    next = std::next(next);
+
+    while (next != end)
+    {
+        function(*begin, *next);
+        begin = std::next(begin); next = std::next(next);
+    }
+    return function;
+}
+
+template <class ContainerT, typename Function>
+Function for_each_pair(ContainerT &container, Function function)
+{
+    return for_each_pair(std::begin(container), std::end(container), function);
+}
+
+}
+#endif /* CONTAINER_HPP_ */
--- a/Util/finger_print.cpp.in
+++ b/Util/finger_print.cpp.in
@ -0,0 +1,103 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "FingerPrint.h"
+
+#include "osrm_exception.hpp"
+
+#include <boost/uuid/name_generator.hpp>
+
+#include <algorithm>
+#include <string>
+
+#cmakedefine01 HAS64BITS
+#cmakedefine MD5PREPARE "${MD5PREPARE}"
+#cmakedefine MD5RTREE "${MD5RTREE}"
+#cmakedefine MD5GRAPH "${MD5GRAPH}"
+#cmakedefine MD5OBJECTS "${MD5OBJECTS}"
+
+FingerPrint::FingerPrint() : magic_number(1297240911)
+{
+    md5_prepare[32] = md5_tree[32] = md5_graph[32] = md5_objects[32] = '\0';
+
+    boost::uuids::name_generator gen(named_uuid);
+    std::string temp_string;
+
+    std::memcpy(md5_prepare, MD5PREPARE, strlen(MD5PREPARE));
+    temp_string += md5_prepare;
+    std::memcpy(md5_tree, MD5RTREE, 32);
+    temp_string += md5_tree;
+    std::memcpy(md5_graph, MD5GRAPH, 32);
+    temp_string += md5_graph;
+    std::memcpy(md5_objects, MD5OBJECTS, 32);
+    temp_string += md5_objects;
+
+    named_uuid = gen(temp_string);
+    has_64_bits = HAS64BITS;
+}
+
+FingerPrint::~FingerPrint() {}
+
+const boost::uuids::uuid &FingerPrint::GetFingerPrint() const { return named_uuid; }
+
+bool FingerPrint::IsMagicNumberOK() const { return 1297240911 == magic_number; }
+
+bool FingerPrint::TestGraphUtil(const FingerPrint &other) const
+{
+    if (!other.IsMagicNumberOK())
+    {
+        throw osrm::exception("hsgr input file misses magic number. Check or reprocess the file");
+    }
+    return std::equal(md5_graph, md5_graph + 32, other.md5_graph);
+}
+
+bool FingerPrint::TestPrepare(const FingerPrint &other) const
+{
+    if (!other.IsMagicNumberOK())
+    {
+        throw osrm::exception("osrm input file misses magic number. Check or reprocess the file");
+    }
+    return std::equal(md5_prepare, md5_prepare + 32, other.md5_prepare);
+}
+
+bool FingerPrint::TestRTree(const FingerPrint &other) const
+{
+    if (!other.IsMagicNumberOK())
+    {
+        throw osrm::exception("r-tree input file misses magic number. Check or reprocess the file");
+    }
+    return std::equal(md5_tree, md5_tree + 32, other.md5_tree);
+}
+
+bool FingerPrint::TestQueryObjects(const FingerPrint &other) const
+{
+    if (!other.IsMagicNumberOK())
+    {
+        throw osrm::exception("missing magic number. Check or reprocess the file");
+    }
+    return std::equal(md5_objects, md5_objects + 32, other.md5_objects);
+}
--- a/include/osrm/customizer.hpp
+++ b/include/osrm/customizer.hpp
@ -1,6 +1,5 @@
 /*
-
-Copyright (c) 2017, Project OSRM contributors
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification,
@ -25,26 +24,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

-#ifndef OSRM_CUSTOMIZER_HPP
-#define OSRM_CUSTOMIZER_HPP
+#ifndef FLOATING_POINT_HPP
+#define FLOATING_POINT_HPP
+
+#include <cmath>
+
+#include <limits>
+#include <type_traits>

 namespace osrm
 {
-
-namespace customizer
+template <typename FloatT> bool epsilon_compare(const FloatT number1, const FloatT number2)
 {
-struct CustomizationConfig;
-} // namespace customizer
+    static_assert(std::is_floating_point<FloatT>::value, "type must be floating point");
+    return (std::abs(number1 - number2) < std::numeric_limits<FloatT>::epsilon());
+}
+}

-/**
- * Runs customize pipeline stage.
- *
- * \param config The user-provided customization configuration.
- * \throws TODO
- * \see Customizer, CustomizationConfig
- */
-void customize(const customizer::CustomizationConfig &config);
-
-} // namespace osrm
-
-#endif // OSRM_CUSTOMIZER_HPP
+#endif // FLOATING_POINT_HPP
--- a/include/osrm/bearing.hpp
+++ b/include/osrm/bearing.hpp
@ -1,6 +1,6 @@
 /*

-Copyright (c) 2017, Project OSRM contributors
+Copyright (c) 2015, Project OSRM, Dennis Luxen, others
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification,
@ -25,14 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

-#ifndef OSRM_BEARING_HPP
-#define OSRM_BEARING_HPP
+#include "git_sha.hpp"

-#include "engine/bearing.hpp"
-
-namespace osrm
-{
-using engine::Bearing;
-}
-
-#endif
+#define GIT_DESCRIPTION "${GIT_DESCRIPTION}"
+char g_GIT_DESCRIPTION[] = GIT_DESCRIPTION;
--- a/include/osrm/status.hpp
+++ b/include/osrm/status.hpp
@ -1,6 +1,6 @@
 /*

-Copyright (c) 2017, Project OSRM contributors
+Copyright (c) 2015, Project OSRM, Dennis Luxen, others
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification,
@ -25,14 +25,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

-#ifndef OSRM_STATUS_HPP
-#define OSRM_STATUS_HPP
+#ifndef GIT_SHA_HPP
+#define GIT_SHA_HPP

-#include "engine/status.hpp"
+extern char g_GIT_DESCRIPTION[];

-namespace osrm
-{
-using engine::Status;
-}
-
-#endif
+#endif //GIT_SHA_HPP
--- a/Util/graph_loader.hpp
+++ b/Util/graph_loader.hpp
@ -0,0 +1,325 @@
+/*
+
+Copyright (c) 2015, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef GRAPHLOADER_H
+#define GRAPHLOADER_H
+
+#include "osrm_exception.hpp"
+#include "../data_structures/external_memory_node.hpp"
+#include "../data_structures/import_edge.hpp"
+#include "../data_structures/query_node.hpp"
+#include "../data_structures/restriction.hpp"
+#include "../Util/simple_logger.hpp"
+#include "../Util/FingerPrint.h"
+#include "../typedefs.h"
+
+#include <boost/assert.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
+
+#include <tbb/parallel_sort.h>
+
+#include <cmath>
+
+#include <algorithm>
+#include <fstream>
+#include <iostream>
+#include <iomanip>
+#include <unordered_map>
+#include <vector>
+
+template <typename EdgeT>
+NodeID readBinaryOSRMGraphFromStream(std::istream &input_stream,
+                                     std::vector<EdgeT> &edge_list,
+                                     std::vector<NodeID> &barrier_node_list,
+                                     std::vector<NodeID> &traffic_light_node_list,
+                                     std::vector<QueryNode> *int_to_ext_node_id_map,
+                                     std::vector<TurnRestriction> &restriction_list)
+{
+    const FingerPrint fingerprint_orig;
+    FingerPrint fingerprint_loaded;
+    input_stream.read((char *)&fingerprint_loaded, sizeof(FingerPrint));
+
+    if (!fingerprint_loaded.TestGraphUtil(fingerprint_orig))
+    {
+        SimpleLogger().Write(logWARNING) << ".osrm was prepared with different build.\n"
+                                            "Reprocess to get rid of this warning.";
+    }
+
+    std::unordered_map<NodeID, NodeID> ext_to_int_id_map;
+
+    NodeID n;
+    input_stream.read((char *)&n, sizeof(NodeID));
+    SimpleLogger().Write() << "Importing n = " << n << " nodes ";
+
+    ExternalMemoryNode current_node;
+    for (NodeID i = 0; i < n; ++i)
+    {
+        input_stream.read((char *)&current_node, sizeof(ExternalMemoryNode));
+        int_to_ext_node_id_map->emplace_back(current_node.lat, current_node.lon, current_node.node_id);
+        ext_to_int_id_map.emplace(current_node.node_id, i);
+        if (current_node.barrier)
+        {
+            barrier_node_list.emplace_back(i);
+        }
+        if (current_node.traffic_lights)
+        {
+            traffic_light_node_list.emplace_back(i);
+        }
+    }
+
+    // tighten vector sizes
+    barrier_node_list.shrink_to_fit();
+    traffic_light_node_list.shrink_to_fit();
+
+    // renumber nodes in turn restrictions
+    for (TurnRestriction &current_restriction : restriction_list)
+    {
+        auto internal_id_iter = ext_to_int_id_map.find(current_restriction.from.node);
+        if (internal_id_iter == ext_to_int_id_map.end())
+        {
+            SimpleLogger().Write(logDEBUG) << "Unmapped from Node of restriction";
+            continue;
+        }
+        current_restriction.from.node = internal_id_iter->second;
+
+        internal_id_iter = ext_to_int_id_map.find(current_restriction.via.node);
+        if (internal_id_iter == ext_to_int_id_map.end())
+        {
+            SimpleLogger().Write(logDEBUG) << "Unmapped via node of restriction";
+            continue;
+        }
+        current_restriction.via.node = internal_id_iter->second;
+
+        internal_id_iter = ext_to_int_id_map.find(current_restriction.to.node);
+        if (internal_id_iter == ext_to_int_id_map.end())
+        {
+            SimpleLogger().Write(logDEBUG) << "Unmapped to node of restriction";
+            continue;
+        }
+        current_restriction.to.node = internal_id_iter->second;
+    }
+
+    EdgeWeight weight;
+    NodeID source, target;
+    unsigned nameID;
+    int length;
+    short dir; // direction (0 = open, 1 = forward, 2+ = open)
+    bool is_roundabout, ignore_in_grid, is_access_restricted, is_split;
+    TravelMode travel_mode;
+
+    EdgeID m;
+    input_stream.read((char *)&m, sizeof(unsigned));
+    edge_list.reserve(m);
+    SimpleLogger().Write() << " and " << m << " edges ";
+
+    for (EdgeID i = 0; i < m; ++i)
+    {
+        input_stream.read((char *)&source, sizeof(unsigned));
+        input_stream.read((char *)&target, sizeof(unsigned));
+        input_stream.read((char *)&length, sizeof(int));
+        input_stream.read((char *)&dir, sizeof(short));
+        input_stream.read((char *)&weight, sizeof(int));
+        input_stream.read((char *)&nameID, sizeof(unsigned));
+        input_stream.read((char *)&is_roundabout, sizeof(bool));
+        input_stream.read((char *)&ignore_in_grid, sizeof(bool));
+        input_stream.read((char *)&is_access_restricted, sizeof(bool));
+        input_stream.read((char *)&travel_mode, sizeof(TravelMode));
+        input_stream.read((char *)&is_split, sizeof(bool));
+
+        BOOST_ASSERT_MSG(length > 0, "loaded null length edge");
+        BOOST_ASSERT_MSG(weight > 0, "loaded null weight");
+        BOOST_ASSERT_MSG(0 <= dir && dir <= 2, "loaded bogus direction");
+
+        bool forward = true;
+        bool backward = true;
+        if (1 == dir)
+        {
+            backward = false;
+        }
+        if (2 == dir)
+        {
+            forward = false;
+        }
+
+        // translate the external NodeIDs to internal IDs
+        auto internal_id_iter = ext_to_int_id_map.find(source);
+        if (ext_to_int_id_map.find(source) == ext_to_int_id_map.end())
+        {
+#ifndef NDEBUG
+            SimpleLogger().Write(logWARNING) << " unresolved source NodeID: " << source;
+#endif
+            continue;
+        }
+        source = internal_id_iter->second;
+        internal_id_iter = ext_to_int_id_map.find(target);
+        if (ext_to_int_id_map.find(target) == ext_to_int_id_map.end())
+        {
+#ifndef NDEBUG
+            SimpleLogger().Write(logWARNING) << "unresolved target NodeID : " << target;
+#endif
+            continue;
+        }
+        target = internal_id_iter->second;
+        BOOST_ASSERT_MSG(source != SPECIAL_NODEID && target != SPECIAL_NODEID,
+                         "nonexisting source or target");
+
+        if (source > target)
+        {
+            std::swap(source, target);
+            std::swap(forward, backward);
+        }
+
+        edge_list.emplace_back(source,
+                               target,
+                               nameID,
+                               weight,
+                               forward,
+                               backward,
+                               is_roundabout,
+                               ignore_in_grid,
+                               is_access_restricted,
+                               travel_mode,
+                               is_split);
+    }
+    ext_to_int_id_map.clear();
+
+    tbb::parallel_sort(edge_list.begin(), edge_list.end());
+
+    for (unsigned i = 1; i < edge_list.size(); ++i)
+    {
+        if ((edge_list[i - 1].target == edge_list[i].target) &&
+            (edge_list[i - 1].source == edge_list[i].source))
+        {
+            const bool edge_flags_equivalent =
+                (edge_list[i - 1].forward == edge_list[i].forward) &&
+                (edge_list[i - 1].backward == edge_list[i].backward);
+            const bool edge_flags_are_superset1 =
+                (edge_list[i - 1].forward && edge_list[i - 1].backward) &&
+                (edge_list[i].forward != edge_list[i].backward);
+            const bool edge_flags_are_superset_2 =
+                (edge_list[i].forward && edge_list[i].backward) &&
+                (edge_list[i - 1].forward != edge_list[i - 1].backward);
+
+            if (edge_flags_equivalent)
+            {
+                edge_list[i].weight = std::min(edge_list[i - 1].weight, edge_list[i].weight);
+                edge_list[i - 1].source = SPECIAL_NODEID;
+            }
+            else if (edge_flags_are_superset1)
+            {
+                if (edge_list[i - 1].weight <= edge_list[i].weight)
+                {
+                    // edge i-1 is smaller and goes in both directions. Throw away the other edge
+                    edge_list[i].source = SPECIAL_NODEID;
+                }
+                else
+                {
+                    // edge i-1 is open in both directions, but edge i is smaller in one direction.
+                    // Close edge i-1 in this direction
+                    edge_list[i - 1].forward = !edge_list[i].forward;
+                    edge_list[i - 1].backward = !edge_list[i].backward;
+                }
+            }
+            else if (edge_flags_are_superset_2)
+            {
+                if (edge_list[i - 1].weight <= edge_list[i].weight)
+                {
+                    // edge i-1 is smaller for one direction. edge i is open in both. close edge i
+                    // in the other direction
+                    edge_list[i].forward = !edge_list[i - 1].forward;
+                    edge_list[i].backward = !edge_list[i - 1].backward;
+                }
+                else
+                {
+                    // edge i is smaller and goes in both direction. Throw away edge i-1
+                    edge_list[i - 1].source = SPECIAL_NODEID;
+                }
+            }
+        }
+    }
+    const auto new_end_iter = std::remove_if(edge_list.begin(), edge_list.end(), [] (const EdgeT &edge)
+                                        {
+                                            return edge.source == SPECIAL_NODEID ||
+                                                   edge.target == SPECIAL_NODEID;
+                                        });
+    edge_list.erase(new_end_iter, edge_list.end()); // remove excess candidates.
+    edge_list.shrink_to_fit();
+    SimpleLogger().Write() << "Graph loaded ok and has " << edge_list.size() << " edges";
+    return n;
+}
+
+template <typename NodeT, typename EdgeT>
+unsigned readHSGRFromStream(const boost::filesystem::path &hsgr_file,
+                            std::vector<NodeT> &node_list,
+                            std::vector<EdgeT> &edge_list,
+                            unsigned *check_sum)
+{
+    if (!boost::filesystem::exists(hsgr_file))
+    {
+        throw osrm::exception("hsgr file does not exist");
+    }
+    if (0 == boost::filesystem::file_size(hsgr_file))
+    {
+        throw osrm::exception("hsgr file is empty");
+    }
+
+    boost::filesystem::ifstream hsgr_input_stream(hsgr_file, std::ios::binary);
+
+    FingerPrint fingerprint_loaded, fingerprint_orig;
+    hsgr_input_stream.read((char *)&fingerprint_loaded, sizeof(FingerPrint));
+    if (!fingerprint_loaded.TestGraphUtil(fingerprint_orig))
+    {
+        SimpleLogger().Write(logWARNING) << ".hsgr was prepared with different build.\n"
+                                            "Reprocess to get rid of this warning.";
+    }
+
+    unsigned number_of_nodes = 0;
+    unsigned number_of_edges = 0;
+    hsgr_input_stream.read((char *)check_sum, sizeof(unsigned));
+    hsgr_input_stream.read((char *)&number_of_nodes, sizeof(unsigned));
+    BOOST_ASSERT_MSG(0 != number_of_nodes, "number of nodes is zero");
+    hsgr_input_stream.read((char *)&number_of_edges, sizeof(unsigned));
+
+    SimpleLogger().Write() << "number_of_nodes: " << number_of_nodes
+                           << ", number_of_edges: " << number_of_edges;
+
+    // BOOST_ASSERT_MSG( 0 != number_of_edges, "number of edges is zero");
+    node_list.resize(number_of_nodes);
+    hsgr_input_stream.read((char *)&(node_list[0]), number_of_nodes * sizeof(NodeT));
+
+    edge_list.resize(number_of_edges);
+    if (number_of_edges > 0)
+    {
+        hsgr_input_stream.read((char *)&(edge_list[0]), number_of_edges * sizeof(EdgeT));
+    }
+    hsgr_input_stream.close();
+
+    return number_of_nodes;
+}
+
+#endif // GRAPHLOADER_H
--- a/Util/integer_range.hpp
+++ b/Util/integer_range.hpp
@ -0,0 +1,70 @@
+/*
+
+Copyright (c) 2013,2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef INTEGER_RANGE_HPP
+#define INTEGER_RANGE_HPP
+
+#include <type_traits>
+
+namespace osrm
+{
+
+template <typename Integer> class range
+{
+  private:
+    Integer last;
+    Integer iter;
+
+  public:
+    range(Integer start, Integer end) : last(end), iter(start)
+    {
+        static_assert(std::is_integral<Integer>::value, "range type must be integral");
+    }
+
+    // Iterable functions
+    const range &begin() const { return *this; }
+    const range &end() const { return *this; }
+    Integer front() const { return iter; }
+    Integer back() const { return last - 1; }
+
+    // Iterator functions
+    bool operator!=(const range &) const { return iter < last; }
+    void operator++() { ++iter; }
+    Integer operator*() const { return iter; }
+};
+
+// convenience function to construct an integer range with type deduction
+template <typename Integer>
+range<Integer> irange(const Integer first,
+                      const Integer last,
+                      typename std::enable_if<std::is_integral<Integer>::value>::type * = 0)
+{
+    return range<Integer>(first, last);
+}
+}
+
+#endif // INTEGER_RANGE_HPP
--- a/Util/iterator_range.hpp
+++ b/Util/iterator_range.hpp
@ -0,0 +1,72 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef RANGE_HPP_
+#define RANGE_HPP_
+
+namespace osrm
+{
+namespace util
+{
+template <typename Iterator> class Range
+{
+  public:
+    Range(Iterator begin, Iterator end) : begin_(begin), end_(end) {}
+
+    Iterator begin() const { return begin_; }
+    Iterator end() const { return end_; }
+
+  private:
+    Iterator begin_;
+    Iterator end_;
+};
+
+// Convenience functions for template parameter inference,
+// akin to std::make_pair.
+
+template <typename Iterator> Range<Iterator> range(Iterator begin, Iterator end)
+{
+    return Range<Iterator>(begin, end);
+}
+
+template <typename Reversable>
+Range<typename Reversable::reverse_iterator> reverse(Reversable *reversable)
+{
+    return Range<typename Reversable::reverse_iterator>(reversable->rbegin(), reversable->rend());
+}
+
+template <typename ConstReversable>
+Range<typename ConstReversable::const_reverse_iterator>
+const_reverse(const ConstReversable *const_reversable)
+{
+    return Range<typename ConstReversable::const_reverse_iterator>(const_reversable->crbegin(),
+                                                                   const_reversable->crend());
+}
+}
+}
+
+#endif // RANGE_HPP_
--- a/Util/json_renderer.hpp
+++ b/Util/json_renderer.hpp
@ -0,0 +1,182 @@
+/*
+
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+// based on
+// https://svn.apache.org/repos/asf/mesos/tags/release-0.9.0-incubating-RC0/src/common/json.hpp
+
+#ifndef JSON_RENDERER_HPP
+#define JSON_RENDERER_HPP
+
+#include "../data_structures/json_container.hpp"
+#include "cast.hpp"
+
+namespace JSON {
+
+struct Renderer : mapbox::util::static_visitor<>
+{
+    explicit Renderer(std::ostream &_out) : out(_out) {}
+
+    void operator()(const String &string) const { out << "\"" << string.value << "\""; }
+
+    void operator()(const Number &number) const
+    {
+        out.precision(10);
+        out << number.value;
+    }
+
+    void operator()(const Object &object) const
+    {
+        out << "{";
+        auto iterator = object.values.begin();
+        while (iterator != object.values.end())
+        {
+            out << "\"" << (*iterator).first << "\":";
+            mapbox::util::apply_visitor(Renderer(out), (*iterator).second);
+            if (++iterator != object.values.end())
+            {
+                out << ",";
+            }
+        }
+        out << "}";
+    }
+
+    void operator()(const Array &array) const
+    {
+        out << "[";
+        std::vector<Value>::const_iterator iterator;
+        iterator = array.values.begin();
+        while (iterator != array.values.end())
+        {
+            mapbox::util::apply_visitor(Renderer(out), *iterator);
+            if (++iterator != array.values.end())
+            {
+                out << ",";
+            }
+        }
+        out << "]";
+    }
+
+    void operator()(const True &) const { out << "true"; }
+
+    void operator()(const False &) const { out << "false"; }
+
+    void operator()(const Null &) const { out << "null"; }
+
+  private:
+    std::ostream &out;
+};
+
+struct ArrayRenderer : mapbox::util::static_visitor<>
+{
+    explicit ArrayRenderer(std::vector<char> &_out) : out(_out) {}
+
+    void operator()(const String &string) const
+    {
+        out.push_back('\"');
+        out.insert(out.end(), string.value.begin(), string.value.end());
+        out.push_back('\"');
+    }
+
+    void operator()(const Number &number) const
+    {
+        const std::string number_string = cast::double_fixed_to_string(number.value);
+        out.insert(out.end(), number_string.begin(), number_string.end());
+    }
+
+    void operator()(const Object &object) const
+    {
+        out.push_back('{');
+        auto iterator = object.values.begin();
+        while (iterator != object.values.end())
+        {
+            out.push_back('\"');
+            out.insert(out.end(), (*iterator).first.begin(), (*iterator).first.end());
+            out.push_back('\"');
+            out.push_back(':');
+
+            mapbox::util::apply_visitor(ArrayRenderer(out), (*iterator).second);
+            if (++iterator != object.values.end())
+            {
+                out.push_back(',');
+            }
+        }
+        out.push_back('}');
+    }
+
+    void operator()(const Array &array) const
+    {
+        out.push_back('[');
+        std::vector<Value>::const_iterator iterator;
+        iterator = array.values.begin();
+        while (iterator != array.values.end())
+        {
+            mapbox::util::apply_visitor(ArrayRenderer(out), *iterator);
+            if (++iterator != array.values.end())
+            {
+                out.push_back(',');
+            }
+        }
+        out.push_back(']');
+    }
+
+    void operator()(const True &) const
+    {
+        const std::string temp("true");
+        out.insert(out.end(), temp.begin(), temp.end());
+    }
+
+    void operator()(const False &) const
+    {
+        const std::string temp("false");
+        out.insert(out.end(), temp.begin(), temp.end());
+    }
+
+    void operator()(const Null &) const
+    {
+        const std::string temp("null");
+        out.insert(out.end(), temp.begin(), temp.end());
+    }
+
+  private:
+    std::vector<char> &out;
+};
+
+inline void render(std::ostream &out, const Object &object)
+{
+    Value value = object;
+    mapbox::util::apply_visitor(Renderer(out), value);
+}
+
+inline void render(std::vector<char> &out, const Object &object)
+{
+    Value value = object;
+    mapbox::util::apply_visitor(ArrayRenderer(out), value);
+}
+
+} // namespace JSON
+
+#endif // JSON_RENDERER_HPP
--- a/Util/lua_util.hpp
+++ b/Util/lua_util.hpp
@ -0,0 +1,66 @@
+/*
+
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef LUA_UTIL_HPP
+#define LUA_UTIL_HPP
+
+extern "C" {
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+}
+
+#include <boost/filesystem/convenience.hpp>
+#include <luabind/luabind.hpp>
+
+#include <iostream>
+#include <string>
+
+template <typename T> void LUA_print(T output) { std::cout << "[LUA] " << output << std::endl; }
+
+// Check if the lua function <name> is defined
+inline bool lua_function_exists(lua_State *lua_state, const char *name)
+{
+    luabind::object globals_table = luabind::globals(lua_state);
+    luabind::object lua_function = globals_table[name];
+    return lua_function && (luabind::type(lua_function) == LUA_TFUNCTION);
+}
+
+// Add the folder contain the script to the lua load path, so script can easily require() other lua
+// scripts inside that folder, or subfolders.
+// See http://lua-users.org/wiki/PackagePath for details on the package.path syntax.
+inline void luaAddScriptFolderToLoadPath(lua_State *lua_state, const char *file_name)
+{
+    const boost::filesystem::path profile_path(file_name);
+    std::string folder = profile_path.parent_path().string();
+    // TODO: This code is most probably not Windows safe since it uses UNIX'ish path delimiters
+    const std::string lua_code =
+        "package.path = \"" + folder + "/?.lua;profiles/?.lua;\" .. package.path";
+    luaL_dostring(lua_state, lua_code.c_str());
+}
+
+#endif // LUA_UTIL_HPP
--- a/Util/make_unique.hpp
+++ b/Util/make_unique.hpp
@ -0,0 +1,57 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef MAKE_UNIQUE_H_
+#define MAKE_UNIQUE_H_
+
+#include <cstdlib>
+#include <memory>
+#include <type_traits>
+
+namespace osrm
+{
+// Taken from http://msdn.microsoft.com/en-us/library/dn439780.asp
+// Note, that the snippet was broken there and needed minor massaging
+
+// make_unique<T>
+template <class T, class... Types> std::unique_ptr<T> make_unique(Types &&... Args)
+{
+    return (std::unique_ptr<T>(new T(std::forward<Types>(Args)...)));
+}
+
+// make_unique<T[]>
+template <class T> std::unique_ptr<T[]> make_unique(std::size_t Size)
+{
+    return (std::unique_ptr<T>(new T[Size]()));
+}
+
+// make_unique<T[N]> disallowed
+template <class T, class... Types>
+typename std::enable_if<std::extent<T>::value != 0, void>::type make_unique(Types &&...) = delete;
+}
+
+#endif //MAKE_UNIQUE_H_
--- a/Util/osrm_exception.cpp
+++ b/Util/osrm_exception.cpp
@ -0,0 +1,43 @@
+/*
+
+Copyright (c) 2015, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "osrm_exception.hpp"
+
+namespace osrm
+{
+    // This function exists to 'anchor' the class, and stop the compiler from
+    // copying vtable and RTTI info into every object file that includes
+    // this header. (Caught by -Wweak-vtables under Clang.)
+
+    // More information from the LLVM Coding Standards:
+    // If a class is defined in a header file and has a vtable (either it has
+    // virtual methods or it derives from classes with virtual methods), it must
+    // always have at least one out-of-line virtual method in the class. Without
+    // this, the compiler will copy the vtable and RTTI into every .o file that
+    // #includes the header, bloating .o file sizes and increasing link times.
+    void exception::anchor() const { }
+}
--- a/include/osrm/contractor.hpp
+++ b/include/osrm/contractor.hpp
@ -1,6 +1,6 @@
 /*

-Copyright (c) 2017, Project OSRM contributors
+Copyright (c) 2015, Project OSRM, Dennis Luxen, others
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification,
@ -25,26 +25,27 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */

-#ifndef OSRM_CONTRACTOR_HPP
-#define OSRM_CONTRACTOR_HPP
+#ifndef OSRM_EXCEPTION_HPP
+#define OSRM_EXCEPTION_HPP
+
+#include <exception>
+#include <string>

 namespace osrm
 {
-namespace contractor
+class exception final : public std::exception
 {
-struct ContractorConfig;
+  public:
+    explicit exception(const char *message) : message(message) {}
+    explicit exception(const std::string &message) : message(message) {}

-} // namespace contractor
-
-/**
- * Runs contraction hierarchy computation process.
- *
- * \param config The user-provided contraction configuration.
- * \throws osrm::util::exception
- * \see Contractor, ContractorConfig
- */
-void contract(const contractor::ContractorConfig &config);
-
-} // namespace osrm
-
-#endif // OSRM_CONTRACTOR_HPP
+  private:
+    // This function exists to 'anchor' the class, and stop the compiler from
+    // copying vtable and RTTI info into every object file that includes
+    // this header. (Caught by -Wweak-vtables under Clang.)
+    virtual void anchor() const;
+    const char *what() const noexcept { return message.c_str(); }
+    const std::string message;
+};
+}
+#endif /* OSRM_EXCEPTION_HPP */
--- a/Util/range_algorithms.hpp
+++ b/Util/range_algorithms.hpp
@ -0,0 +1,42 @@
+/*
+    open source routing machine
+    Copyright (C) Dennis Luxen, others 2010
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU AFFERO General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+or see http://www.gnu.org/licenses/agpl.txt.
+ */
+
+#ifndef RANGE_ALGORITHMS_HPP
+#define RANGE_ALGORITHMS_HPP
+
+#include <algorithm>
+
+namespace osrm {
+
+template<class Container>
+auto max_element(const Container & c) -> decltype(std::max_element(c.begin(), c.end()))
+{
+    return std::max_element(c.begin(), c.end());
+}
+
+template<class Container>
+auto max_element(const Container & c) -> decltype(std::max_element(c.cbegin(), c.cend()))
+{
+    return std::max_element(c.cbegin(), c.cend());
+}
+
+}
+
+#endif // RANGE_ALGORITHMS_HPP
--- a/Util/simple_logger.cpp
+++ b/Util/simple_logger.cpp
@ -0,0 +1,135 @@
+/*
+
+Copyright (c) 2015, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "simple_logger.hpp"
+
+#include "osrm_exception.hpp"
+
+#include <boost/assert.hpp>
+
+#include <cstdio>
+
+#ifdef _MSC_VER
+#include <io.h>
+#define isatty _isatty
+#define fileno _fileno
+#else
+#include <unistd.h>
+#endif
+
+#include <ostream>
+#include <iostream>
+#include <mutex>
+
+namespace
+{
+static const char COL_RESET[] { "\x1b[0m"};
+static const char RED[] { "\x1b[31m"};
+#ifndef NDEBUG
+static const char YELLOW[] { "\x1b[33m"};
+#endif
+// static const char GREEN[] { "\x1b[32m"};
+// static const char BLUE[] { "\x1b[34m"};
+// static const char MAGENTA[] { "\x1b[35m"};
+// static const char CYAN[] { "\x1b[36m"};
+}
+
+void LogPolicy::Unmute() { m_is_mute = false; }
+
+void LogPolicy::Mute() { m_is_mute = true; }
+
+bool LogPolicy::IsMute() const { return m_is_mute; }
+
+LogPolicy &LogPolicy::GetInstance()
+{
+    static LogPolicy runningInstance;
+    return runningInstance;
+}
+
+SimpleLogger::SimpleLogger() : level(logINFO) {}
+
+std::mutex &SimpleLogger::get_mutex()
+{
+    static std::mutex mtx;
+    return mtx;
+}
+
+std::ostringstream &SimpleLogger::Write(LogLevel lvl)
+{
+    std::lock_guard<std::mutex> lock(get_mutex());
+    try
+    {
+        level = lvl;
+        os << "[";
+        switch (level)
+        {
+        case logWARNING:
+            os << "warn";
+            break;
+        case logDEBUG:
+#ifndef NDEBUG
+            os << "debug";
+#endif
+            break;
+        default: //logINFO:
+            os << "info";
+            break;
+        }
+        os << "] ";
+    }
+    catch (const std::exception &e)
+    {
+        // encapsulate in osrm::exception
+        throw osrm::exception(std::string(e.what()) + ", getting ostringstream");
+    }
+    return os;
+}
+
+SimpleLogger::~SimpleLogger()
+{
+    std::lock_guard<std::mutex> lock(get_mutex());
+    if (!LogPolicy::GetInstance().IsMute())
+    {
+        const bool is_terminal = static_cast<bool>(isatty(fileno(stdout)));
+        switch (level)
+        {
+        case logWARNING:
+            std::cerr << (is_terminal ? RED : "") << os.str() << (is_terminal ? COL_RESET : "")
+                      << std::endl;
+            break;
+        case logDEBUG:
+#ifndef NDEBUG
+            std::cout << (is_terminal ? YELLOW : "") << os.str() << (is_terminal ? COL_RESET : "")
+                      << std::endl;
+#endif
+            break;
+        default: //logINFO:
+            std::cout << os.str() << (is_terminal ? COL_RESET : "") << std::endl;
+            break;
+        }
+    }
+}
--- a/Util/simple_logger.hpp
+++ b/Util/simple_logger.hpp
@ -0,0 +1,74 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef SIMPLE_LOGGER_HPP
+#define SIMPLE_LOGGER_HPP
+
+#include <atomic>
+#include <mutex>
+#include <sstream>
+
+enum LogLevel
+{
+    logINFO,
+    logWARNING,
+    logDEBUG
+};
+
+class LogPolicy
+{
+  public:
+    void Unmute();
+
+    void Mute();
+
+    bool IsMute() const;
+
+    static LogPolicy &GetInstance();
+
+    LogPolicy(const LogPolicy &) = delete;
+
+  private:
+    LogPolicy() : m_is_mute(true) {}
+    std::atomic<bool> m_is_mute;
+};
+
+class SimpleLogger
+{
+  public:
+    SimpleLogger();
+
+    virtual ~SimpleLogger();
+    std::mutex &get_mutex();
+    std::ostringstream &Write(LogLevel l = logINFO);
+
+  private:
+    std::ostringstream os;
+    LogLevel level;
+};
+
+#endif /* SIMPLE_LOGGER_HPP */
--- a/Util/std_hash.hpp
+++ b/Util/std_hash.hpp
@ -0,0 +1,77 @@
+/*
+
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef STD_HASH_HPP
+#define STD_HASH_HPP
+
+#include <functional>
+
+// this is largely inspired by boost's hash combine as can be found in
+// "The C++ Standard Library" 2nd Edition. Nicolai M. Josuttis. 2012.
+
+namespace {
+
+template<typename T>
+void hash_combine(std::size_t &seed, const T& val)
+{
+    seed ^= std::hash<T>()(val) + 0x9e3779b9 + (seed << 6) + (seed >> 2);
+}
+
+template<typename T>
+void hash_val(std::size_t &seed, const T& val)
+{
+    hash_combine(seed, val);
+}
+
+template<typename T, typename ... Types>
+void hash_val(std::size_t &seed, const T& val, const Types& ... args)
+{
+    hash_combine(seed, val);
+    hash_val(seed, args ...);
+}
+
+template<typename ... Types>
+std::size_t hash_val(const Types&... args)
+{
+    std::size_t seed = 0;
+    hash_val(seed, args...);
+    return seed;
+}
+}
+
+namespace std
+{
+template <typename T1, typename T2> struct hash<std::pair<T1, T2>>
+{
+    size_t operator()(const std::pair<T1, T2> &pair) const
+    {
+        return hash_val(pair.first, pair.second);
+    }
+};
+}
+
+#endif // STD_HASH_HPP
--- a/Util/string_util.hpp
+++ b/Util/string_util.hpp
@ -0,0 +1,150 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef STRING_UTIL_HPP
+#define STRING_UTIL_HPP
+
+#include <boost/algorithm/string.hpp>
+
+#include <cctype>
+
+#include <random>
+#include <string>
+#include <vector>
+
+// precision:  position after decimal point
+// length: maximum number of digits including comma and decimals
+// work with negative values to prevent overflowing when taking -value
+template <int length, int precision> static inline char *printInt(char *buffer, int value)
+{
+    bool minus = true;
+    if (value > 0)
+    {
+        minus = false;
+        value = -value;
+    }
+    buffer += length - 1;
+    for (int i = 0; i < precision; i++)
+    {
+        *buffer = '0' - (value % 10);
+        value /= 10;
+        buffer--;
+    }
+    *buffer = '.';
+    buffer--;
+    for (int i = precision + 1; i < length; i++)
+    {
+        *buffer = '0' - (value % 10);
+        value /= 10;
+        if (value == 0)
+            break;
+        buffer--;
+    }
+    if (minus)
+    {
+        buffer--;
+        *buffer = '-';
+    }
+    return buffer;
+}
+
+inline void replaceAll(std::string &s, const std::string &sub, const std::string &other)
+{
+    boost::replace_all(s, sub, other);
+}
+
+inline std::string EscapeJSONString(const std::string &input)
+{
+    std::string output;
+    output.reserve(input.size());
+    for (auto iter = input.begin(); iter != input.end(); ++iter)
+    {
+        switch (iter[0])
+        {
+        case '\\':
+            output += "\\\\";
+            break;
+        case '"':
+            output += "\\\"";
+            break;
+        case '/':
+            output += "\\/";
+            break;
+        case '\b':
+            output += "\\b";
+            break;
+        case '\f':
+            output += "\\f";
+            break;
+        case '\n':
+            output += "\\n";
+            break;
+        case '\r':
+            output += "\\r";
+            break;
+        case '\t':
+            output += "\\t";
+            break;
+        default:
+            output += *iter;
+            break;
+        }
+    }
+    return output;
+}
+
+static std::string originals[] = {"&", "\"", "<", ">", "'", "[", "]", "\\"};
+static std::string entities[] = {
+    "&amp;", "&quot;", "&lt;", "&gt;", "&#39;", "&91;", "&93;", " &#92;"};
+
+inline std::size_t URIDecode(const std::string &input, std::string &output)
+{
+    auto src_iter = input.begin();
+    output.resize(input.size() + 1);
+    std::size_t decoded_length = 0;
+    for (decoded_length = 0; src_iter != input.end(); ++decoded_length)
+    {
+        if (src_iter[0] == '%' && src_iter[1] && src_iter[2] && isxdigit(src_iter[1]) &&
+            isxdigit(src_iter[2]))
+        {
+            std::string::value_type a = src_iter[1];
+            std::string::value_type b = src_iter[2];
+            a -= src_iter[1] < 58 ? 48 : src_iter[1] < 71 ? 55 : 87;
+            b -= src_iter[2] < 58 ? 48 : src_iter[2] < 71 ? 55 : 87;
+            output[decoded_length] = 16 * a + b;
+            src_iter += 3;
+            continue;
+        }
+        output[decoded_length] = *src_iter++;
+    }
+    output.resize(decoded_length);
+    return decoded_length;
+}
+
+inline std::size_t URIDecodeInPlace(std::string &URI) { return URIDecode(URI, URI); }
+
+#endif // STRING_UTIL_HPP
--- a/Util/timing_util.hpp
+++ b/Util/timing_util.hpp
@ -0,0 +1,80 @@
+/*
+
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef TIMING_UTIL_HPP
+#define TIMING_UTIL_HPP
+
+#include <atomic>
+#include <chrono>
+#include <cstdint>
+#include <mutex>
+#include <unordered_map>
+
+struct GlobalTimer
+{
+    GlobalTimer() : time(0) {}
+    std::atomic<uint64_t> time;
+};
+
+class GlobalTimerFactory
+{
+public:
+    static GlobalTimerFactory& get()
+    {
+        static GlobalTimerFactory instance;
+        return instance;
+    }
+
+    GlobalTimer& getGlobalTimer(const std::string& name)
+    {
+        std::lock_guard<std::mutex> lock(map_mutex);
+        return timer_map[name];
+    }
+
+private:
+    std::mutex map_mutex;
+    std::unordered_map<std::string, GlobalTimer> timer_map;
+};
+
+#define GLOBAL_TIMER_AQUIRE(_X) auto& _X##_global_timer = GlobalTimerFactory::get().getGlobalTimer(#_X)
+#define GLOBAL_TIMER_RESET(_X) _X##_global_timer.time = 0
+#define GLOBAL_TIMER_START(_X) TIMER_START(_X)
+#define GLOBAL_TIMER_STOP(_X) TIMER_STOP(_X); _X##_global_timer.time += TIMER_NSEC(_X)
+#define GLOBAL_TIMER_NSEC(_X) static_cast<double>(_X##_global_timer.time)
+#define GLOBAL_TIMER_USEC(_X) (_X##_global_timer.time / 1000.0)
+#define GLOBAL_TIMER_MSEC(_X) (_X##_global_timer.time / 1000.0 / 1000.0)
+#define GLOBAL_TIMER_SEC(_X) (_X##_global_timer.time  / 1000.0 / 1000.0 / 1000.0)
+
+#define TIMER_START(_X) auto _X##_start = std::chrono::steady_clock::now(), _X##_stop = _X##_start
+#define TIMER_STOP(_X) _X##_stop = std::chrono::steady_clock::now()
+#define TIMER_NSEC(_X) std::chrono::duration_cast<std::chrono::nanoseconds>(_X##_stop - _X##_start).count()
+#define TIMER_USEC(_X) std::chrono::duration_cast<std::chrono::microseconds>(_X##_stop - _X##_start).count()
+#define TIMER_MSEC(_X) (0.000001*std::chrono::duration_cast<std::chrono::nanoseconds>(_X##_stop - _X##_start).count())
+#define TIMER_SEC(_X)  (0.000001*std::chrono::duration_cast<std::chrono::microseconds>(_X##_stop - _X##_start).count())
+#define TIMER_MIN(_X) std::chrono::duration_cast<std::chrono::minutes>(_X##_stop - _X##_start).count()
+
+#endif // TIMING_UTIL_HPP
--- a/Util/xml_renderer.hpp
+++ b/Util/xml_renderer.hpp
@ -0,0 +1,140 @@
+/*
+
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef XML_RENDERER_HPP
+#define XML_RENDERER_HPP
+
+#include "../data_structures/json_container.hpp"
+#include "cast.hpp"
+
+namespace JSON {
+
+struct XMLToArrayRenderer : mapbox::util::static_visitor<>
+{
+    explicit XMLToArrayRenderer(std::vector<char> &_out) : out(_out) {}
+
+    void operator()(const String &string) const
+    {
+        out.push_back('\"');
+        out.insert(out.end(), string.value.begin(), string.value.end());
+        out.push_back('\"');
+    }
+
+    void operator()(const Number &number) const
+    {
+        const std::string number_string = cast::double_fixed_to_string(number.value);
+        out.insert(out.end(), number_string.begin(), number_string.end());
+    }
+
+    void operator()(const Object &object) const
+    {
+        auto iterator = object.values.begin();
+        while (iterator != object.values.end())
+        {
+            if (iterator->first.at(0) != '_')
+            {
+                out.push_back('<');
+                out.insert(out.end(), (*iterator).first.begin(), (*iterator).first.end());
+            }
+            else
+            {
+                out.push_back(' ');
+                out.insert(out.end(), ++(*iterator).first.begin(), (*iterator).first.end());
+                out.push_back('=');
+
+            }
+            mapbox::util::apply_visitor(XMLToArrayRenderer(out), (*iterator).second);
+            if (iterator->first.at(0) != '_')
+            {
+                out.push_back('/');
+                out.push_back('>');
+            }
+            ++iterator;
+        }
+    }
+
+    void operator()(const Array &array) const
+    {
+        std::vector<Value>::const_iterator iterator;
+        iterator = array.values.begin();
+        while (iterator != array.values.end())
+        {
+            mapbox::util::apply_visitor(XMLToArrayRenderer(out), *iterator);
+            ++iterator;
+        }
+    }
+
+    void operator()(const True &) const
+    {
+        const std::string temp("true");
+        out.insert(out.end(), temp.begin(), temp.end());
+    }
+
+    void operator()(const False &) const
+    {
+        const std::string temp("false");
+        out.insert(out.end(), temp.begin(), temp.end());
+    }
+
+    void operator()(const Null &) const
+    {
+        const std::string temp("null");
+        out.insert(out.end(), temp.begin(), temp.end());
+    }
+
+  private:
+    std::vector<char> &out;
+};
+
+template<class JSONObject>
+inline void xml_render(std::vector<char> &out, const JSONObject &object)
+{
+    Value value = object;
+    mapbox::util::apply_visitor(XMLToArrayRenderer(out), value);
+}
+
+template<class JSONObject>
+inline void gpx_render(std::vector<char> &out, const JSONObject &object)
+{
+    // add header
+
+    const std::string header {"<?xml version=\"1.0\" encoding=\"UTF-8\"?><gpx creator=\"OSRM Routing Engine\""
+     " version=\"1.1\" xmlns=\"http://www.topografix.com/GPX/1/1\" xmlns:xsi=\"http:"
+     "//www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.topogr"
+     "afix.com/GPX/1/1 gpx.xsd\"><metadata><copyright author=\"Project OSRM\"><lice"
+     "nse>Data (c) OpenStreetMap contributors (ODbL)</license></copyright></metadat"
+     "a><rte>"};
+    out.insert(out.end(), header.begin(), header.end());
+
+    xml_render(out, object);
+
+    const std::string footer {"</rte></gpx>"};
+    out.insert(out.end(), footer.begin(), footer.end());
+}
+} // namespace JSON
+
+#endif // XML_RENDERER_HPP
--- a/algorithms/bfs_components.hpp
+++ b/algorithms/bfs_components.hpp
@ -0,0 +1,174 @@
+/*
+
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef BFS_COMPONENTS_HPP_
+#define BFS_COMPONENTS_HPP_
+
+#include "../typedefs.h"
+#include "../data_structures/restriction_map.hpp"
+
+#include <queue>
+#include <unordered_set>
+
+// Explores the components of the given graph while respecting turn restrictions
+// and barriers.
+template <typename GraphT> class BFSComponentExplorer
+{
+  public:
+    BFSComponentExplorer(const GraphT &dynamic_graph,
+                         const RestrictionMap &restrictions,
+                         const std::unordered_set<NodeID> &barrier_nodes)
+        : m_graph(dynamic_graph), m_restriction_map(restrictions), m_barrier_nodes(barrier_nodes)
+    {
+        BOOST_ASSERT(m_graph.GetNumberOfNodes() > 0);
+    }
+
+    /*!
+     * Returns the size of the component that the node belongs to.
+     */
+    unsigned int GetComponentSize(const NodeID node) const
+    {
+        BOOST_ASSERT(node < m_component_index_list.size());
+
+        return m_component_index_size[m_component_index_list[node]];
+    }
+
+    unsigned int GetNumberOfComponents() { return m_component_index_size.size(); }
+
+    /*!
+     * Computes the component sizes.
+     */
+    void run()
+    {
+        std::queue<std::pair<NodeID, NodeID>> bfs_queue;
+        unsigned current_component = 0;
+
+        BOOST_ASSERT(m_component_index_list.empty());
+        BOOST_ASSERT(m_component_index_size.empty());
+
+        unsigned num_nodes = m_graph.GetNumberOfNodes();
+
+        m_component_index_list.resize(num_nodes, std::numeric_limits<unsigned>::max());
+
+        BOOST_ASSERT(num_nodes > 0);
+
+        // put unexplorered node with parent pointer into queue
+        for (NodeID node = 0; node < num_nodes; ++node)
+        {
+            if (std::numeric_limits<unsigned>::max() == m_component_index_list[node])
+            {
+                unsigned size = ExploreComponent(bfs_queue, node, current_component);
+
+                // push size into vector
+                m_component_index_size.emplace_back(size);
+                ++current_component;
+            }
+        }
+    }
+
+  private:
+    /*!
+     * Explores the current component that starts at node using BFS.
+     */
+    unsigned ExploreComponent(std::queue<std::pair<NodeID, NodeID>> &bfs_queue,
+                                     NodeID node,
+                                     unsigned current_component)
+    {
+        /*
+           Graphical representation of variables:
+
+           u           v           w
+           *---------->*---------->*
+                            e2
+        */
+
+        bfs_queue.emplace(node, node);
+        // mark node as read
+        m_component_index_list[node] = current_component;
+
+        unsigned current_component_size = 1;
+
+        while (!bfs_queue.empty())
+        {
+            // fetch element from BFS queue
+            std::pair<NodeID, NodeID> current_queue_item = bfs_queue.front();
+            bfs_queue.pop();
+
+            const NodeID v = current_queue_item.first; // current node
+            const NodeID u = current_queue_item.second; // parent
+            // increment size counter of current component
+            ++current_component_size;
+            if (m_barrier_nodes.find(v) != m_barrier_nodes.end())
+            {
+                continue;
+            }
+            const NodeID to_node_of_only_restriction =
+                m_restriction_map.CheckForEmanatingIsOnlyTurn(u, v);
+
+            for (auto e2 : m_graph.GetAdjacentEdgeRange(v))
+            {
+                const NodeID w = m_graph.GetTarget(e2);
+
+                if (to_node_of_only_restriction != std::numeric_limits<unsigned>::max() &&
+                    w != to_node_of_only_restriction)
+                {
+                    // At an only_-restriction but not at the right turn
+                    continue;
+                }
+
+                if (u != w)
+                {
+                    // only add an edge if turn is not a U-turn except
+                    // when it is at the end of a dead-end street.
+                    if (!m_restriction_map.CheckIfTurnIsRestricted(u, v, w))
+                    {
+                        // only add an edge if turn is not prohibited
+                        if (std::numeric_limits<unsigned>::max() == m_component_index_list[w])
+                        {
+                            // insert next (node, parent) only if w has
+                            // not yet been explored
+                            // mark node as read
+                            m_component_index_list[w] = current_component;
+                            bfs_queue.emplace(w, v);
+                        }
+                    }
+                }
+            }
+        }
+
+        return current_component_size;
+    }
+
+    std::vector<unsigned> m_component_index_list;
+    std::vector<NodeID> m_component_index_size;
+
+    const GraphT &m_graph;
+    const RestrictionMap &m_restriction_map;
+    const std::unordered_set<NodeID> &m_barrier_nodes;
+};
+
+#endif // BFS_COMPONENTS_HPP_
--- a/algorithms/crc32_processor.hpp
+++ b/algorithms/crc32_processor.hpp
@ -0,0 +1,146 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#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>
+
+class IteratorbasedCRC32
+{
+  public:
+    bool using_hardware() const { return use_hardware_implementation; }
+
+    IteratorbasedCRC32() : crc(0) { use_hardware_implementation = detect_hardware_support(); }
+
+    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;
+            char *data = (char *)(&(*iter));
+
+            if (use_hardware_implementation)
+            {
+                crc = compute_in_hardware(data, sizeof(value_type));
+            }
+            else
+            {
+                crc = compute_in_software(data, sizeof(value_type));
+            }
+            ++iter;
+        }
+        return crc;
+    }
+
+  private:
+    bool detect_hardware_support() const
+    {
+        static const int sse42_bit = 0x00100000;
+        const unsigned ecx = cpuid();
+        const bool sse42_found = (ecx & sse42_bit) != 0;
+        return sse42_found;
+    }
+
+    unsigned compute_in_software(char *str, unsigned len)
+    {
+        crc_processor.process_bytes(str, len);
+        return crc_processor.checksum();
+    }
+
+    // adapted from http://byteworm.com/2010/10/13/crc32/
+    unsigned compute_in_hardware(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 = (char *)p;
+        while (r--)
+        {
+            __asm__ __volatile__(".byte 0xf2, 0xf, 0x38, 0xf1, 0xf1;"
+                                 : "=S"(crc)
+                                 : "0"(crc), "c"(*str));
+            ++str;
+        }
+#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)
+    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 using_hardware() const { return crc32.using_hardware(); }
+
+  private:
+    IteratorbasedCRC32 crc32;
+};
+
+#endif /* ITERATOR_BASED_CRC32_H */
--- a/algorithms/douglas_peucker.cpp
+++ b/algorithms/douglas_peucker.cpp
@ -0,0 +1,166 @@
+/*
+
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "douglas_peucker.hpp"
+
+#include "../data_structures/segment_information.hpp"
+#include "../Util/integer_range.hpp"
+
+#include <osrm/Coordinate.h>
+
+#include <boost/assert.hpp>
+
+#include <cmath>
+
+#include <algorithm>
+
+namespace
+{
+struct CoordinatePairCalculator
+{
+    CoordinatePairCalculator() = delete;
+    CoordinatePairCalculator(const FixedPointCoordinate &coordinate_a,
+                             const FixedPointCoordinate &coordinate_b)
+    {
+        // initialize distance calculator with two fixed coordinates a, b
+        const float RAD = 0.017453292519943295769236907684886f;
+        first_lat = (coordinate_a.lat / COORDINATE_PRECISION) * RAD;
+        first_lon = (coordinate_a.lon / COORDINATE_PRECISION) * RAD;
+        second_lat = (coordinate_b.lat / COORDINATE_PRECISION) * RAD;
+        second_lon = (coordinate_b.lon / COORDINATE_PRECISION) * RAD;
+    }
+
+    int operator()(FixedPointCoordinate &other) const
+    {
+        // set third coordinate c
+        const float RAD = 0.017453292519943295769236907684886f;
+        const float earth_radius = 6372797.560856f;
+        const float float_lat1 = (other.lat / COORDINATE_PRECISION) * RAD;
+        const float float_lon1 = (other.lon / COORDINATE_PRECISION) * RAD;
+
+        // compute distance (a,c)
+        const float x_value_1 = (first_lon - float_lon1) * cos((float_lat1 + first_lat) / 2.f);
+        const float y_value_1 = first_lat - float_lat1;
+        const float dist1 = sqrt(std::pow(x_value_1, 2) + std::pow(y_value_1, 2)) * earth_radius;
+
+        // compute distance (b,c)
+        const float x_value_2 = (second_lon - float_lon1) * cos((float_lat1 + second_lat) / 2.f);
+        const float y_value_2 = second_lat - float_lat1;
+        const float dist2 = sqrt(std::pow(x_value_2, 2) + std::pow(y_value_2, 2)) * earth_radius;
+
+        // return the minimum
+        return static_cast<int>(std::min(dist1, dist2));
+    }
+
+    float first_lat;
+    float first_lon;
+    float second_lat;
+    float second_lon;
+};
+}
+
+void DouglasPeucker::Run(std::vector<SegmentInformation> &input_geometry, const unsigned zoom_level)
+{
+    Run(std::begin(input_geometry), std::end(input_geometry), zoom_level);
+}
+
+void DouglasPeucker::Run(RandomAccessIt begin, RandomAccessIt end, const unsigned zoom_level)
+{
+    unsigned size = std::distance(begin, end);
+    if (size < 2)
+    {
+        return;
+    }
+
+    begin->necessary = true;
+    std::prev(end)->necessary = true;
+
+    {
+        BOOST_ASSERT_MSG(zoom_level < DOUGLAS_PEUCKER_THRESHOLDS.size(), "unsupported zoom level");
+        RandomAccessIt left_border = begin;
+        RandomAccessIt right_border = std::next(begin);
+        // Sweep over array and identify those ranges that need to be checked
+        do
+        {
+            // traverse list until new border element found
+            if (right_border->necessary)
+            {
+                // sanity checks
+                BOOST_ASSERT(left_border->necessary);
+                BOOST_ASSERT(right_border->necessary);
+                recursion_stack.emplace(left_border, right_border);
+                left_border = right_border;
+            }
+            ++right_border;
+        } while (right_border != end);
+    }
+
+    // mark locations as 'necessary' by divide-and-conquer
+    while (!recursion_stack.empty())
+    {
+        // pop next element
+        const GeometryRange pair = recursion_stack.top();
+        recursion_stack.pop();
+        // sanity checks
+        BOOST_ASSERT_MSG(pair.first->necessary, "left border must be necessary");
+        BOOST_ASSERT_MSG(pair.second->necessary, "right border must be necessary");
+        BOOST_ASSERT_MSG(std::distance(pair.second, end) > 0, "right border outside of geometry");
+        BOOST_ASSERT_MSG(std::distance(pair.first, pair.second) >= 0,
+                         "left border on the wrong side");
+
+        int max_int_distance = 0;
+        auto farthest_entry_it = pair.second;
+        const CoordinatePairCalculator dist_calc(pair.first->location, pair.second->location);
+
+        // sweep over range to find the maximum
+        for (auto it = std::next(pair.first); it != pair.second; ++it)
+        {
+            const int distance = dist_calc(it->location);
+            // found new feasible maximum?
+            if (distance > max_int_distance && distance > DOUGLAS_PEUCKER_THRESHOLDS[zoom_level])
+            {
+                farthest_entry_it = it;
+                max_int_distance = distance;
+            }
+        }
+
+        // check if maximum violates a zoom level dependent threshold
+        if (max_int_distance > DOUGLAS_PEUCKER_THRESHOLDS[zoom_level])
+        {
+            //  mark idx as necessary
+            farthest_entry_it->necessary = true;
+            if (1 < std::distance(pair.first, farthest_entry_it))
+            {
+                recursion_stack.emplace(pair.first, farthest_entry_it);
+            }
+            if (1 < std::distance(farthest_entry_it, pair.second))
+            {
+                recursion_stack.emplace(farthest_entry_it, pair.second);
+            }
+        }
+    }
+}
--- a/algorithms/douglas_peucker.hpp
+++ b/algorithms/douglas_peucker.hpp
@ -0,0 +1,80 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef DOUGLAS_PEUCKER_HPP_
+#define DOUGLAS_PEUCKER_HPP_
+
+#include <stack>
+#include <vector>
+#include <array>
+
+/* This class object computes the bitvector of indicating generalized input
+ * points according to the (Ramer-)Douglas-Peucker algorithm.
+ *
+ * Input is vector of pairs. Each pair consists of the point information and a
+ * bit indicating if the points is present in the generalization.
+ * Note: points may also be pre-selected*/
+
+struct SegmentInformation;
+
+static const std::array<int, 19> DOUGLAS_PEUCKER_THRESHOLDS {{
+    512440, // z0
+    256720, // z1
+    122560, // z2
+    56780,  // z3
+    28800,  // z4
+    14400,  // z5
+    7200,   // z6
+    3200,   // z7
+    2400,   // z8
+    1000,   // z9
+    600,    // z10
+    120,    // z11
+    60,     // z12
+    45,     // z13
+    36,     // z14
+    20,     // z15
+    8,      // z16
+    6,      // z17
+    4       // z18
+}};
+
+class DouglasPeucker
+{
+  public:
+    using RandomAccessIt = std::vector<SegmentInformation>::iterator;
+
+    using GeometryRange = std::pair<RandomAccessIt, RandomAccessIt>;
+    // Stack to simulate the recursion
+    std::stack<GeometryRange> recursion_stack;
+
+  public:
+    void Run(RandomAccessIt begin, RandomAccessIt end, const unsigned zoom_level);
+    void Run(std::vector<SegmentInformation> &input_geometry, const unsigned zoom_level);
+};
+
+#endif /* DOUGLAS_PEUCKER_HPP_ */
--- a/algorithms/object_encoder.hpp
+++ b/algorithms/object_encoder.hpp
@ -0,0 +1,94 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef OBJECT_ENCODER_HPP
+#define OBJECT_ENCODER_HPP
+
+#include "../Util/string_util.hpp"
+
+#include <boost/assert.hpp>
+#include <boost/archive/iterators/base64_from_binary.hpp>
+#include <boost/archive/iterators/binary_from_base64.hpp>
+#include <boost/archive/iterators/transform_width.hpp>
+
+#include <algorithm>
+#include <string>
+#include <vector>
+
+struct ObjectEncoder
+{
+    using base64_t = boost::archive::iterators::base64_from_binary<
+        boost::archive::iterators::transform_width<const char *, 6, 8>>;
+
+    using binary_t = boost::archive::iterators::transform_width<
+        boost::archive::iterators::binary_from_base64<std::string::const_iterator>,
+        8,
+        6>;
+
+    template <class ObjectT>
+    static void EncodeToBase64(const ObjectT &object, std::string &encoded)
+    {
+        const char *char_ptr_to_object = (const char *)&object;
+        std::vector<unsigned char> data(sizeof(object));
+        std::copy(char_ptr_to_object, char_ptr_to_object + sizeof(ObjectT), data.begin());
+
+        unsigned char number_of_padded_chars = 0; // is in {0,1,2};
+        while (data.size() % 3 != 0)
+        {
+            ++number_of_padded_chars;
+            data.push_back(0x00);
+        }
+
+        BOOST_ASSERT_MSG(0 == data.size() % 3, "base64 input data size is not a multiple of 3!");
+        encoded.resize(sizeof(ObjectT));
+        encoded.assign(base64_t(&data[0]),
+                       base64_t(&data[0] + (data.size() - number_of_padded_chars)));
+        replaceAll(encoded, "+", "-");
+        replaceAll(encoded, "/", "_");
+    }
+
+    template <class ObjectT>
+    static void DecodeFromBase64(const std::string &input, ObjectT &object)
+    {
+        try
+        {
+            std::string encoded(input);
+            // replace "-" with "+" and "_" with "/"
+            replaceAll(encoded, "-", "+");
+            replaceAll(encoded, "_", "/");
+
+            std::copy(binary_t(encoded.begin()),
+                      binary_t(encoded.begin() + encoded.length() - 1),
+                      (char *)&object);
+        }
+        catch (...)
+        {
+        }
+    }
+};
+
+#endif /* OBJECT_ENCODER_HPP */
--- a/algorithms/polyline_compressor.cpp
+++ b/algorithms/polyline_compressor.cpp
@ -0,0 +1,98 @@
+/*
+
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "polyline_compressor.hpp"
+#include "../data_structures/segment_information.hpp"
+
+#include <osrm/Coordinate.h>
+
+std::string PolylineCompressor::encode_vector(std::vector<int> &numbers) const
+{
+    std::string output;
+    const auto end = numbers.size();
+    for (std::size_t i = 0; i < end; ++i)
+    {
+        numbers[i] <<= 1;
+        if (numbers[i] < 0)
+        {
+            numbers[i] = ~(numbers[i]);
+        }
+    }
+    for (const int number : numbers)
+    {
+        output += encode_number(number);
+    }
+    return output;
+}
+
+std::string PolylineCompressor::encode_number(int number_to_encode) const
+{
+    std::string output;
+    while (number_to_encode >= 0x20)
+    {
+        const int next_value = (0x20 | (number_to_encode & 0x1f)) + 63;
+        output += static_cast<char>(next_value);
+        if (92 == next_value)
+        {
+            output += static_cast<char>(next_value);
+        }
+        number_to_encode >>= 5;
+    }
+
+    number_to_encode += 63;
+    output += static_cast<char>(number_to_encode);
+    if (92 == number_to_encode)
+    {
+        output += static_cast<char>(number_to_encode);
+    }
+    return output;
+}
+
+std::string
+PolylineCompressor::get_encoded_string(const std::vector<SegmentInformation> &polyline) const
+{
+    if (polyline.empty())
+    {
+        return {};
+    }
+
+    std::vector<int> delta_numbers;
+    delta_numbers.reserve((polyline.size() - 1) * 2);
+    FixedPointCoordinate previous_coordinate = {0, 0};
+    for (const auto &segment : polyline)
+    {
+        if (segment.necessary)
+        {
+            const int lat_diff = segment.location.lat - previous_coordinate.lat;
+            const int lon_diff = segment.location.lon - previous_coordinate.lon;
+            delta_numbers.emplace_back(lat_diff);
+            delta_numbers.emplace_back(lon_diff);
+            previous_coordinate = segment.location;
+        }
+    }
+    return encode_vector(delta_numbers);
+}
--- a/algorithms/polyline_compressor.hpp
+++ b/algorithms/polyline_compressor.hpp
@ -0,0 +1,47 @@
+/*
+
+Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef POLYLINECOMPRESSOR_H_
+#define POLYLINECOMPRESSOR_H_
+
+struct SegmentInformation;
+
+#include <string>
+#include <vector>
+
+class PolylineCompressor
+{
+  private:
+    std::string encode_vector(std::vector<int> &numbers) const;
+
+    std::string encode_number(const int number_to_encode) const;
+
+  public:
+    std::string get_encoded_string(const std::vector<SegmentInformation> &polyline) const;
+};
+
+#endif /* POLYLINECOMPRESSOR_H_ */
--- a/algorithms/polyline_formatter.cpp
+++ b/algorithms/polyline_formatter.cpp
@ -0,0 +1,56 @@
+/*
+
+Copyright (c) 2014, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "polyline_formatter.hpp"
+
+#include "polyline_compressor.hpp"
+#include "../data_structures/segment_information.hpp"
+
+#include <osrm/Coordinate.h>
+
+JSON::String
+PolylineFormatter::printEncodedString(const std::vector<SegmentInformation> &polyline) const
+{
+    return JSON::String(PolylineCompressor().get_encoded_string(polyline));
+}
+
+JSON::Array
+PolylineFormatter::printUnencodedString(const std::vector<SegmentInformation> &polyline) const
+{
+    JSON::Array json_geometry_array;
+    for (const auto &segment : polyline)
+    {
+        if (segment.necessary)
+        {
+            JSON::Array json_coordinate;
+            json_coordinate.values.push_back(segment.location.lat / COORDINATE_PRECISION);
+            json_coordinate.values.push_back(segment.location.lon / COORDINATE_PRECISION);
+            json_geometry_array.values.push_back(json_coordinate);
+        }
+    }
+    return json_geometry_array;
+}
--- a/Show More
+++ b/Show More