From 9c73e42f5fc0b596ca8dd5d4b0171cdf84206580 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Thu, 19 Oct 2017 20:48:10 +0000 Subject: [PATCH] Rename locations-cache -> location-cache --- CHANGELOG.md | 2 +- features/options/extract/lua.feature | 6 +++--- src/tools/extract.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e76b9a94..36a2e0934 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ - Fixed pkg-config version of OSRM - 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-location-cache=false` becomes `--disable-location-cache` + - `--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: diff --git a/features/options/extract/lua.feature b/features/options/extract/lua.feature index bbe8e270d..750fbb8af 100644 --- a/features/options/extract/lua.feature +++ b/features/options/extract/lua.feature @@ -51,7 +51,7 @@ Feature: osrm-extract lua ways:get_nodes() | ab | 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 And stderr should contain "invalid location" @@ -79,7 +79,7 @@ Feature: osrm-extract lua ways:get_nodes() | ab | 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 And stdout should contain "answer 42" And stdout should contain "boolean true" @@ -116,7 +116,7 @@ Feature: osrm-extract lua ways:get_nodes() | ef | Null Island | 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 And stdout should not contain "1 GeoJSON polygon" And stdout should contain "2 GeoJSON polygons" diff --git a/src/tools/extract.cpp b/src/tools/extract.cpp index 3886384b0..bca3ef8d1 100644 --- a/src/tools/extract.cpp +++ b/src/tools/extract.cpp @@ -67,7 +67,7 @@ return_code parseArguments(int argc, &extractor_config.location_dependent_data_paths) ->composing(), "GeoJSON files with location-dependent data")( - "disable-locations-cache", + "disable-location-cache", boost::program_options::bool_switch(&extractor_config.use_locations_cache) ->implicit_value(false) ->default_value(true),