remove line from changelog about commit that isn't actually in here

5.20.0
bump rc version
2018-12-05 15:29:06 -05:00 · 2018-12-05 14:43:21 -05:00 · 2018-12-05 00:44:44 -05:00 · 2018-12-05 00:43:16 -05:00 · 2018-12-04 14:19:23 -05:00 · 2018-12-04 14:18:31 -05:00
8 changed files with 4596 additions and 650 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -13,6 +13,7 @@ notifications:
 branches:
  only:
    - master
+    - "5.20"
    # enable building tags
    - /^v\d+\.\d+(\.\d+)?(-\S*)?$/

@ -154,6 +155,14 @@ matrix:
          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libboost-all-dev', 'ccache']
      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release'

+    - os: osx
+      osx_image: xcode9.2
+      compiler: "mason-osx-release-node-10"
+      # 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="10"
+      after_success:
+        - ./scripts/travis/publish.sh
+
    - os: osx
      osx_image: xcode9.2
      compiler: "mason-osx-release-node-8"
@ -276,6 +285,54 @@ matrix:
      after_success:
        - ./scripts/travis/publish.sh

+    - os: linux
+      sudo: false
+      compiler: "node-10-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="10"
+      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-10-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="10"
+      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
+
 before_install:
  - source $NVM_DIR/nvm.sh
  - nvm install $NODE
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,11 +1,14 @@
-# UNRELEASED
+# 5.20.0
  - Changes from 5.19.0:
    - Table:
      - CHANGED: switch to pre-calculated distances for table responses for large speedup and 10% memory increase. [#5251](https://github.com/Project-OSRM/osrm-backend/pull/5251)
      - ADDED: new parameter `fallback_speed` which will fill `null` cells with estimated value [#5257](https://github.com/Project-OSRM/osrm-backend/pull/5257)
+      - CHANGED: Remove API check for matrix sources/destination length to be less than or equal to coordinates length. [#5298](https://github.com/Project-OSRM/osrm-backend/pull/5289)
+      - FIXED: Fix crashing bug when using fallback_speed parameter with more sources than destinations. [#5291](https://github.com/Project-OSRM/osrm-backend/pull/5291)
    - Features:
      - ADDED: direct mmapping of datafiles is now supported via the `--mmap` switch. [#5242](https://github.com/Project-OSRM/osrm-backend/pull/5242)
      - REMOVED: the previous `--memory_file` switch is now deprecated and will fallback to `--mmap` [#5242](https://github.com/Project-OSRM/osrm-backend/pull/5242)
+      - 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)

--- a/features/support/env.js
+++ b/features/support/env.js
@ -80,7 +80,7 @@ module.exports = function () {

        // eslint-disable-next-line no-console
        console.info(util.format('Node Version', process.version));
-        if (parseInt(process.version.match(/v(\d)/)[1]) < 4) throw new Error('*** Please upgrade to Node 4.+ to run OSRM cucumber tests');
+        if (parseInt(process.version.match(/v(\d+)/)[1]) < 4) throw new Error('*** Please upgrade to Node 4.+ to run OSRM cucumber tests');

        fs.exists(this.TEST_PATH, (exists) => {
            if (exists)
--- a/features/testbot/distance_matrix.feature
+++ b/features/testbot/distance_matrix.feature
@ -667,3 +667,48 @@ Feature: Basic Distance Matrix
            | b | 300.2  | 0     | 600.5 | 900.7  |
            | f | 900.7  | 600.5 | 0     | 302.2  |
            | 1 | 1200.9 | 900.7 | 300.2 | 0      |
+
+    Scenario: Testbot - Asymetric fallback_speed - more sources than destinations
+        Given a grid size of 300 meters
+        Given the extract extra arguments "--small-component-size 4"
+        Given the query options
+            | fallback_speed | 5 |
+            | fallback_coordinate | snapped |
+        Given the node map
+            """
+            a b   f h 1
+            d e   g i
+            """
+
+        And the ways
+            | nodes |
+            | abeda |
+            | fhigf |
+
+        When I request a travel distance matrix I should get
+            |   | a      |
+            | a | 0      |
+            | b | 300.2  |
+            | f | 900.7  |
+            | 1 | 1200.9 |
+
+ Scenario: Testbot - Asymetric fallback_speed - more destinations than sources
+        Given a grid size of 300 meters
+        Given the extract extra arguments "--small-component-size 4"
+        Given the query options
+            | fallback_speed | 5 |
+            | fallback_coordinate | snapped |
+        Given the node map
+            """
+            a b   f h 1
+            d e   g i
+            """
+
+        And the ways
+            | nodes |
+            | abeda |
+            | fhigf |
+
+        When I request a travel distance matrix I should get
+            |   | a      | b     | f     | 1      |
+            | a | 0      | 300.2 | 900.7 | 1200.9 |
--- a/include/engine/api/table_parameters.hpp
+++ b/include/engine/api/table_parameters.hpp
@ -123,14 +123,7 @@ struct TableParameters : public BaseParameters

        // 1/ The user is able to specify duplicates in srcs and dsts, in that case it's their fault

-        // 2/ len(srcs) and len(dsts) smaller or equal to len(locations)
-        if (sources.size() > coordinates.size())
-            return false;
-
-        if (destinations.size() > coordinates.size())
-            return false;
-
-        // 3/ 0 <= index < len(locations)
+        // 2/ 0 <= index < len(locations)
        const auto not_in_range = [this](const std::size_t x) { return x >= coordinates.size(); };

        if (std::any_of(begin(sources), end(sources), not_in_range))
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,11 +1,11 @@
 {
  "name": "osrm",
-  "version": "5.20.0-latest.1",
+  "version": "5.20.0",
  "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.6.2",
+    "nan": "^2.11.1",
    "node-cmake": "^2.3.2",
    "node-pre-gyp": "^0.6.36",
    "rimraf": "^2.5.4"
--- a/src/engine/plugins/table.cpp
+++ b/src/engine/plugins/table.cpp
@ -102,7 +102,8 @@ Status TablePlugin::HandleRequest(const RoutingAlgorithmsInterface &algorithms,
        {
            for (std::size_t column = 0; column < num_destinations; column++)
            {
-                const auto &table_index = row * num_sources + column;
+                const auto &table_index = row * num_destinations + column;
+                BOOST_ASSERT(table_index < result_tables_pair.first.size());
                if (result_tables_pair.first[table_index] == MAXIMAL_EDGE_DURATION)
                {
                    const auto &source =
Author	SHA1	Message	Date
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