Compare commits

...

10 Commits

Author SHA1 Message Date
Patrick Niklaus
29ce651493 Enable building the 5.13 branch 2017-10-20 15:24:29 +00:00
Patrick Niklaus
1b53b90eec Add missing entry to changelog 2017-10-20 15:08:18 +00:00
Patrick Niklaus
5f84032261 Bump version to RC2 2017-10-20 14:57:08 +00:00
Patrick Niklaus
9c73e42f5f Rename locations-cache -> location-cache 2017-10-20 14:56:10 +00:00
Patrick Niklaus
c638499c0f Add changelog entry for changed behavior 2017-10-20 14:56:10 +00:00
Patrick Niklaus
7c5977daf6 Change --use-location-cache=false to --disbale-location-cache 2017-10-20 14:56:10 +00:00
Patrick Niklaus
253522c406 Fix tests 2017-10-20 14:56:10 +00:00
Patrick Niklaus
1e2d3882d1 Replace use of implicit_value since that broke with boost 1.65 2017-10-20 14:56:10 +00:00
Patrick Niklaus
fd43586b60 Update package-lock 2017-10-18 15:02:51 +00:00
Patrick Niklaus
fd13ffe7ba Version bump for RC1 2017-10-17 14:11:27 +00:00
8 changed files with 116 additions and 109 deletions

View File

@ -13,6 +13,7 @@ notifications:
branches: branches:
only: only:
- master - master
- "5.13"
# enable building tags # enable building tags
- /^v\d+\.\d+(\.\d+)?(-\S*)?$/ - /^v\d+\.\d+(\.\d+)?(-\S*)?$/

View File

@ -1,4 +1,4 @@
# UNRELEASED # 5.13.0 RC2
- Changes from 5.12: - Changes from 5.12:
- Profile: - Profile:
- Append cardinal directions from route relations to ref fields to improve instructions - Append cardinal directions from route relations to ref fields to improve instructions
@ -10,6 +10,12 @@
- Infrastructure: - Infrastructure:
- Lua 5.1 support is removed due to lack of support in sol2 https://github.com/ThePhD/sol2/issues/302 - Lua 5.1 support is removed due to lack of support in sol2 https://github.com/ThePhD/sol2/issues/302
- Fixed pkg-config version of OSRM - Fixed pkg-config version of OSRM
- Removed `.osrm.core` file since CoreCH is deprecated now.
- Tools:
- Because of boost/program_options#32 with boost 1.65+ we needed to change the behavior of the following flags to not accept `={true|false}` anymore:
- `--use-locations-cache=false` becomes `--disable-location-cache`
- `--parse-conditional-restrictions=true` becomes `--parse-conditional-restrictions`
- The deprecated options `--use-level-cache` and `--generate-edge-lookup`
- Bugfixes: - Bugfixes:
- Fixed #4348: Some cases of sliproads pre-processing were broken - Fixed #4348: Some cases of sliproads pre-processing were broken
- Fixed #4331: Correctly compute left/right modifiers of forks in case the fork is curved. - Fixed #4331: Correctly compute left/right modifiers of forks in case the fork is curved.

View File

@ -677,7 +677,7 @@ Feature: Car - Turn restrictions
# https://www.openstreetmap.org/#map=18/38.91099/-77.00888 # https://www.openstreetmap.org/#map=18/38.91099/-77.00888
@no_turning @conditionals @no_turning @conditionals
Scenario: Car - DC North capitol situation, two on one off Scenario: Car - DC North capitol situation, two on one off
Given the extract extra arguments "--parse-conditional-restrictions=1" Given the extract extra arguments "--parse-conditional-restrictions"
# 9pm Wed 02 May, 2017 UTC, 5pm EDT # 9pm Wed 02 May, 2017 UTC, 5pm EDT
Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/dc.geojson --parse-conditionals-from-now=1493845200" Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/dc.geojson --parse-conditionals-from-now=1493845200"
Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/dc.geojson --parse-conditionals-from-now=1493845200" Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/dc.geojson --parse-conditionals-from-now=1493845200"
@ -724,7 +724,7 @@ Feature: Car - Turn restrictions
@no_turning @conditionals @no_turning @conditionals
Scenario: Car - DC North capitol situation, one on two off Scenario: Car - DC North capitol situation, one on two off
Given the extract extra arguments "--parse-conditional-restrictions=1" Given the extract extra arguments "--parse-conditional-restrictions"
# 10:30am utc, wed, 6:30am est # 10:30am utc, wed, 6:30am est
Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/dc.geojson --parse-conditionals-from-now=1493807400" Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/dc.geojson --parse-conditionals-from-now=1493807400"
Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/dc.geojson --parse-conditionals-from-now=1493807400" Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/dc.geojson --parse-conditionals-from-now=1493807400"
@ -848,7 +848,7 @@ Feature: Car - Turn restrictions
@only_turning @conditionals @only_turning @conditionals
Scenario: Car - Somewhere in London, the UK, GMT timezone Scenario: Car - Somewhere in London, the UK, GMT timezone
Given the extract extra arguments "--parse-conditional-restrictions=1" Given the extract extra arguments "--parse-conditional-restrictions"
# 9am UTC, 10am BST # 9am UTC, 10am BST
Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/london.geojson --parse-conditionals-from-now=1493802000" Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/london.geojson --parse-conditionals-from-now=1493802000"
Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/london.geojson --parse-conditionals-from-now=1493802000" Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/london.geojson --parse-conditionals-from-now=1493802000"

View File

@ -51,7 +51,7 @@ Feature: osrm-extract lua ways:get_nodes()
| ab | | ab |
And the data has been saved to disk And the data has been saved to disk
When I try to run "osrm-extract --profile {profile_file} {osm_file} --location-dependent-data test/data/regions/null-island.geojson --use-locations-cache=false" When I try to run "osrm-extract --profile {profile_file} {osm_file} --location-dependent-data test/data/regions/null-island.geojson --disable-location-cache"
Then it should exit with an error Then it should exit with an error
And stderr should contain "invalid location" And stderr should contain "invalid location"
@ -79,7 +79,7 @@ Feature: osrm-extract lua ways:get_nodes()
| ab | | ab |
And the data has been saved to disk And the data has been saved to disk
When I run "osrm-extract --profile {profile_file} {osm_file} --location-dependent-data test/data/regions/null-island.geojson --use-locations-cache=false" When I run "osrm-extract --profile {profile_file} {osm_file} --location-dependent-data test/data/regions/null-island.geojson --disable-location-cache"
Then it should exit successfully Then it should exit successfully
And stdout should contain "answer 42" And stdout should contain "answer 42"
And stdout should contain "boolean true" And stdout should contain "boolean true"
@ -116,7 +116,7 @@ Feature: osrm-extract lua ways:get_nodes()
| ef | Null Island | | ef | Null Island |
And the data has been saved to disk And the data has been saved to disk
When I run "osrm-extract --profile {profile_file} {osm_file} --location-dependent-data test/data/regions/null-island.geojson --location-dependent-data test/data/regions/hong-kong.geojson --use-locations-cache=false" When I run "osrm-extract --profile {profile_file} {osm_file} --location-dependent-data test/data/regions/null-island.geojson --location-dependent-data test/data/regions/hong-kong.geojson --disable-location-cache"
Then it should exit successfully Then it should exit successfully
And stdout should not contain "1 GeoJSON polygon" And stdout should not contain "1 GeoJSON polygon"
And stdout should contain "2 GeoJSON polygons" And stdout should contain "2 GeoJSON polygons"

188
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "osrm", "name": "osrm",
"version": "5.13.0-latest.1", "version": "5.13.0-rc.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"dependencies": { "dependencies": {
"abbrev": { "abbrev": {
@ -372,9 +372,9 @@
"dev": true "dev": true
}, },
"chalk": { "chalk": {
"version": "2.1.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
"integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
"dev": true "dev": true
}, },
"debug": { "debug": {
@ -390,9 +390,9 @@
"dev": true "dev": true
}, },
"supports-color": { "supports-color": {
"version": "4.4.0", "version": "4.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
"integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
"dev": true "dev": true
}, },
"to-fast-properties": { "to-fast-properties": {
@ -1088,9 +1088,9 @@
} }
}, },
"browserify-aes": { "browserify-aes": {
"version": "1.0.8", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.8.tgz", "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.0.tgz",
"integrity": "sha512-WYCMOT/PtGTlpOKFht0YJFYcPy6pLCR98CtWfzK13zoynLlBMvAdEMSRGmgnJCw2M2j/5qxBkinZQFobieM8dQ==", "integrity": "sha512-W2bIMLYoZ9oow7TyePpMJk9l9LY7O3R61a/68bVCDOtnJynnwe3ZeW2IzzSkrQnPKNdJrxVDn3ALZNisSBwb7g==",
"dev": true "dev": true
}, },
"browserify-cipher": { "browserify-cipher": {
@ -1242,9 +1242,9 @@
} }
}, },
"caniuse-db": { "caniuse-db": {
"version": "1.0.30000743", "version": "1.0.30000747",
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000743.tgz", "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000747.tgz",
"integrity": "sha1-vI3yolfPkboCQyImYpWvPe2FIwY=", "integrity": "sha1-j1vWweXmBFpNTmxqOlktGeGotRQ=",
"dev": true "dev": true
}, },
"caseless": { "caseless": {
@ -1343,9 +1343,9 @@
"dev": true "dev": true
}, },
"kind-of": { "kind-of": {
"version": "5.0.2", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.0.2.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
"integrity": "sha512-ru8+TQHbN8956c7ZlkgK5Imjx0GMat3jN45GNIthpPeb+SzLrqSg/NG7llQtIqUTbrdu5Oi0lSnIoJmDTwwSzw==", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
"dev": true "dev": true
}, },
"lazy-cache": { "lazy-cache": {
@ -1926,9 +1926,9 @@
"dev": true "dev": true
}, },
"chalk": { "chalk": {
"version": "2.1.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
"integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
"dev": true "dev": true
}, },
"debug": { "debug": {
@ -1938,9 +1938,9 @@
"dev": true "dev": true
}, },
"eslint": { "eslint": {
"version": "4.8.0", "version": "4.9.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-4.8.0.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.9.0.tgz",
"integrity": "sha1-Ip7w41Tg5h2DfHqA/fuoJeGZgV4=", "integrity": "sha1-doedJ0BoJhsZH+Dy9Wx0wvQgjos=",
"dev": true "dev": true
}, },
"esprima": { "esprima": {
@ -1968,9 +1968,9 @@
"dev": true "dev": true
}, },
"supports-color": { "supports-color": {
"version": "4.4.0", "version": "4.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
"integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
"dev": true "dev": true
} }
} }
@ -2024,9 +2024,9 @@
"dev": true "dev": true
}, },
"chalk": { "chalk": {
"version": "2.1.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
"integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
"dev": true "dev": true
}, },
"duplexer2": { "duplexer2": {
@ -2112,9 +2112,9 @@
"dev": true "dev": true
}, },
"kind-of": { "kind-of": {
"version": "5.0.2", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.0.2.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
"integrity": "sha512-ru8+TQHbN8956c7ZlkgK5Imjx0GMat3jN45GNIthpPeb+SzLrqSg/NG7llQtIqUTbrdu5Oi0lSnIoJmDTwwSzw==", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
"dev": true "dev": true
}, },
"load-json-file": { "load-json-file": {
@ -2204,9 +2204,9 @@
"dev": true "dev": true
}, },
"supports-color": { "supports-color": {
"version": "4.4.0", "version": "4.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
"integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
"dev": true "dev": true
}, },
"yargs": { "yargs": {
@ -2330,9 +2330,9 @@
"optional": true "optional": true
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.3.24", "version": "1.3.26",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.24.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.26.tgz",
"integrity": "sha1-m3uIuwXOufoBahd4M8wt3jiPIbY=", "integrity": "sha1-mWQnKUhhp02cfIK5Jg6jAejALWY=",
"dev": true "dev": true
}, },
"elliptic": { "elliptic": {
@ -2389,15 +2389,15 @@
"dev": true "dev": true
}, },
"es5-ext": { "es5-ext": {
"version": "0.10.30", "version": "0.10.35",
"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz", "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz",
"integrity": "sha1-cUGhaDZpfbq/qq7uQUlc4p9SyTk=", "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=",
"dev": true "dev": true
}, },
"es6-iterator": { "es6-iterator": {
"version": "2.0.1", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz", "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
"integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=", "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"d": { "d": {
@ -3941,9 +3941,9 @@
} }
}, },
"handlebars": { "handlebars": {
"version": "4.0.10", "version": "4.0.11",
"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz",
"integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=", "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"source-map": { "source-map": {
@ -4215,9 +4215,9 @@
"dev": true "dev": true
}, },
"chalk": { "chalk": {
"version": "2.1.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
"integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
"dev": true "dev": true
}, },
"figures": { "figures": {
@ -4245,9 +4245,9 @@
"dev": true "dev": true
}, },
"supports-color": { "supports-color": {
"version": "4.4.0", "version": "4.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
"integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
"dev": true "dev": true
} }
} }
@ -4384,9 +4384,9 @@
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"kind-of": { "kind-of": {
"version": "5.0.2", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.0.2.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
"integrity": "sha512-ru8+TQHbN8956c7ZlkgK5Imjx0GMat3jN45GNIthpPeb+SzLrqSg/NG7llQtIqUTbrdu5Oi0lSnIoJmDTwwSzw==", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
"dev": true "dev": true
} }
} }
@ -5040,9 +5040,9 @@
"dev": true "dev": true
}, },
"mdast-util-to-hast": { "mdast-util-to-hast": {
"version": "2.4.3", "version": "2.5.0",
"resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-2.4.3.tgz", "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-2.5.0.tgz",
"integrity": "sha1-zXh0yYMmJ/E0/TdWFjhz+T8rHeM=", "integrity": "sha1-8IeETSVcdUDzaQbaMLoQbA7l7i8=",
"dev": true "dev": true
}, },
"mdast-util-to-string": { "mdast-util-to-string": {
@ -5251,9 +5251,9 @@
"dev": true "dev": true
}, },
"kind-of": { "kind-of": {
"version": "5.0.2", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.0.2.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
"integrity": "sha512-ru8+TQHbN8956c7ZlkgK5Imjx0GMat3jN45GNIthpPeb+SzLrqSg/NG7llQtIqUTbrdu5Oi0lSnIoJmDTwwSzw==", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
"dev": true "dev": true
} }
} }
@ -5383,9 +5383,9 @@
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"kind-of": { "kind-of": {
"version": "5.0.2", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.0.2.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
"integrity": "sha512-ru8+TQHbN8956c7ZlkgK5Imjx0GMat3jN45GNIthpPeb+SzLrqSg/NG7llQtIqUTbrdu5Oi0lSnIoJmDTwwSzw==", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
"dev": true "dev": true
} }
} }
@ -5910,9 +5910,9 @@
"dev": true "dev": true
}, },
"private": { "private": {
"version": "0.1.7", "version": "0.1.8",
"resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz", "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
"integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=", "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
"dev": true "dev": true
}, },
"process": { "process": {
@ -6065,9 +6065,9 @@
} }
}, },
"rc": { "rc": {
"version": "1.2.1", "version": "1.2.2",
"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz",
"integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=", "integrity": "sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=",
"dependencies": { "dependencies": {
"minimist": { "minimist": {
"version": "1.2.0", "version": "1.2.0",
@ -6536,9 +6536,9 @@
"dev": true "dev": true
}, },
"kind-of": { "kind-of": {
"version": "5.0.2", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.0.2.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
"integrity": "sha512-ru8+TQHbN8956c7ZlkgK5Imjx0GMat3jN45GNIthpPeb+SzLrqSg/NG7llQtIqUTbrdu5Oi0lSnIoJmDTwwSzw==", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
"dev": true "dev": true
} }
} }
@ -6854,9 +6854,9 @@
"dev": true "dev": true
}, },
"kind-of": { "kind-of": {
"version": "5.0.2", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.0.2.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
"integrity": "sha512-ru8+TQHbN8956c7ZlkgK5Imjx0GMat3jN45GNIthpPeb+SzLrqSg/NG7llQtIqUTbrdu5Oi0lSnIoJmDTwwSzw==", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
"dev": true "dev": true
} }
} }
@ -7114,9 +7114,9 @@
"dev": true "dev": true
}, },
"chalk": { "chalk": {
"version": "2.1.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.2.0.tgz",
"integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", "integrity": "sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g==",
"dev": true "dev": true
}, },
"is-fullwidth-code-point": { "is-fullwidth-code-point": {
@ -7138,9 +7138,9 @@
"dev": true "dev": true
}, },
"supports-color": { "supports-color": {
"version": "4.4.0", "version": "4.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
"integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
"dev": true "dev": true
} }
} }
@ -7312,9 +7312,9 @@
"dev": true "dev": true
}, },
"kind-of": { "kind-of": {
"version": "5.0.2", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.0.2.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
"integrity": "sha512-ru8+TQHbN8956c7ZlkgK5Imjx0GMat3jN45GNIthpPeb+SzLrqSg/NG7llQtIqUTbrdu5Oi0lSnIoJmDTwwSzw==", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
"dev": true "dev": true
} }
} }
@ -7422,9 +7422,9 @@
"dev": true "dev": true
}, },
"ua-parser-js": { "ua-parser-js": {
"version": "0.7.14", "version": "0.7.17",
"resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.14.tgz", "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz",
"integrity": "sha1-EQ1T+kw/MmwSEpK76skE0uAzh8o=", "integrity": "sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g==",
"dev": true "dev": true
}, },
"uglify-js": { "uglify-js": {
@ -7672,9 +7672,9 @@
"dev": true "dev": true
}, },
"kind-of": { "kind-of": {
"version": "5.0.2", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.0.2.tgz", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
"integrity": "sha512-ru8+TQHbN8956c7ZlkgK5Imjx0GMat3jN45GNIthpPeb+SzLrqSg/NG7llQtIqUTbrdu5Oi0lSnIoJmDTwwSzw==", "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
"dev": true "dev": true
}, },
"lazy-cache": { "lazy-cache": {
@ -7769,9 +7769,9 @@
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"supports-color": { "supports-color": {
"version": "4.4.0", "version": "4.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
"integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
"dev": true "dev": true
} }
} }

View File

@ -1,6 +1,6 @@
{ {
"name": "osrm", "name": "osrm",
"version": "5.13.0-latest.1", "version": "5.13.0-rc.2",
"private": false, "private": false,
"description": "The Open Source Routing Machine is a high performance routing engine written in C++14 designed to run on OpenStreetMap data.", "description": "The Open Source Routing Machine is a high performance routing engine written in C++14 designed to run on OpenStreetMap data.",
"dependencies": { "dependencies": {

View File

@ -61,7 +61,7 @@ return_code parseArguments(int argc,
->composing(), ->composing(),
"Lookup files containing from_, to_, via_nodes, and turn penalties to adjust turn weights")( "Lookup files containing from_, to_, via_nodes, and turn penalties to adjust turn weights")(
"level-cache,o", "level-cache,o",
boost::program_options::value<bool>(&contractor_config.use_cached_priority) boost::program_options::bool_switch(&contractor_config.use_cached_priority)
->default_value(false), ->default_value(false),
"DEPRECATED: Will always be false. Use .level file to retain the contraction level for " "DEPRECATED: Will always be false. Use .level file to retain the contraction level for "
"each " "each "

View File

@ -58,7 +58,7 @@ return_code parseArguments(int argc,
->default_value(false), ->default_value(false),
"Use metadata during osm parsing (This can affect the extraction performance).")( "Use metadata during osm parsing (This can affect the extraction performance).")(
"parse-conditional-restrictions", "parse-conditional-restrictions",
boost::program_options::value<bool>(&extractor_config.parse_conditionals) boost::program_options::bool_switch(&extractor_config.parse_conditionals)
->implicit_value(true) ->implicit_value(true)
->default_value(false), ->default_value(false),
"Save conditional restrictions found during extraction to disk for use " "Save conditional restrictions found during extraction to disk for use "
@ -67,10 +67,10 @@ return_code parseArguments(int argc,
&extractor_config.location_dependent_data_paths) &extractor_config.location_dependent_data_paths)
->composing(), ->composing(),
"GeoJSON files with location-dependent data")( "GeoJSON files with location-dependent data")(
"use-locations-cache", "disable-location-cache",
boost::program_options::value<bool>(&extractor_config.use_locations_cache) boost::program_options::bool_switch(&extractor_config.use_locations_cache)
->implicit_value(true) ->implicit_value(false)
->default_value(extractor_config.use_locations_cache), ->default_value(true),
"Use internal nodes locations cache for location-dependent data lookups"); "Use internal nodes locations cache for location-dependent data lookups");
bool dummy; bool dummy;
@ -82,7 +82,7 @@ return_code parseArguments(int argc,
boost::program_options::value<boost::filesystem::path>(&extractor_config.input_path), boost::program_options::value<boost::filesystem::path>(&extractor_config.input_path),
"Input file in .osm, .osm.bz2 or .osm.pbf format")( "Input file in .osm, .osm.bz2 or .osm.pbf format")(
"generate-edge-lookup", "generate-edge-lookup",
boost::program_options::value<bool>(&dummy)->implicit_value(true)->default_value(false), boost::program_options::bool_switch(&dummy)->implicit_value(true)->default_value(false),
"Not used anymore"); "Not used anymore");
// positional option // positional option