Compare commits
	
		
			6 Commits
		
	
	
		
			master
			...
			v5.20.0-rc
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 31d8ff7a74 | ||
|  | cb2532d0da | ||
|  | e222fcfb17 | ||
|  | 7a5b6dbede | ||
|  | c08953c0e6 | ||
|  | e5a6c73fdf | 
							
								
								
									
										56
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						
									
										56
									
								
								.travis.yml
									
									
									
									
									
								
							| @ -154,6 +154,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 +284,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 | ||||
|  | ||||
| @ -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) | ||||
|     - 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: 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: 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) | ||||
| 
 | ||||
|  | ||||
| @ -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) | ||||
|  | ||||
| @ -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)) | ||||
|  | ||||
							
								
								
									
										5119
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										5119
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -1,11 +1,11 @@ | ||||
| { | ||||
|   "name": "osrm", | ||||
|   "version": "5.20.0-latest.1", | ||||
|   "version": "5.20.0-rc.5", | ||||
|   "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" | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user