5.20.1 rc 1

Fix fallback speed validity checks (#5300 )
* fix fallback_speeds check to only accept values > 0 * add invalid_fallback_speed
2018-12-10 15:16:10 -05:00 · 2018-12-10 15:09:46 -05:00 · 2018-12-10 15:09:37 -05:00 · 2018-12-10 10:23:55 -05:00 · 2018-12-10 10:02:44 -05:00 · 2018-12-10 10:01:28 -05:00
47 changed files with 10836 additions and 3975 deletions
@@ -68,10 +68,6 @@ Thumbs.db
 /*.local.bat
 /CMakeSettings.json

-# Jetbrains related files #
-###########################
-.idea/
-
 # stxxl related files #
 #######################
 .stxxl
@@ -13,12 +13,12 @@ notifications:
 branches:
  only:
    - master
-    - 5.21
+    - "5.20.1"
    # enable building tags
    - /^v\d+\.\d+(\.\d+)?(-\S*)?$/

 cache:
-  npm: true
+  yarn: true
  ccache: true
  apt: true
  directories:
@@ -35,7 +35,7 @@ env:
   - CMAKE_VERSION=3.7.2
   - MASON="$(pwd)/scripts/mason.sh"
   - ENABLE_NODE_BINDINGS=On
-   - NODE="10"
+   - NODE="4"

 matrix:
  fast_finish: true
@@ -46,7 +46,7 @@ matrix:
    # Debug Builds
    - os: linux
      compiler: "format-taginfo-docs"
-      env: NODE=10
+      env: NODE=6
      sudo: false
      before_install:
      install:
@@ -54,7 +54,8 @@ matrix:
        - nvm install $NODE
        - nvm use $NODE
        - npm --version
-        - npm ci --ignore-scripts
+        - npm install --ignore-scripts
+        - npm link --ignore-scripts
      script:
        - ./scripts/check_taginfo.py taginfo.json profiles/car.lua
        - ${MASON} install clang-format 3.8.1
@@ -170,6 +171,14 @@ matrix:
      after_success:
        - ./scripts/travis/publish.sh

+    - os: osx
+      osx_image: xcode9.2
+      compiler: "mason-osx-release-node-4"
+      # we use the xcode provides clang and don't install our own
+      env: ENABLE_MASON=ON BUILD_TYPE='Release' CUCUMBER_TIMEOUT=60000 CCOMPILER='clang' CXXCOMPILER='clang++' ENABLE_ASSERTIONS=ON ENABLE_LTO=ON NODE="4"
+      after_success:
+        - ./scripts/travis/publish.sh
+
    # Shared Library
    - os: linux
      compiler: "gcc-7-release-shared"
@@ -180,6 +189,54 @@ matrix:
      env: CCOMPILER='gcc-7' CXXCOMPILER='g++-7' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON

    # Node build jobs. These skip running the tests.
+    - os: linux
+      sudo: false
+      compiler: "node-4-mason-linux-release"
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['libstdc++-4.9-dev']
+      env: CLANG_VERSION='5.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3 NODE="4"
+      install:
+        - pushd ${OSRM_BUILD_DIR}
+        - |
+          cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
+              -DENABLE_MASON=${ENABLE_MASON:-OFF} \
+              -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
+              -DENABLE_CCACHE=ON \
+              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \
+              -DENABLE_GLIBC_WORKAROUND=ON
+        - make --jobs=${JOBS}
+        - popd
+      script:
+        - npm run nodejs-tests
+      after_success:
+        - ./scripts/travis/publish.sh
+
+    - os: linux
+      sudo: false
+      compiler: "node-4-mason-linux-debug"
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['libstdc++-4.9-dev']
+      env: CLANG_VERSION='5.0.0' BUILD_TYPE='Debug' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3 NODE="4"
+      install:
+        - pushd ${OSRM_BUILD_DIR}
+        - |
+          cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
+              -DENABLE_MASON=${ENABLE_MASON:-OFF} \
+              -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
+              -DENABLE_CCACHE=ON \
+              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \
+              -DENABLE_GLIBC_WORKAROUND=ON
+        - make --jobs=${JOBS}
+        - popd
+      script:
+        - npm run nodejs-tests
+      after_success:
+        - ./scripts/travis/publish.sh
+
    - os: linux
      sudo: false
      compiler: "node-8-mason-linux-release"
@@ -294,10 +351,15 @@ before_install:
    if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
      sudo mdutil -i off /
    fi
+  - |
+    if [[ ! -f $(which yarn) ]]; then
+      npm install -g yarn@1.11.1
+    fi
  - export PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)")
  - export PUBLISH=$([[ "${TRAVIS_TAG:-}" == "v${PACKAGE_JSON_VERSION}" ]] && echo "On" || echo "Off")
  - echo "Using ${JOBS} jobs"
-  - npm ci --ignore-scripts
+  - yarn install --ignore-scripts
+  - yarn check --ignore-scripts --integrity
    # Bootstrap cmake to be able to run mason
  - CMAKE_URL="https://mason-binaries.s3.amazonaws.com/${TRAVIS_OS_NAME}-x86_64/cmake/${CMAKE_VERSION}.tar.gz"
  - CMAKE_DIR="mason_packages/${TRAVIS_OS_NAME}-x86_64/cmake/${CMAKE_VERSION}"
@@ -376,4 +438,4 @@ script:
    fi
  - |
  - popd
-  - npm test
+  - yarn test
@@ -1,21 +1,9 @@
-# 5.21.0
+# 5.20.1 RC 1
  - Changes from 5.20.0
    - Features:
      - ADDED: all waypoints in responses now contain a distance property between the original coordinate and the snapped location. [#5255](https://github.com/Project-OSRM/osrm-backend/pull/5255)
-      - ADDED: if `fallback_speed` is used, a new structure `fallback_speed_cells` will describe which cells contain estimated values [#5259](https://github.com/Project-OSRM/osrm-backend/pull/5259)
-      - REMOVED: we no longer publish Node 4 or 6 binary modules (they are still buildable from source) [#5314](https://github.com/Project-OSRM/osrm-backend/pull/5314)
    - Table:
      - ADDED: new parameter `scale_factor` which will scale the cell `duration` values by this factor. [#5298](https://github.com/Project-OSRM/osrm-backend/pull/5298)
-      - FIXED: only trigger `scale_factor` code to scan matrix when necessary. [#5303](https://github.com/Project-OSRM/osrm-backend/pull/5303)
-      - FIXED: fix bug in reverse offset calculation that sometimes lead to negative (and other incorrect) values in distance table results [#5315](https://github.com/Project-OSRM/osrm-backend/pull/5315)
-    - Docker:
-      - FIXED: use consistent boost version between build and runtime [#5311](https://github.com/Project-OSRM/osrm-backend/pull/5311)
-      - FIXED: don't override default permissions on /opt [#5311](https://github.com/Project-OSRM/osrm-backend/pull/5311)
-    - Matching:
-      - CHANGED: matching will now consider edges marked with is_startpoint=false, allowing matching over ferries and other previously non-matchable edge types. [#5297](https://github.com/Project-OSRM/osrm-backend/pull/5297)
-    - Profile:
-      - ADDED: Parse `source:maxspeed` and `maxspeed:type` tags to apply maxspeeds and add belgian flanders rural speed limit. [#5217](https://github.com/Project-OSRM/osrm-backend/pull/5217)
-      - CHANGED: Refactor maxspeed parsing to use common library. [#5144](https://github.com/Project-OSRM/osrm-backend/pull/5144)

 # 5.20.0
  - Changes from 5.19.0:
@@ -30,8 +18,6 @@
      - ADDED: Now publishing Node 10.x LTS binary modules [#5246](https://github.com/Project-OSRM/osrm-backend/pull/5246)
    - Windows:
      - FIXED: Windows builds again. [#5249](https://github.com/Project-OSRM/osrm-backend/pull/5249)
-    - Docker:
-      - CHANGED: switch from Alpine Linux to Debian Buster base images [#5281](https://github.com/Project-OSRM/osrm-backend/pull/5281)

 # 5.19.0
  - Changes from 5.18.0:
@@ -50,7 +50,7 @@ If you want to use the CH pipeline instead replace `osrm-partition` and `osrm-cu

 ### Using Docker

-We base our Docker images ([backend](https://hub.docker.com/r/osrm/osrm-backend/), [frontend](https://hub.docker.com/r/osrm/osrm-frontend/)) on Debian and make sure they are as lightweight as possible.
+We base our Docker images ([backend](https://hub.docker.com/r/osrm/osrm-backend/), [frontend](https://hub.docker.com/r/osrm/osrm-frontend/)) on Alpine Linux and make sure they are as lightweight as possible.

 Download OpenStreetMap extracts for example from [Geofabrik](http://download.geofabrik.de/)

@@ -7,7 +7,7 @@ WORKDIR /src
 RUN NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) && \
    apt-get update && \
    apt-get -y --no-install-recommends install cmake make git gcc g++ libbz2-dev libstxxl-dev libstxxl1v5 libxml2-dev \
-    libzip-dev libboost1.67-all-dev lua5.2 liblua5.2-dev libtbb-dev -o APT::Install-Suggests=0 -o APT::Install-Recommends=0 && \
+    libzip-dev libboost-all-dev lua5.2 liblua5.2-dev libtbb-dev -o APT::Install-Suggests=0 -o APT::Install-Recommends=0 && \
    NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) && \
    echo "Building OSRM ${DOCKER_TAG}" && \
    git show --format="%H" | head -n1 > /opt/OSRM_GITSHA && \
@@ -24,6 +24,7 @@ RUN NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) && \
    make -j${NPROC} install && \
    cd ../profiles && \
    cp -r * /opt && \
+    \
    strip /usr/local/bin/* && \
    rm -rf /src /usr/local/lib/libosrm*

@@ -33,12 +34,13 @@ RUN NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) && \
 FROM debian:buster-slim as runstage
 RUN mkdir -p /src  && mkdir -p /opt
 RUN apt-get update && \
-apt-get install -y --no-install-recommends libboost-program-options1.67.0 libboost-regex1.67.0 \
-libboost-date-time1.67.0 libboost-chrono1.67.0 libboost-filesystem1.67.0 \
-libboost-iostreams1.67.0 libboost-thread1.67.0 expat liblua5.2-0 libtbb2 &&\
+apt-get install -y --no-install-recommends libboost-program-options1.62.0 libboost-regex1.62.0 \
+libboost-date-time1.62.0 libboost-chrono1.62.0 libboost-filesystem1.62.0 \
+libboost-iostreams1.62.0 libboost-thread1.62.0 expat liblua5.2-0 libtbb2 &&\
 rm -rf /var/lib/apt/lists/*
 COPY --from=builder /usr/local /usr/local
 COPY --from=builder /opt /opt
+RUN chmod 0644 -R /opt
 WORKDIR /opt

 EXPOSE 5000
@@ -284,7 +284,6 @@ curl 'http://router.project-osrm.org/table/v1/driving/13.388860,52.517037;13.397
  the i-th waypoint to the j-th waypoint. Values are given in meters. Can be `null` if no route between `i` and `j` can be found. Note that computing the `distances` table is currently only implemented for CH. If `annotations=distance` or `annotations=duration,distance` is requested when running a MLD router, a `NotImplemented` error will be returned.
 - `sources` array of `Waypoint` objects describing all sources in order
 - `destinations` array of `Waypoint` objects describing all destinations in order
- `fallback_speed_cells` (optional) array of arrays containing `i,j` pairs indicating which cells contain estimated values based on `fallback_speed`.  Will be absent if `fallback_speed` is not used.

 In case of error the following `code`s are supported in addition to the general ones:

@@ -385,10 +384,6 @@ All other properties might be undefined.
      2361.73,
      0
    ]
-  ],
-  "fallback_speed_cells": [
-    [ 0, 1 ],
-    [ 1, 0 ]
  ]
 }
 ```
@@ -557,7 +552,6 @@ Vector tiles contain two layers:
 | `weight  `   | `integer` | how long this segment takes to traverse, in units (may differ from `duration` when artificial biasing is applied in the Lua profiles).  ACTUAL ROUTING USES THIS VALUE. |
 | `name`       | `string`  | the name of the road this segment belongs to |
 | `rate`       | `float`   | the value of `length/weight` - analagous to `speed`, but using the `weight` value rather than `duration`, rounded to the nearest integer |
-| `is_startpoint` | `boolean` | whether this segment can be used as a start/endpoint for routes |

 `turns` layer:

@@ -157,7 +157,6 @@ Returns **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Refer
                 Values are given in seconds.
 **`sources`**: array of [`Ẁaypoint`](#waypoint) objects describing all sources in order.
 **`destinations`**: array of [`Ẁaypoint`](#waypoint) objects describing all destinations in order.
-**`fallback_speed_cells`**: (optional) if `fallback_speed` is used, will be an array of arrays of `row,column` values, indicating which cells contain estimated values.

 ### tile

@@ -109,12 +109,3 @@ Feature: Car - Handle ferry routes
        When I route I should get
            | from | to | route     | modes       | time  |
            | c    | d  | bcde,bcde | ferry,ferry | 600s  |
-
-        Given the query options
-          | geometries     | geojson                  |
-          | overview       | full                     |
-
-        # Note that matching *should* work across unsnappable ferries
-        When I match I should get
-          | trace | geometry             | duration |
-          | abcdef| 1,1,1.000899,1,1.000899,1,1.002697,1,1.002697,1,1.003596,1,1.003596,1,1.005394,1,1.005394,1,1.006293,1 | 610.9      |
@@ -137,28 +137,3 @@ OSRM will use 4/5 of the projected free-flow speed.
            | primary |          |                  | 30                | -1     |         | 23 km/h |           | 6.7        |
            | primary | 20       | 30               |                   | -1     |         | 15 km/h |           | 4.4        |
            | primary | 20       |                  | 30                | -1     |         | 23 km/h |           | 6.7        |
-
-
-    Scenario: Car - Respect source:maxspeed
-        Given the node map
-            """
-            a b c d e f g
-            """
-
-        And the ways
-            | nodes | highway | source:maxspeed    | maxspeed |
-            | ab    | trunk   |                    |          |
-            | bc    | trunk   |                    | 60       |
-            | cd    | trunk   | FR:urban           |          |
-            | de    | trunk   | CH:rural           |          |
-            | ef    | trunk   | CH:trunk           |          |
-            | fg    | trunk   | CH:motorway        |          |
-
-        When I route I should get
-            | from | to | route | speed   |
-            | a    | b  | ab,ab | 85 km/h |
-            | b    | c  | bc,bc | 48 km/h |
-            | c    | d  | cd,cd | 40 km/h |
-            | d    | e  | de,de | 64 km/h |
-            | e    | f  | ef,ef | 80 km/h |
-            | f    | g  | fg,fg | 96 km/h |
@@ -295,7 +295,7 @@ module.exports = function () {
        this.reprocess(callback);
    });

-    this.Given(/^osrm-routed is stopped$/, (callback) => {
+    this.Given(/^osrm\-routed is stopped$/, (callback) => {
        this.OSRMLoader.shutdown(callback);
    });

@@ -3,25 +3,22 @@ var util = require('util');
 module.exports = function () {
    const durationsRegex = new RegExp(/^I request a travel time matrix I should get$/);
    const distancesRegex = new RegExp(/^I request a travel distance matrix I should get$/);
-    const estimatesRegex = new RegExp(/^I request a travel time matrix I should get estimates for$/);

    const DURATIONS_NO_ROUTE = 2147483647;     // MAX_INT
    const DISTANCES_NO_ROUTE = 3.40282e+38;    // MAX_FLOAT

    this.When(durationsRegex, function(table, callback) {tableParse.call(this, table, DURATIONS_NO_ROUTE, 'durations', callback);}.bind(this));
    this.When(distancesRegex, function(table, callback) {tableParse.call(this, table, DISTANCES_NO_ROUTE, 'distances', callback);}.bind(this));
-    this.When(estimatesRegex, function(table, callback) {tableParse.call(this, table, DISTANCES_NO_ROUTE, 'fallback_speed_cells', callback);}.bind(this));
 };

 const durationsParse = function(v) { return isNaN(parseInt(v)); };
 const distancesParse = function(v) { return isNaN(parseFloat(v)); };
-const estimatesParse = function(v) { return isNaN(parseFloat(v)); };

 function tableParse(table, noRoute, annotation, callback) {

-    const parse = annotation == 'distances' ? distancesParse : (annotation == 'durations' ? durationsParse : estimatesParse);
+    const parse = annotation == 'distances' ? distancesParse : durationsParse;
    const params = this.queryParams;
-    params.annotations = ['durations','fallback_speed_cells'].indexOf(annotation) !== -1 ? 'duration' : 'distance';
+    params.annotations = annotation == 'distances' ? 'distance' : 'duration';

    var tableRows = table.raw();

@@ -64,26 +61,11 @@ function tableParse(table, noRoute, annotation, callback) {

            var json = JSON.parse(response.body);

-            var result = {};
-            if (annotation === 'fallback_speed_cells') {
-                result = table.raw().map(row => row.map(() => ''));
-                json[annotation].forEach(pair => {
-                    result[pair[0]+1][pair[1]+1] = 'Y';
-                });
-                result = result.slice(1).map(row => {
-                    var hashes = {};
-                    row.slice(1).forEach((v,i) => {
-                        hashes[tableRows[0][i+1]] = v;
-                    });
-                    return hashes;
-                });
-            } else {
-                result = json[annotation].map(row => {
-                    var hashes = {};
-                    row.forEach((v, i) => { hashes[tableRows[0][i+1]] = parse(v) ? '' : v; });
-                    return hashes;
-                });
-            }
+            var result = json[annotation].map(row => {
+                var hashes = {};
+                row.forEach((v, i) => { hashes[tableRows[0][i+1]] = parse(v) ? '' : v; });
+                return hashes;
+            });

            var testRow = (row, ri, cb) => {
                for (var k in result[ri]) {
@@ -21,11 +21,11 @@ module.exports = function () {
        });
    };

-    this.When(/^I run "osrm-routed\s?(.*?)"$/, { timeout: this.TIMEOUT }, (options, callback) => {
+    this.When(/^I run "osrm\-routed\s?(.*?)"$/, { timeout: this.TIMEOUT }, (options, callback) => {
        this.runAndSafeOutput('osrm-routed', options, callback);
    });

-    this.When(/^I run "osrm-(extract|contract|partition|customize)\s?(.*?)"$/, (binary, options, callback) => {
+    this.When(/^I run "osrm\-(extract|contract|partition|customize)\s?(.*?)"$/, (binary, options, callback) => {
        const stamp = this.processedCacheFile + '.stamp_' + binary;
        this.runAndSafeOutput('osrm-' + binary, options, (err) => {
            if (err) return callback(err);
@@ -33,11 +33,11 @@ module.exports = function () {
        });
    });

-    this.When(/^I try to run "(osrm-[a-z]+)\s?(.*?)"$/, (binary, options, callback) => {
+    this.When(/^I try to run "(osrm\-[a-z]+)\s?(.*?)"$/, (binary, options, callback) => {
        this.runAndSafeOutput(binary, options, () => { callback(); });
    });

-    this.When(/^I run "osrm-datastore\s?(.*?)"(?: with input "([^"]*)")?$/, (options, input, callback) => {
+    this.When(/^I run "osrm\-datastore\s?(.*?)"(?: with input "([^"]*)")?$/, (options, input, callback) => {
        let child = this.runAndSafeOutput('osrm-datastore', options, callback);
        if (input !== undefined)
            child.stdin.write(input);
@@ -55,13 +55,13 @@ module.exports = function () {
    this.Then(/^stdout should( not)? contain "(.*?)"$/, (not, str) => {
        const contains = this.stdout.indexOf(str) > -1;
        assert.ok(typeof not === 'undefined' ? contains : !contains,
-            'stdout ' + (typeof not === 'undefined' ? 'does not contain' : 'contains') + ' "' + str + '"');
+                  'stdout ' + (typeof not === 'undefined' ? 'does not contain' : 'contains') + ' "' + str + '"');
    });

    this.Then(/^stderr should( not)? contain "(.*?)"$/, (not, str) => {
        const contains = this.stderr.indexOf(str) > -1;
        assert.ok(typeof not === 'undefined' ? contains : !contains,
-            'stderr ' + (typeof not === 'undefined' ? 'does not contain' : 'contains') + ' "' + str + '"');
+                 'stderr ' + (typeof not === 'undefined' ? 'does not contain' : 'contains') + ' "' + str + '"');
    });

    this.Then(/^stdout should contain \/(.*)\/$/, (regexStr) => {
@@ -69,7 +69,7 @@ module.exports = function () {
                                outputRow[direction] = result[direction].status ?
                                    'x' : '';
                                break;
-                            case /^[\d.]+ s/.test(want):
+                            case /^[\d\.]+ s/.test(want):
                                // the result here can come back as a non-number value like
                                // `diff`, but we only want to apply the unit when it comes
                                // back as a number, for tableDiff's literal comparison
@@ -29,7 +29,7 @@ module.exports = function() {

            // setup cache for feature data
            // if OSRM_PROFILE is set to force a specific profile, then
-            // include the profile name in the hash of the profile file
+             // include the profile name in the hash of the profile file
            hash.hashOfFile(uri, this.OSRM_PROFILE, (err, hash) => {
                if (err) return callback(err);

@@ -45,10 +45,10 @@ module.exports = function() {
                this.featureProcessedCacheDirectories[uri] = featureProcessedCacheDirectory;

                d3.queue(1)
-                    .defer(mkdirp, featureProcessedCacheDirectory)
-                    .defer(this.cleanupFeatureCache.bind(this), featureCacheDirectory, hash)
-                    .defer(this.cleanupProcessedFeatureCache.bind(this), featureProcessedCacheDirectory, this.osrmHash)
-                    .awaitAll(callback);
+                  .defer(mkdirp, featureProcessedCacheDirectory)
+                  .defer(this.cleanupFeatureCache.bind(this), featureCacheDirectory, hash)
+                  .defer(this.cleanupProcessedFeatureCache.bind(this), featureProcessedCacheDirectory, this.osrmHash)
+                  .awaitAll(callback);
            });
        }

@@ -87,7 +87,7 @@ module.exports = function() {
        fs.readdir(parentPath, (err, files) => {
            let q = d3.queue();
            files.filter(name => { return name !== featureHash;})
-                .map((f) => { q.defer(rimraf, path.join(parentPath, f)); });
+                 .map((f) => { q.defer(rimraf, path.join(parentPath, f)); });
            q.awaitAll(callback);
        });
    };
@@ -145,7 +145,7 @@ module.exports = function() {

    // converts the scenario titles in file prefixes
    this.getScenarioID = (scenario) => {
-        let name = scenario.getName().toLowerCase().replace(/[/\-'=,():*#]/g, '')
+        let name = scenario.getName().toLowerCase().replace(/[\/\-'=,\(\):\*#]/g, '')
            .replace(/\s/g, '_').replace(/__/g, '_').replace(/\.\./g, '.')
            .substring(0, 64);
        return util.format('%d_%s', scenario.getLine(), name);
@@ -17,12 +17,12 @@ module.exports = {
                return true;

            var matchPercent = want.match(/(.*)\s+~(.+)%$/),
-                matchAbs = want.match(/(.*)\s+\+-(.+)$/),
+                matchAbs = want.match(/(.*)\s+\+\-(.+)$/),
                matchRe = want.match(/^\/(.*)\/$/),
                // we use this for matching before/after bearing
-                matchBearingListAbs = want.match(/^((\d+)->(\d+))(,(\d+)->(\d+))*\s+\+-(.+)$/),
-                matchIntersectionListAbs = want.match(/^(((((true|false):\d+)\s{0,1})+,{0,1})+;{0,1})+\s+\+-(.+)$/),
-                matchRangeNumbers = want.match(/\d+\+-\d+/);
+                matchBearingListAbs = want.match(/^((\d+)->(\d+))(,(\d+)->(\d+))*\s+\+\-(.+)$/),
+                matchIntersectionListAbs = want.match(/^(((((true|false):\d+)\s{0,1})+,{0,1})+;{0,1})+\s+\+\-(.+)$/),
+                matchRangeNumbers = want.match(/\d+\+\-\d+/);

            function inRange(margin, got, want) {
                var fromR = parseFloat(want) - margin,
@@ -31,12 +31,12 @@ module.exports = {
            }
            function parseIntersectionString(str) {
                return str.split(';')
-                    .map((turn_intersections) => turn_intersections
-                        .split(',')
-                        .map((intersection) => intersection
-                            .split(' ')
-                            .map((entry_bearing_pair) => entry_bearing_pair
-                                .split(':'))));
+                          .map((turn_intersections) => turn_intersections
+                                                       .split(',')
+                                                       .map((intersection) => intersection
+                                                                               .split(' ')
+                                                                               .map((entry_bearing_pair) => entry_bearing_pair
+                                                                                                            .split(':'))));
            }

            if (got === want) {
@@ -115,7 +115,7 @@ module.exports = function () {

                        if (headers.has('weight')) {
                            if (row.weight.length) {
-                                if (!row.weight.match(/[\d.]+/))
+                                if (!row.weight.match(/[\d\.]+/))
                                    return cb(new Error('*** Weight must be specified as a numeric value. (ex: 8)'));
                                got.weight = instructions ? util.format('%d', weight) : '';
                            } else {
@@ -151,7 +151,7 @@ module.exports = function () {
                        if (headers.has('locations')){
                            got.locations = (locations || '').trim();
                        }
-                        /*
+/*
                        if (headers.has('approaches')){
                            got.approaches = (approaches || '').trim();
                        }*/
@@ -616,7 +616,7 @@ Feature: Basic Distance Matrix
            |   | a      | b      | f     | 1      |
            | a | 0      | 300.2  | 900.7 | 1501.1 |
            | b | 300.2  | 0      | 600.5 | 1200.9 |
-            | f | 900.7  | 600.5  | 0     | 300.2  |
+            | f | 900.7  | 600.5  | 0     | 302.2  |
            | 1 | 1501.1 | 1200.9 | 300.2 | 0      |

        When I request a travel distance matrix I should get
@@ -651,7 +651,7 @@ Feature: Basic Distance Matrix
            |   | a      | b      | f     | 1      |
            | a | 0      | 300.2  | 900.7 | 1501.1 |
            | b | 300.2  | 0      | 600.5 | 1200.9 |
-            | f | 900.7  | 600.5  | 0     | 300.2  |
+            | f | 900.7  | 600.5  | 0     | 302.2  |
            | 1 | 1501.1 | 1200.9 | 300.2 | 0      |

        When I request a travel distance matrix I should get
@@ -687,7 +687,7 @@ Feature: Basic Distance Matrix
            |   | a      | b     | f     | 1      |
            | a | 0      | 300.2 | 900.7 | 1200.9 |
            | b | 300.2  | 0     | 600.5 | 900.7  |
-            | f | 900.7  | 600.5 | 0     | 300.2  |
+            | f | 900.7  | 600.5 | 0     | 302.2  |
            | 1 | 1200.9 | 900.7 | 300.2 | 0      |

        When I request a travel distance matrix I should get
@@ -701,25 +701,3 @@ Feature: Basic Distance Matrix
            | f | 900.7  |
            | 1 | 1200.9 |

-    Scenario: Ensure consistency with route, and make sure offsets work in both directions
-        Given a grid size of 100 meters
-        Given the node map
-            """
-            a   b   c   d   e   f   g   h  i  j
-                  1                   2
-            """
-
-        And the ways
-            | nodes |
-            | abcdef  |
-            | fghij  |
-
-        When I route I should get
-            | from | to | route              | distance |
-            | 1    | 2  | abcdef,fghij,fghij | 999.9m  |
-
-        # TODO: this is "correct", but inconsistent with viaroute
-        When I request a travel distance matrix I should get
-            |   |   1    | 2      |
-            | 1 |   0    | 1000.7 |
-            | 2 | 1000.7 | 0      |
@@ -545,24 +545,6 @@ Feature: Basic Duration Matrix
            | f | 18 |
            | 1 | 30 |

-        When I request a travel time matrix I should get estimates for
-            |   | a | b | f | 1 |
-            | a |   |   | Y | Y |
-            | b |   |   | Y | Y |
-            | f | Y | Y |   |   |
-            | 1 | Y | Y |   |   |
-
-        When I request a travel time matrix I should get estimates for
-            |   | a | b | f | 1 |
-            | a |   |   | Y | Y |
-
-        When I request a travel time matrix I should get estimates for
-            |   | a |
-            | a |   |
-            | b |   |
-            | f | Y |
-            | 1 | Y |
-
    Scenario: Testbot - Filling in noroutes with estimates - use input coordinate
        Given a grid size of 300 meters
        Given the extract extra arguments "--small-component-size 4"
@@ -598,25 +580,6 @@ Feature: Basic Duration Matrix
            | f | 18 |
            | 1 | 30 |

-        When I request a travel time matrix I should get estimates for
-            |   | a | b | f | 1 |
-            | a |   |   | Y | Y |
-            | b |   |   | Y | Y |
-            | f | Y | Y |   |   |
-            | 1 | Y | Y |   |   |
-
-        When I request a travel time matrix I should get estimates for
-            |   | a | b | f | 1 |
-            | a |   |   | Y | Y |
-
-        When I request a travel time matrix I should get estimates for
-            |   | a |
-            | a |   |
-            | b |   |
-            | f | Y |
-            | 1 | Y |
-
-
    Scenario: Testbot - Filling in noroutes with estimates - use snapped coordinate
        Given a grid size of 300 meters
        Given the extract extra arguments "--small-component-size 4"
@@ -652,35 +615,18 @@ Feature: Basic Duration Matrix
            | f | 18 |
            | 1 | 24 |

-        When I request a travel time matrix I should get estimates for
-            |   | a | b | f | 1 |
-            | a |   |   | Y | Y |
-            | b |   |   | Y | Y |
-            | f | Y | Y |   |   |
-            | 1 | Y | Y |   |   |
-
-        When I request a travel time matrix I should get estimates for
-            |   | a | b | f | 1 |
-            | a |   |   | Y | Y |
-
-        When I request a travel time matrix I should get estimates for
-            |   | a |
-            | a |   |
-            | b |   |
-            | f | Y |
-            | 1 | Y |

    Scenario: Testbot - Travel time matrix of minimal network with scale factor
-        Given the query options
+         Given the query options
            | scale_factor | 2 |
-        Given the node map
+         Given the node map
            """
            a b
            """
-        And the ways
+         And the ways
            | nodes |
            | ab    |
-        When I request a travel time matrix I should get
+         When I request a travel time matrix I should get
            |   | a  | b  |
            | a | 0  | 20 |
            | b | 20 | 0  |
@@ -692,86 +638,67 @@ Feature: Basic Duration Matrix
            | fallback_speed | 5 |
            | fallback_coordinate | snapped |

-        Given the node map
+         Given the node map
            """
            a b   f h 1
            d e   g i
            """

-        And the ways
+         And the ways
            | nodes |
            | abeda |
            | fhigf |

-        When I request a travel time matrix I should get
+         When I request a travel time matrix I should get
            |   | a  | b  | f  | 1  |
            | a | 0  | 60 | 36 | 48 |
            | b | 60 | 0  | 24 | 36 |
            | f | 36 | 24 | 0  | 60 |
            | 1 | 48 | 36 | 60 | 0  |

-        When I request a travel time matrix I should get
+         When I request a travel time matrix I should get
            |   | a  | b  | f  | 1  |
            | a | 0  | 60 | 36 | 48 |

-        When I request a travel time matrix I should get
+         When I request a travel time matrix I should get
            |   | a  |
            | a | 0  |
            | b | 60 |
            | f | 36 |
            | 1 | 48 |

-        When I request a travel time matrix I should get estimates for
-            |   | a | b | f | 1 |
-            | a |   |   | Y | Y |
-            | b |   |   | Y | Y |
-            | f | Y | Y |   |   |
-            | 1 | Y | Y |   |   |
-
-        When I request a travel time matrix I should get estimates for
-            |   | a | b | f | 1 |
-            | a |   |   | Y | Y |
-
-        When I request a travel time matrix I should get estimates for
-            |   | a |
-            | a |   |
-            | b |   |
-            | f | Y |
-            | 1 | Y |
-
-
     Scenario: Testbot - Travel time matrix of minimal network with overflow scale factor
        Given the query options
            | scale_factor | 2147483647 |

-        Given the node map
+         Given the node map
            """
            a b
            """

-        And the ways
+         And the ways
            | nodes |
            | ab    |

-        When I request a travel time matrix I should get
+         When I request a travel time matrix I should get
            |   | a           | b           |
            | a | 0           | 214748364.6 |
            | b | 214748364.6 | 0           |

     Scenario: Testbot - Travel time matrix of minimal network with fraction scale factor
-        Given the query options
+         Given the query options
            | scale_factor | 0.5 |

-        Given the node map
+         Given the node map
            """
            a b
            """

-        And the ways
+         And the ways
            | nodes |
            | ab    |

-        When I request a travel time matrix I should get
+         When I request a travel time matrix I should get
            |   | a  | b  |
            | a | 0  | 5  |
            | b | 5  | 0  |
@@ -111,9 +111,9 @@ Feature: Multi level routing
        When I request a travel distance matrix I should get
            |   | a      | f      | l      | o      |
            | a | 0      | 2383.7 | 1566.9 | 1366.8 |
-            | f | 2383.7 | 0      | 1293.3 | 1617.3 |
-            | l | 1566.9 | 1293.3 | 0      | 800.5  |
-            | o | 1366.8 | 1617.3 | 800.5  | 0      |
+            | f | 2339.9 | 0      | 1198.1 | 1522.1 |
+            | l | 1618.3 | 1293.3 | 0      | 800.5  |
+            | o | 1418.2 | 1617.3 | 800.5  | 0      |

        When I request a travel distance matrix I should get
            |   | a | f      | l      | o      |
@@ -122,21 +122,21 @@ Feature: Multi level routing
        When I request a travel distance matrix I should get
            |   | a      |
            | a | 0      |
-            | f | 2383.7 |
-            | l | 1566.9 |
-            | o | 1366.8 |
+            | f | 2339.9 |
+            | l | 1618.3 |
+            | o | 1418.2 |

        When I request a travel distance matrix I should get
            |   | a      | f      | l      | o      |
            | a | 0      | 2383.7 | 1566.9 | 1366.8 |
-            | f | 2383.7 | 0      | 1293.3 | 1617.3 |
+            | f | 2339.9 | 0      | 1198.1 | 1522.1 |

        When I request a travel distance matrix I should get
            |   | a      | o      |
            | a | 0      | 1366.8 |
-            | f | 2383.7 | 1617.3 |
-            | l | 1566.9 | 800.5  |
-            | o | 1366.8 | 0      |
+            | f | 2339.9 | 1522.1 |
+            | l | 1618.3 | 800.5  |
+            | o | 1418.2 | 0      |

    Scenario: Testbot - Multi level routing: horizontal road
        Given the node map
@@ -182,4 +182,4 @@ Feature: Snap start/end point to the nearest way
            | x    | m  | xe,xe |
            | x    | n  | xf,xf |
            | x    | o  | xg,xg |
-            | x    | p  | xh,xh |
+            | x    | p  | xh,xh |
@@ -31,15 +31,6 @@ namespace api
 class TableAPI final : public BaseAPI
 {
  public:
-    struct TableCellRef
-    {
-        TableCellRef(const std::size_t &row, const std::size_t &column) : row{row}, column{column}
-        {
-        }
-        std::size_t row;
-        std::size_t column;
-    };
-
    TableAPI(const datafacade::BaseDataFacade &facade_, const TableParameters &parameters_)
        : BaseAPI(facade_, parameters_), parameters(parameters_)
    {
@@ -48,7 +39,6 @@ class TableAPI final : public BaseAPI
    virtual void
    MakeResponse(const std::pair<std::vector<EdgeDuration>, std::vector<EdgeDistance>> &tables,
                 const std::vector<PhantomNode> &phantoms,
-                 const std::vector<TableCellRef> &fallback_speed_cells,
                 util::json::Object &response) const
    {
        auto number_of_sources = parameters.sources.size();
@@ -87,11 +77,6 @@ class TableAPI final : public BaseAPI
                MakeDistanceTable(tables.second, number_of_sources, number_of_destinations);
        }

-        if (parameters.fallback_speed != INVALID_FALLBACK_SPEED && parameters.fallback_speed > 0)
-        {
-            response.values["fallback_speed_cells"] = MakeEstimatesTable(fallback_speed_cells);
-        }
-
        response.values["code"] = "Ok";
    }

@@ -178,20 +163,6 @@ class TableAPI final : public BaseAPI
        return json_table;
    }

-    virtual util::json::Array
-    MakeEstimatesTable(const std::vector<TableCellRef> &fallback_speed_cells) const
-    {
-        util::json::Array json_table;
-        std::for_each(
-            fallback_speed_cells.begin(), fallback_speed_cells.end(), [&](const auto &cell) {
-                util::json::Array row;
-                row.values.push_back(util::json::Number(cell.row));
-                row.values.push_back(util::json::Number(cell.column));
-                json_table.values.push_back(std::move(row));
-            });
-        return json_table;
-    }
-
    const TableParameters &parameters;
 };

@@ -312,13 +312,12 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade
    std::vector<PhantomNodeWithDistance>
    NearestPhantomNodesInRange(const util::Coordinate input_coordinate,
                               const float max_distance,
-                               const Approach approach,
-                               const bool use_all_edges) const override final
+                               const Approach approach) const override final
    {
        BOOST_ASSERT(m_geospatial_query.get());

        return m_geospatial_query->NearestPhantomNodesInRange(
-            input_coordinate, max_distance, approach, use_all_edges);
+            input_coordinate, max_distance, approach);
    }

    std::vector<PhantomNodeWithDistance>
@@ -326,13 +325,12 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade
                               const float max_distance,
                               const int bearing,
                               const int bearing_range,
-                               const Approach approach,
-                               const bool use_all_edges) const override final
+                               const Approach approach) const override final
    {
        BOOST_ASSERT(m_geospatial_query.get());

        return m_geospatial_query->NearestPhantomNodesInRange(
-            input_coordinate, max_distance, bearing, bearing_range, approach, use_all_edges);
+            input_coordinate, max_distance, bearing, bearing_range, approach);
    }

    std::vector<PhantomNodeWithDistance>
@@ -126,13 +126,11 @@ class BaseDataFacade
                               const float max_distance,
                               const int bearing,
                               const int bearing_range,
-                               const Approach approach,
-                               const bool use_all_edges) const = 0;
+                               const Approach approach) const = 0;
    virtual std::vector<PhantomNodeWithDistance>
    NearestPhantomNodesInRange(const util::Coordinate input_coordinate,
                               const float max_distance,
-                               const Approach approach,
-                               const bool use_all_edges) const = 0;
+                               const Approach approach) const = 0;

    virtual std::vector<PhantomNodeWithDistance>
    NearestPhantomNodes(const util::Coordinate input_coordinate,
@@ -53,15 +53,13 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
    std::vector<PhantomNodeWithDistance>
    NearestPhantomNodesInRange(const util::Coordinate input_coordinate,
                               const double max_distance,
-                               const Approach approach,
-                               const bool use_all_edges) const
+                               const Approach approach) const
    {
        auto results = rtree.Nearest(
            input_coordinate,
-            [this, approach, &input_coordinate, use_all_edges](const CandidateSegment &segment) {
-                return boolPairAnd(
-                    boolPairAnd(HasValidEdge(segment, use_all_edges), CheckSegmentExclude(segment)),
-                    CheckApproach(input_coordinate, segment, approach));
+            [this, approach, &input_coordinate](const CandidateSegment &segment) {
+                return boolPairAnd(boolPairAnd(HasValidEdge(segment), CheckSegmentExclude(segment)),
+                                   CheckApproach(input_coordinate, segment, approach));
            },
            [this, max_distance, input_coordinate](const std::size_t,
                                                   const CandidateSegment &segment) {
@@ -78,17 +76,15 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
                               const double max_distance,
                               const int bearing,
                               const int bearing_range,
-                               const Approach approach,
-                               const bool use_all_edges) const
+                               const Approach approach) const
    {
        auto results = rtree.Nearest(
            input_coordinate,
-            [this, approach, &input_coordinate, bearing, bearing_range, use_all_edges](
+            [this, approach, &input_coordinate, bearing, bearing_range](
                const CandidateSegment &segment) {
                auto use_direction =
                    boolPairAnd(CheckSegmentBearing(segment, bearing, bearing_range),
-                                boolPairAnd(HasValidEdge(segment, use_all_edges),
-                                            CheckSegmentExclude(segment)));
+                                boolPairAnd(HasValidEdge(segment), CheckSegmentExclude(segment)));
                use_direction =
                    boolPairAnd(use_direction, CheckApproach(input_coordinate, segment, approach));
                return use_direction;
@@ -465,7 +461,6 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
                            EdgeDuration{0});

        EdgeDistance forward_distance_offset = 0;
-        // Sum up the distance from the start to the fwd_segment_position
        for (auto current = forward_geometry.begin();
             current < forward_geometry.begin() + data.fwd_segment_position;
             ++current)
@@ -495,9 +490,8 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
                            EdgeDuration{0});

        EdgeDistance reverse_distance_offset = 0;
-        // Sum up the distance from just after the fwd_segment_position to the end
-        for (auto current = forward_geometry.begin() + data.fwd_segment_position + 1;
-             current != std::prev(forward_geometry.end());
+        for (auto current = forward_geometry.begin();
+             current < forward_geometry.end() - data.fwd_segment_position - 2;
             ++current)
        {
            reverse_distance_offset += util::coordinate_calculation::fccApproximateDistance(
@@ -634,8 +628,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
     * which means that this edge is not currently traversible.  If this is the case,
     * then we shouldn't snap to this edge.
     */
-    std::pair<bool, bool> HasValidEdge(const CandidateSegment &segment,
-                                       const bool use_all_edges = false) const
+    std::pair<bool, bool> HasValidEdge(const CandidateSegment &segment) const
    {

        bool forward_edge_valid = false;
@@ -659,9 +652,6 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
            reverse_edge_valid = data.reverse_segment_id.enabled;
        }

-        forward_edge_valid = forward_edge_valid && (data.is_startpoint || use_all_edges);
-        reverse_edge_valid = reverse_edge_valid && (data.is_startpoint || use_all_edges);
-
        return std::make_pair(forward_edge_valid, reverse_edge_valid);
    }

@@ -138,8 +138,7 @@ class BasePlugin
    std::vector<std::vector<PhantomNodeWithDistance>>
    GetPhantomNodesInRange(const datafacade::BaseDataFacade &facade,
                           const api::BaseParameters &parameters,
-                           const std::vector<double> radiuses,
-                           bool use_all_edges = false) const
+                           const std::vector<double> radiuses) const
    {
        std::vector<std::vector<PhantomNodeWithDistance>> phantom_nodes(
            parameters.coordinates.size());
@@ -172,13 +171,12 @@ class BasePlugin
                                                      radiuses[i],
                                                      parameters.bearings[i]->bearing,
                                                      parameters.bearings[i]->range,
-                                                      approach,
-                                                      use_all_edges);
+                                                      approach);
            }
            else
            {
                phantom_nodes[i] = facade.NearestPhantomNodesInRange(
-                    parameters.coordinates[i], radiuses[i], approach, use_all_edges);
+                    parameters.coordinates[i], radiuses[i], approach);
            }
        }

@@ -89,6 +89,7 @@ class EdgeBasedGraphFactory
    // The following get access functions destroy the content in the factory
    void GetEdgeBasedEdges(util::DeallocatingVector<EdgeBasedEdge> &edges);
    void GetEdgeBasedNodeSegments(std::vector<EdgeBasedNodeSegment> &nodes);
+    void GetStartPointMarkers(std::vector<bool> &node_is_startpoint);
    void GetEdgeBasedNodeWeights(std::vector<EdgeWeight> &output_node_weights);
    void GetEdgeBasedNodeDurations(std::vector<EdgeWeight> &output_node_durations);
    void GetEdgeBasedNodeDistances(std::vector<EdgeDistance> &output_node_distances);
@@ -111,6 +112,10 @@ class EdgeBasedGraphFactory
    std::vector<ConditionalTurnPenalty>
    IndexConditionals(std::vector<Conditional> &&conditionals) const;

+    //! maps index from m_edge_based_node_list to ture/false if the node is an entry point to the
+    //! graph
+    std::vector<bool> m_edge_based_node_is_startpoint;
+
    //! node weights that indicate the length of the segment (node based) represented by the
    //! edge-based node
    std::vector<EdgeWeight> m_edge_based_node_weights;
@@ -22,9 +22,7 @@ struct EdgeBasedNodeSegment
    EdgeBasedNodeSegment()
        : forward_segment_id{SPECIAL_SEGMENTID, false},
          reverse_segment_id{SPECIAL_SEGMENTID, false}, u(SPECIAL_NODEID), v(SPECIAL_NODEID),
-          fwd_segment_position(std::numeric_limits<unsigned short>::max() >>
-                               1), // >> 1 because we've only got 15 bits
-          is_startpoint(false)
+          fwd_segment_position(std::numeric_limits<unsigned short>::max())
    {
    }

@@ -32,10 +30,9 @@ struct EdgeBasedNodeSegment
                                  const SegmentID reverse_segment_id_,
                                  NodeID u,
                                  NodeID v,
-                                  unsigned short fwd_segment_position,
-                                  bool is_startpoint_)
+                                  unsigned short fwd_segment_position)
        : forward_segment_id(forward_segment_id_), reverse_segment_id(reverse_segment_id_), u(u),
-          v(v), fwd_segment_position(fwd_segment_position), is_startpoint(is_startpoint_)
+          v(v), fwd_segment_position(fwd_segment_position)
    {
        BOOST_ASSERT(forward_segment_id.enabled || reverse_segment_id.enabled);
    }
@@ -44,8 +41,7 @@ struct EdgeBasedNodeSegment
    SegmentID reverse_segment_id; // edge-based graph node ID in reverse direction (v->u if exists)
    NodeID u;                     // node-based graph node ID of the start node
    NodeID v;                     // node-based graph node ID of the target node
-    unsigned short fwd_segment_position : 15; // segment id in a compressed geometry
-    bool is_startpoint : 1;
+    unsigned short fwd_segment_position; // segment id in a compressed geometry
 };
 }
 }
@@ -85,6 +85,7 @@ class Extractor
        // output data
        EdgeBasedNodeDataContainer &edge_based_nodes_container,
        std::vector<EdgeBasedNodeSegment> &edge_based_node_segments,
+        std::vector<bool> &node_is_startpoint,
        std::vector<EdgeWeight> &edge_based_node_weights,
        std::vector<EdgeDuration> &edge_based_node_durations,
        std::vector<EdgeDistance> &edge_based_node_distances,
@@ -96,6 +97,7 @@ class Extractor
                        const std::vector<EdgeBasedNodeSegment> &input_node_segments,
                        EdgeBasedNodeDataContainer &nodes_container) const;
    void BuildRTree(std::vector<EdgeBasedNodeSegment> edge_based_node_segments,
+                    std::vector<bool> node_is_startpoint,
                    const std::vector<util::Coordinate> &coordinates);
    std::shared_ptr<RestrictionMap> LoadRestrictionMap();

@@ -1,13 +1,13 @@
 {
  "name": "osrm",
-  "version": "5.21.0",
+  "version": "5.20.1-latest.1",
  "private": false,
  "description": "The Open Source Routing Machine is a high performance routing engine written in C++14 designed to run on OpenStreetMap data.",
  "dependencies": {
    "mkdirp": "^0.5.1",
    "nan": "^2.11.1",
    "node-cmake": "^2.3.2",
-    "node-pre-gyp": "^0.12.0",
+    "node-pre-gyp": "^0.6.36",
    "rimraf": "^2.5.4"
  },
  "browserify": {
@@ -47,14 +47,14 @@
    "csv-stringify": "^3.0.0",
    "cucumber": "^1.2.1",
    "d3-queue": "^2.0.3",
-    "docbox": "^1.0.11",
+    "docbox": "^1.0.6",
    "documentation": "^4.0.0-rc.1",
-    "eslint": "^5.10.0",
+    "eslint": "^2.4.0",
    "faucet": "^0.0.1",
    "jsonpath": "^1.0.0",
    "node-timeout": "0.0.4",
    "polyline": "^0.2.0",
-    "request": "^2.88.0",
+    "request": "^2.69.0",
    "tape": "^4.7.0",
    "turf": "^3.0.14",
    "xmlbuilder": "^4.2.1"
@@ -7,7 +7,6 @@ Sequence = require('lib/sequence')
 Handlers = require("lib/way_handlers")
 find_access_tag = require("lib/access").find_access_tag
 limit = require("lib/maxspeed").limit
-Measure = require("lib/measure")

 function setup()
  local default_speed = 15
@@ -207,6 +206,20 @@ function setup()
  }
 end

+local function parse_maxspeed(source)
+    if not source then
+        return 0
+    end
+    local n = tonumber(source:match("%d*"))
+    if not n then
+        n = 0
+    end
+    if string.match(source, "mph") or string.match(source, "mp/h") then
+        n = (n*1609)/1000
+    end
+    return n
+end
+
 function process_node(profile, node, result)
  -- parse access and barrier tags
  local highway = node:get_value_by_key("highway")
@@ -263,9 +276,9 @@ function handle_bicycle_tags(profile,way,result,data)

  -- other tags
  data.junction = way:get_value_by_key("junction")
-  data.maxspeed = Measure.get_max_speed(way:get_value_by_key ("maxspeed")) or 0
-  data.maxspeed_forward = Measure.get_max_speed(way:get_value_by_key("maxspeed:forward")) or 0
-  data.maxspeed_backward = Measure.get_max_speed(way:get_value_by_key("maxspeed:backward")) or 0
+  data.maxspeed = parse_maxspeed(way:get_value_by_key ( "maxspeed") )
+  data.maxspeed_forward = parse_maxspeed(way:get_value_by_key( "maxspeed:forward"))
+  data.maxspeed_backward = parse_maxspeed(way:get_value_by_key( "maxspeed:backward"))
  data.barrier = way:get_value_by_key("barrier")
  data.oneway = way:get_value_by_key("oneway")
  data.oneway_bicycle = way:get_value_by_key("oneway:bicycle")
@@ -269,7 +269,6 @@ function setup()
      ["at:rural"] = 100,
      ["at:trunk"] = 100,
      ["be:motorway"] = 120,
-      ["be-vlg:rural"] = 70,
      ["by:urban"] = 60,
      ["by:motorway"] = 110,
      ["ch:rural"] = 80,
@@ -6,18 +6,6 @@ Measure = {}
 local inch_to_meters = 0.0254
 local feet_to_inches = 12
 local pound_to_kilograms = 0.45359237
-local miles_to_kilometers = 1.609
-
-- Parse speed value as kilometers by hours.
-function Measure.parse_value_speed(source)
-  local n = tonumber(source:match("%d*"))
-  if n then
-    if string.match(source, "mph") or string.match(source, "mp/h") then
-      n = n * miles_to_kilometers
-    end
-    return n
-  end
-end

 --- Parse string as a height in meters.
 --- according to http://wiki.openstreetmap.org/wiki/Key:maxheight
@@ -54,13 +42,6 @@ function Measure.parse_value_kilograms(value)
  end
 end

--- Get maxspeed of specified way in kilometers by hours.
-function Measure.get_max_speed(raw_value)
-  if raw_value then
-    return Measure.parse_value_speed(raw_value)
-  end
-end
-
 -- default maxheight value defined in https://wiki.openstreetmap.org/wiki/Key:maxheight#Non-numerical_values
 local default_maxheight = 4.5
 -- Available Non numerical values equal to 4.5; below_default and no_indications are not considered
@@ -432,7 +432,7 @@ end

 -- maxspeed and advisory maxspeed
 function WayHandlers.maxspeed(profile,way,result,data)
-  local keys = Sequence {  'maxspeed:advisory', 'maxspeed', 'source:maxspeed', 'maxspeed:type' }
+  local keys = Sequence { 'maxspeed:advisory', 'maxspeed' }
  local forward, backward = Tags.get_forward_backward_by_set(way,data,keys)
  forward = WayHandlers.parse_maxspeed(forward,profile)
  backward = WayHandlers.parse_maxspeed(backward,profile)
@@ -450,9 +450,12 @@ function WayHandlers.parse_maxspeed(source,profile)
  if not source then
    return 0
  end
-
-  local n = Measure.get_max_speed(source)
-  if not n then
+  local n = tonumber(source:match("%d*"))
+  if n then
+    if string.match(source, "mph") or string.match(source, "mp/h") then
+      n = (n*1609)/1000
+    end
+  else
    -- parse maxspeed like FR:urban
    source = string.lower(source)
    n = profile.maxspeed_table[source]
@@ -213,8 +213,7 @@ Status MatchPlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
                       });
    }

-    auto candidates_lists =
-        GetPhantomNodesInRange(facade, tidied.parameters, search_radiuses, true);
+    auto candidates_lists = GetPhantomNodesInRange(facade, tidied.parameters, search_radiuses);

    filterCandidates(tidied.parameters.coordinates, candidates_lists);
    if (std::all_of(candidates_lists.begin(),
@@ -95,10 +95,8 @@ Status TablePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
        return Error("NoTable", "No table found", result);
    }

-    std::vector<api::TableAPI::TableCellRef> estimated_pairs;
-
    // Scan table for null results - if any exist, replace with distance estimates
-    if (params.fallback_speed != INVALID_FALLBACK_SPEED || params.scale_factor != 1)
+    if (params.fallback_speed != INVALID_FALLBACK_SPEED || params.scale_factor > 0)
    {
        for (std::size_t row = 0; row < num_sources; row++)
        {
@@ -129,8 +127,6 @@ Status TablePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
                    {
                        result_tables_pair.second[table_index] = distance_estimate;
                    }
-
-                    estimated_pairs.emplace_back(row, column);
                }
                if (params.scale_factor > 0 && params.scale_factor != 1 &&
                    result_tables_pair.first[table_index] != MAXIMAL_EDGE_DURATION &&
@@ -154,7 +150,7 @@ Status TablePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
    }

    api::TableAPI table_api{facade, params};
-    table_api.MakeResponse(result_tables_pair, snapped_phantoms, estimated_pairs, result);
+    table_api.MakeResponse(result_tables_pair, snapped_phantoms, result);

    return Status::Ok;
 }
@@ -294,7 +294,6 @@ struct SpeedLayer : public vtzero::layer_builder
    vtzero::index_value key_duration;
    vtzero::index_value key_name;
    vtzero::index_value key_rate;
-    vtzero::index_value key_is_startpoint;

    SpeedLayer(vtzero::tile_builder &tile)
        : layer_builder(tile, "speeds"), uint_index(*this), double_index(*this),
@@ -303,8 +302,7 @@ struct SpeedLayer : public vtzero::layer_builder
          key_datasource(add_key_without_dup_check("datasource")),
          key_weight(add_key_without_dup_check("weight")),
          key_duration(add_key_without_dup_check("duration")),
-          key_name(add_key_without_dup_check("name")), key_rate(add_key_without_dup_check("rate")),
-          key_is_startpoint(add_key_without_dup_check("is_startpoint"))
+          key_name(add_key_without_dup_check("name")), key_rate(add_key_without_dup_check("rate"))
    {
    }

@@ -351,11 +349,6 @@ class SpeedLayerFeatureBuilder : public vtzero::linestring_feature_builder

    void set_rate(double value) { add_property(m_layer.key_rate, m_layer.double_index(value)); }

-    void set_is_startpoint(bool value)
-    {
-        add_property(m_layer.key_is_startpoint, m_layer.bool_index(value));
-    }
-
 }; // class SpeedLayerFeatureBuilder

 struct TurnsLayer : public vtzero::layer_builder
@@ -492,8 +485,6 @@ void encodeVectorTile(const DataFacadeBase &facade,
                    const auto reverse_datasource_idx = reverse_datasource_range(
                        reverse_datasource_range.size() - edge.fwd_segment_position - 1);

-                    const auto is_startpoint = edge.is_startpoint;
-
                    const auto component_id = facade.GetComponentID(edge.forward_segment_id.id);
                    const auto name_id = facade.GetNameIndex(edge.forward_segment_id.id);
                    auto name = facade.GetNameForID(name_id);
@@ -525,7 +516,6 @@ void encodeVectorTile(const DataFacadeBase &facade,
                            fbuilder.set_duration(forward_duration / 10.0);
                            fbuilder.set_name(name);
                            fbuilder.set_rate(forward_rate / 10.0);
-                            fbuilder.set_is_startpoint(is_startpoint);

                            fbuilder.commit();
                        }
@@ -559,7 +549,6 @@ void encodeVectorTile(const DataFacadeBase &facade,
                            fbuilder.set_duration(reverse_duration / 10.0);
                            fbuilder.set_name(name);
                            fbuilder.set_rate(reverse_rate / 10.0);
-                            fbuilder.set_is_startpoint(is_startpoint);

                            fbuilder.commit();
                        }
@@ -95,6 +95,12 @@ void EdgeBasedGraphFactory::GetEdgeBasedNodeSegments(std::vector<EdgeBasedNodeSe
    swap(nodes, m_edge_based_node_segments);
 }

+void EdgeBasedGraphFactory::GetStartPointMarkers(std::vector<bool> &node_is_startpoint)
+{
+    using std::swap; // Koenig swap
+    swap(m_edge_based_node_is_startpoint, node_is_startpoint);
+}
+
 void EdgeBasedGraphFactory::GetEdgeBasedNodeWeights(std::vector<EdgeWeight> &output_node_weights)
 {
    using std::swap; // Koenig swap
@@ -223,9 +229,10 @@ NBGToEBG EdgeBasedGraphFactory::InsertEdgeBasedNode(const NodeID node_u, const N
            edge_id_to_segment_id(nbe_to_ebn_mapping[edge_id_2]),
            current_edge_source_coordinate_id,
            current_edge_target_coordinate_id,
-            i,
-            forward_data.flags.startpoint || reverse_data.flags.startpoint);
+            i);

+        m_edge_based_node_is_startpoint.push_back(forward_data.flags.startpoint ||
+                                                  reverse_data.flags.startpoint);
        current_edge_source_coordinate_id = current_edge_target_coordinate_id;
    }

@@ -420,6 +427,7 @@ EdgeBasedGraphFactory::GenerateEdgeExpandedNodes(const WayRestrictionMap &way_re
        }
    }

+    BOOST_ASSERT(m_edge_based_node_segments.size() == m_edge_based_node_is_startpoint.size());
    BOOST_ASSERT(m_number_of_edge_based_nodes == m_edge_based_node_weights.size());
    BOOST_ASSERT(m_number_of_edge_based_nodes == m_edge_based_node_durations.size());
    BOOST_ASSERT(m_number_of_edge_based_nodes == m_edge_based_node_distances.size());
@@ -239,6 +239,7 @@ int Extractor::run(ScriptingEnvironment &scripting_environment)
    EdgeBasedNodeDataContainer edge_based_nodes_container;
    std::vector<EdgeBasedNodeSegment> edge_based_node_segments;
    util::DeallocatingVector<EdgeBasedEdge> edge_based_edge_list;
+    std::vector<bool> node_is_startpoint;
    std::vector<EdgeWeight> edge_based_node_weights;
    std::vector<EdgeDuration> edge_based_node_durations;
    std::vector<EdgeDistance> edge_based_node_distances;
@@ -319,6 +320,7 @@ int Extractor::run(ScriptingEnvironment &scripting_environment)
                               scripting_environment,
                               edge_based_nodes_container,
                               edge_based_node_segments,
+                               node_is_startpoint,
                               edge_based_node_weights,
                               edge_based_node_durations,
                               edge_based_node_distances,
@@ -360,7 +362,7 @@ int Extractor::run(ScriptingEnvironment &scripting_environment)

    util::Log() << "Building r-tree ...";
    TIMER_START(rtree);
-    BuildRTree(std::move(edge_based_node_segments), coordinates);
+    BuildRTree(std::move(edge_based_node_segments), std::move(node_is_startpoint), coordinates);

    TIMER_STOP(rtree);

@@ -735,6 +737,7 @@ EdgeID Extractor::BuildEdgeExpandedGraph(
    // output data
    EdgeBasedNodeDataContainer &edge_based_nodes_container,
    std::vector<EdgeBasedNodeSegment> &edge_based_node_segments,
+    std::vector<bool> &node_is_startpoint,
    std::vector<EdgeWeight> &edge_based_node_weights,
    std::vector<EdgeDuration> &edge_based_node_durations,
    std::vector<EdgeDistance> &edge_based_node_distances,
@@ -785,6 +788,7 @@ EdgeID Extractor::BuildEdgeExpandedGraph(

    edge_based_graph_factory.GetEdgeBasedEdges(edge_based_edge_list);
    edge_based_graph_factory.GetEdgeBasedNodeSegments(edge_based_node_segments);
+    edge_based_graph_factory.GetStartPointMarkers(node_is_startpoint);
    edge_based_graph_factory.GetEdgeBasedNodeWeights(edge_based_node_weights);
    edge_based_graph_factory.GetEdgeBasedNodeDurations(edge_based_node_durations);
    edge_based_graph_factory.GetEdgeBasedNodeDistances(edge_based_node_distances);
@@ -799,24 +803,35 @@ EdgeID Extractor::BuildEdgeExpandedGraph(
    Saves tree into '.ramIndex' and leaves into '.fileIndex'.
 */
 void Extractor::BuildRTree(std::vector<EdgeBasedNodeSegment> edge_based_node_segments,
+                           std::vector<bool> node_is_startpoint,
                           const std::vector<util::Coordinate> &coordinates)
 {
    util::Log() << "Constructing r-tree of " << edge_based_node_segments.size()
                << " segments build on-top of " << coordinates.size() << " coordinates";

+    BOOST_ASSERT(node_is_startpoint.size() == edge_based_node_segments.size());
+
    // Filter node based edges based on startpoint
-    auto start_point_count = std::accumulate(edge_based_node_segments.begin(),
-                                             edge_based_node_segments.end(),
-                                             0,
-                                             [](const size_t so_far, const auto &segment) {
-                                                 return so_far + (segment.is_startpoint ? 1 : 0);
-                                             });
-    if (start_point_count == 0)
+    auto out_iter = edge_based_node_segments.begin();
+    auto in_iter = edge_based_node_segments.begin();
+    for (auto index : util::irange<std::size_t>(0UL, node_is_startpoint.size()))
+    {
+        BOOST_ASSERT(in_iter != edge_based_node_segments.end());
+        if (node_is_startpoint[index])
+        {
+            *out_iter = *in_iter;
+            out_iter++;
+        }
+        in_iter++;
+    }
+    auto new_size = out_iter - edge_based_node_segments.begin();
+    if (new_size == 0)
    {
        throw util::exception("There are no snappable edges left after processing.  Are you "
                              "setting travel modes correctly in the profile?  Cannot continue." +
                              SOURCE_REF);
    }
+    edge_based_node_segments.resize(new_size);

    TIMER_START(construction);
    util::StaticRTree<EdgeBasedNodeSegment> rtree(
@@ -148,7 +148,6 @@
        {"key": "maxspeed", "value": "AT:rural"},
        {"key": "maxspeed", "value": "AT:trunk"},
        {"key": "maxspeed", "value": "BE:motorway"},
-        {"key": "maxspeed", "value": "BE-VLG:rural"},
        {"key": "maxspeed", "value": "BY:urban"},
        {"key": "maxspeed", "value": "BY:motorway"},
        {"key": "maxspeed", "value": "CH:rural"},
@@ -10,7 +10,7 @@ exports.three_test_coordinates = [[7.41337, 43.72956],

 exports.two_test_coordinates = exports.three_test_coordinates.slice(0, 2)

-exports.test_tile = {'at': [17059, 11948, 15], 'size': 156624};
+exports.test_tile = {'at': [17059, 11948, 15], 'size': 148750};

 // Test files generated by the routing engine; check test/data
 if (process.env.OSRM_DATA_PATH !== undefined) {
@@ -234,7 +234,7 @@ tables.forEach(function(annotation) {
    });

    test('table: ' + annotation + ' table in Monaco without motorways', function(assert) {
-        assert.plan(2);
+        assert.plan(1);
        var osrm = new OSRM({path: mld_data_path, algorithm: 'MLD'});
        var options = {
            coordinates: two_test_coordinates,
@@ -243,12 +243,11 @@ tables.forEach(function(annotation) {
        };
        osrm.table(options, function(err, response) {
            assert.equal(response[annotation].length, 2);
-            assert.strictEqual(response.fallback_speed_cells, undefined);
        });
    });

    test('table: ' + annotation + ' table in Monaco with fallback speeds', function(assert) {
-        assert.plan(2);
+        assert.plan(1);
        var osrm = new OSRM({path: mld_data_path, algorithm: 'MLD'});
        var options = {
            coordinates: two_test_coordinates,
@@ -258,7 +257,6 @@ tables.forEach(function(annotation) {
        };
        osrm.table(options, function(err, response) {
            assert.equal(response[annotation].length, 2);
-            assert.equal(response['fallback_speed_cells'].length, 0);
        });
    });

@@ -229,8 +229,7 @@ class ContiguousInternalMemoryDataFacade<routing_algorithms::offline::Algorithm>
                               const float /*max_distance*/,
                               const int /*bearing*/,
                               const int /*bearing_range*/,
-                               const Approach /*approach*/,
-                               const bool /*use_all_edges*/) const override
+                               const Approach /*approach*/) const override
    {
        return {};
    }
@@ -238,8 +237,7 @@ class ContiguousInternalMemoryDataFacade<routing_algorithms::offline::Algorithm>
    std::vector<PhantomNodeWithDistance>
    NearestPhantomNodesInRange(const util::Coordinate /*input_coordinate*/,
                               const float /*max_distance*/,
-                               const Approach /*approach*/,
-                               const bool /*use_all_edges*/) const override
+                               const Approach /*approach*/) const override
    {
        return {};
    }
@@ -36,7 +36,7 @@ void validate_feature_layer(vtzero::layer layer)
    BOOST_CHECK_EQUAL(layer.version(), 2);
    BOOST_CHECK_EQUAL(to_string(layer.name()), "speeds");
    BOOST_CHECK_EQUAL(layer.extent(), osrm::util::vector_tile::EXTENT);
-    BOOST_CHECK_EQUAL(layer.key_table().size(), 8);
+    BOOST_CHECK_EQUAL(layer.key_table().size(), 7);
    BOOST_CHECK(layer.num_features() > 2500);

    while (auto feature = layer.next_feature())
@@ -62,9 +62,6 @@ void validate_feature_layer(vtzero::layer layer)
        BOOST_CHECK(props.find("is_small") != props.end());
        BOOST_CHECK(props["is_small"].type() == typeid(bool));

-        BOOST_CHECK(props.find("is_startpoint") != props.end());
-        BOOST_CHECK(props["is_startpoint"].type() == typeid(bool));
-
        BOOST_CHECK(props.find("datasource") != props.end());
        BOOST_CHECK(props["datasource"].type() == typeid(std::string));

@@ -76,7 +73,7 @@ void validate_feature_layer(vtzero::layer layer)
        std::count_if(layer.value_table().begin(), layer.value_table().end(), [](auto v) {
            return v.type() == vtzero::property_value_type::uint_value;
        });
-    BOOST_CHECK_EQUAL(number_of_uint_values, 78);
+    BOOST_CHECK_EQUAL(number_of_uint_values, 77);
 }

 void validate_turn_layer(vtzero::layer layer)
@@ -128,7 +125,7 @@ void validate_node_layer(vtzero::layer layer)
    BOOST_CHECK_EQUAL(to_string(layer.name()), "osmnodes");
    BOOST_CHECK_EQUAL(layer.extent(), osrm::util::vector_tile::EXTENT);
    BOOST_CHECK_EQUAL(layer.key_table().size(), 0);
-    BOOST_CHECK_EQUAL(layer.num_features(), 1810);
+    BOOST_CHECK_EQUAL(layer.num_features(), 1791);

    while (auto feature = layer.next_feature())
    {
@@ -113,8 +113,7 @@ class MockBaseDataFacade : public engine::datafacade::BaseDataFacade
                               const float /*max_distance*/,
                               const int /*bearing*/,
                               const int /*bearing_range*/,
-                               const engine::Approach /*approach*/,
-                               const bool /*use_all_edges*/) const override
+                               const engine::Approach /*approach*/) const override
    {
        return {};
    }
@@ -122,8 +121,7 @@ class MockBaseDataFacade : public engine::datafacade::BaseDataFacade
    std::vector<engine::PhantomNodeWithDistance>
    NearestPhantomNodesInRange(const util::Coordinate /*input_coordinate*/,
                               const float /*max_distance*/,
-                               const engine::Approach /*approach*/,
-                               const bool /*use_all_edges*/) const override
+                               const engine::Approach /*approach*/) const override
    {
        return {};
    }
@@ -135,7 +135,6 @@ template <unsigned NUM_NODES, unsigned NUM_EDGES> struct RandomGraphFixture
            TestData data;
            data.u = edge_udist(g);
            data.v = edge_udist(g);
-            data.is_startpoint = true;
            if (used_edges.find(std::pair<unsigned, unsigned>(
                    std::min(data.u, data.v), std::max(data.u, data.v))) == used_edges.end())
            {
@@ -152,7 +151,7 @@ template <unsigned NUM_NODES, unsigned NUM_EDGES> struct RandomGraphFixture
 struct GraphFixture
 {
    GraphFixture(const std::vector<std::pair<FloatLongitude, FloatLatitude>> &input_coords,
-                 const std::vector<std::tuple<unsigned, unsigned, bool>> &input_edges)
+                 const std::vector<std::pair<unsigned, unsigned>> &input_edges)
    {

        for (unsigned i = 0; i < input_coords.size(); i++)
@@ -163,16 +162,15 @@ struct GraphFixture
        for (const auto &pair : input_edges)
        {
            TestData d;
-            d.u = std::get<0>(pair);
-            d.v = std::get<1>(pair);
+            d.u = pair.first;
+            d.v = pair.second;
            // We set the forward nodes to the target node-based-node IDs, just
            // so we have something to test against.  Because this isn't a real
            // graph, the actual values aren't important, we just need something
            // to examine during tests.
-            d.forward_segment_id = {std::get<1>(pair), true};
-            d.reverse_segment_id = {std::get<0>(pair), true};
+            d.forward_segment_id = {pair.second, true};
+            d.reverse_segment_id = {pair.first, true};
            d.fwd_segment_position = 0;
-            d.is_startpoint = std::get<2>(pair);
            edges.emplace_back(d);
        }
    }
@@ -301,7 +299,7 @@ BOOST_FIXTURE_TEST_CASE(construct_multiple_levels_test, TestRandomGraphFixture_M
 BOOST_AUTO_TEST_CASE(regression_test)
 {
    using Coord = std::pair<FloatLongitude, FloatLatitude>;
-    using Edge = std::tuple<unsigned, unsigned, bool>;
+    using Edge = std::pair<unsigned, unsigned>;
    GraphFixture fixture(
        {
            Coord{FloatLongitude{0.0}, FloatLatitude{40.0}},   //
@@ -315,7 +313,7 @@ BOOST_AUTO_TEST_CASE(regression_test)
            Coord{FloatLongitude{105.0}, FloatLatitude{5.0}},  //
            Coord{FloatLongitude{110.0}, FloatLatitude{0.0}},  //
        },
-        {Edge(0, 1, true), Edge(2, 3, true), Edge(4, 5, true), Edge(6, 7, true), Edge(8, 9, true)});
+        {Edge(0, 1), Edge(2, 3), Edge(4, 5), Edge(6, 7), Edge(8, 9)});

    TemporaryFile tmp;
    auto rtree = make_rtree<MiniStaticRTree>(tmp.path, fixture);
@@ -337,13 +335,13 @@ BOOST_AUTO_TEST_CASE(regression_test)
 BOOST_AUTO_TEST_CASE(radius_regression_test)
 {
    using Coord = std::pair<FloatLongitude, FloatLatitude>;
-    using Edge = std::tuple<unsigned, unsigned, bool>;
+    using Edge = std::pair<unsigned, unsigned>;
    GraphFixture fixture(
        {
            Coord(FloatLongitude{0.0}, FloatLatitude{0.0}),
            Coord(FloatLongitude{10.0}, FloatLatitude{10.0}),
        },
-        {Edge(0, 1, true), Edge(1, 0, true)});
+        {Edge(0, 1), Edge(1, 0)});

    TemporaryFile tmp;
    auto rtree = make_rtree<MiniStaticRTree>(tmp.path, fixture);
@@ -354,54 +352,22 @@ BOOST_AUTO_TEST_CASE(radius_regression_test)
    Coordinate input(FloatLongitude{5.2}, FloatLatitude{5.0});

    {
-        auto results = query.NearestPhantomNodesInRange(
-            input, 0.01, osrm::engine::Approach::UNRESTRICTED, true);
+        auto results =
+            query.NearestPhantomNodesInRange(input, 0.01, osrm::engine::Approach::UNRESTRICTED);
        BOOST_CHECK_EQUAL(results.size(), 0);
    }
 }

-BOOST_AUTO_TEST_CASE(permissive_edge_snapping)
-{
-    using Coord = std::pair<FloatLongitude, FloatLatitude>;
-    using Edge = std::tuple<unsigned, unsigned, bool>;
-    GraphFixture fixture(
-        {
-            Coord(FloatLongitude{0.0}, FloatLatitude{0.0}),
-            Coord(FloatLongitude{0.001}, FloatLatitude{0.001}),
-        },
-        {Edge(0, 1, true), Edge(1, 0, false)});
-
-    TemporaryFile tmp;
-    auto rtree = make_rtree<MiniStaticRTree>(tmp.path, fixture);
-    TestDataFacade mockfacade;
-    engine::GeospatialQuery<MiniStaticRTree, TestDataFacade> query(
-        rtree, fixture.coords, mockfacade);
-
-    Coordinate input(FloatLongitude{0.0005}, FloatLatitude{0.0005});
-
-    {
-        auto results = query.NearestPhantomNodesInRange(
-            input, 1000, osrm::engine::Approach::UNRESTRICTED, false);
-        BOOST_CHECK_EQUAL(results.size(), 1);
-    }
-
-    {
-        auto results = query.NearestPhantomNodesInRange(
-            input, 1000, osrm::engine::Approach::UNRESTRICTED, true);
-        BOOST_CHECK_EQUAL(results.size(), 2);
-    }
-}
-
 BOOST_AUTO_TEST_CASE(bearing_tests)
 {
    using Coord = std::pair<FloatLongitude, FloatLatitude>;
-    using Edge = std::tuple<unsigned, unsigned, bool>;
+    using Edge = std::pair<unsigned, unsigned>;
    GraphFixture fixture(
        {
            Coord(FloatLongitude{0.0}, FloatLatitude{0.0}),
            Coord(FloatLongitude{10.0}, FloatLatitude{10.0}),
        },
-        {Edge(0, 1, true), Edge(1, 0, true)});
+        {Edge(0, 1), Edge(1, 0)});

    TemporaryFile tmp;
    auto rtree = make_rtree<MiniStaticRTree>(tmp.path, fixture);
@@ -439,20 +405,20 @@ BOOST_AUTO_TEST_CASE(bearing_tests)
    }

    {
-        auto results = query.NearestPhantomNodesInRange(
-            input, 11000, osrm::engine::Approach::UNRESTRICTED, true);
+        auto results =
+            query.NearestPhantomNodesInRange(input, 11000, osrm::engine::Approach::UNRESTRICTED);
        BOOST_CHECK_EQUAL(results.size(), 2);
    }

    {
        auto results = query.NearestPhantomNodesInRange(
-            input, 11000, 270, 10, osrm::engine::Approach::UNRESTRICTED, true);
+            input, 11000, 270, 10, osrm::engine::Approach::UNRESTRICTED);
        BOOST_CHECK_EQUAL(results.size(), 0);
    }

    {
        auto results = query.NearestPhantomNodesInRange(
-            input, 11000, 45, 10, osrm::engine::Approach::UNRESTRICTED, true);
+            input, 11000, 45, 10, osrm::engine::Approach::UNRESTRICTED);
        BOOST_CHECK_EQUAL(results.size(), 2);

        BOOST_CHECK(results[0].phantom_node.forward_segment_id.enabled);
@@ -468,7 +434,7 @@ BOOST_AUTO_TEST_CASE(bearing_tests)
 BOOST_AUTO_TEST_CASE(bbox_search_tests)
 {
    using Coord = std::pair<FloatLongitude, FloatLatitude>;
-    using Edge = std::tuple<unsigned, unsigned, bool>;
+    using Edge = std::pair<unsigned, unsigned>;

    GraphFixture fixture(
        {
@@ -478,7 +444,7 @@ BOOST_AUTO_TEST_CASE(bbox_search_tests)
            Coord(FloatLongitude{3.0}, FloatLatitude{3.0}),
            Coord(FloatLongitude{4.0}, FloatLatitude{4.0}),
        },
-        {Edge(0, 1, true), Edge(1, 2, true), Edge(2, 3, true), Edge(3, 4, true)});
+        {Edge(0, 1), Edge(1, 2), Edge(2, 3), Edge(3, 4)});

    TemporaryFile tmp;
    auto rtree = make_rtree<MiniStaticRTree>(tmp.path, fixture);
Author	SHA1	Message	Date
Kajari Ghosh	c43ea37e05	5.20.1 rc 1	2018-12-10 15:16:10 -05:00
Kajari Ghosh	ec6c10661f	Fix fallback speed validity checks (#5300 ) * fix fallback_speeds check to only accept values > 0 * add invalid_fallback_speed	2018-12-10 15:09:46 -05:00
Kajari Ghosh	bcdc689ae9	Add a multiplier to the matrix (#5298 ) * add a multiplier to the matrix * add rounding * remove scale_factor restrictions * clamp for overflow error * update check to match error message * enforce clamping on < 0 and increase test coverage * add an invalid scale_factor value to node tests * increase test coverage * changelog	2018-12-10 15:09:37 -05:00
Kajari Ghosh	b3eb8970f1	bump to restart appveyor	2018-12-10 10:23:55 -05:00
Kajari Ghosh	ab22cc7516	Merge branch 'master' into 5.20	2018-12-10 10:02:44 -05:00
Kajari Ghosh	18f446735c	update CHANGELOG and osrm version in package.json for v5.20.0	2018-12-10 10:01:28 -05:00
allierowan	9234b2ae76	remove line from changelog about commit that isn't actually in here	2018-12-05 15:29:06 -05:00
allierowan	8b5ade3861	5.20.0	2018-12-05 14:43:21 -05:00
Kajari Ghosh	baa8214270	bump rc version	2018-12-05 00:44:44 -05:00
Kajari Ghosh	d41b03b778	Fix fallback_speed vector access (#5291 ) * add failing cuke test * correctly access durations vector * changelog * one more cuke test	2018-12-05 00:43:16 -05:00
Kajari Ghosh	31d8ff7a74	bump version to rc5	2018-12-04 14:19:23 -05:00
Daniel Paz-Soldan	cb2532d0da	Add node 10 builds to travis (#5246 ) * Add node 10 builds to travis * Add changelog	2018-12-04 14:18:31 -05:00
Kajari Ghosh	e222fcfb17	remove destination/sources length <= coordinates length check (#5289 )	2018-12-04 14:17:13 -05:00
Daniel Patterson	7a5b6dbede	Bump version.	2018-11-02 01:43:15 -07:00
Daniel Patterson	c08953c0e6	Merge branch 'master' into 5.20	2018-11-02 01:42:30 -07:00
Daniel Patterson	e5a6c73fdf	Prepare RC.1	2018-10-30 16:17:14 -07:00