Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Rename locations-cache -> location-cache

Browse Source
This commit is contained in:
Patrick Niklaus 2017-10-19 20:48:10 +00:00 committed by Patrick Niklaus
parent 4684d2e35c
commit a8de007d98
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -13,7 +13,7 @@
- Fixed pkg-config version of OSRM - Fixed pkg-config version of OSRM
- Tools: - 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: - 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-location-cache=false` becomes `--disable-location-cache` - `--use-locations-cache=false` becomes `--disable-location-cache`
- `--parse-conditional-restrictions=true` becomes `--parse-conditional-restrictions` - `--parse-conditional-restrictions=true` becomes `--parse-conditional-restrictions`
- The deprecated options `--use-level-cache` and `--generate-edge-lookup` - The deprecated options `--use-level-cache` and `--generate-edge-lookup`
- Bugfixes: - Bugfixes:

6
features/options/extract/lua.feature
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 --disable-locations-cache" 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 --disable-locations-cache" 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 --disable-locations-cache" 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"

2
src/tools/extract.cpp
View File

@ -67,7 +67,7 @@ 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")(
"disable-locations-cache", "disable-location-cache",
boost::program_options::bool_switch(&extractor_config.use_locations_cache) boost::program_options::bool_switch(&extractor_config.use_locations_cache)
->implicit_value(false) ->implicit_value(false)
->default_value(true), ->default_value(true),