From dd5215cbaec6ae2959701fb5c9d7b51abdb04aaf Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Tue, 10 May 2016 14:03:16 +0200 Subject: [PATCH] upgrade to ES2+ --- package.json | 4 ++-- query/autocomplete_defaults.js | 2 -- query/reverse_defaults.js | 2 -- query/search_defaults.js | 2 -- test/unit/fixture/reverse_boundary_circle.js | 3 +-- test/unit/fixture/reverse_null_island.js | 1 - test/unit/fixture/reverse_standard.js | 1 - test/unit/fixture/reverse_with_boundary_country.js | 1 - test/unit/fixture/reverse_with_source_filtering.js | 1 - test/unit/fixture/search_linguistic_bbox.js | 1 - test/unit/fixture/search_linguistic_focus_bbox.js | 1 - 11 files changed, 3 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 26ba7808..67bbab7a 100644 --- a/package.json +++ b/package.json @@ -51,10 +51,10 @@ "lodash": "^4.5.0", "markdown": "0.5.0", "morgan": "1.7.0", - "pelias-config": "^1.0.1", + "pelias-config": "git://github.com/pelias/config.git#elasticsearch2", "pelias-logger": "^0.0.8", "pelias-model": "^4.0.0", - "pelias-query": "6.3.0", + "pelias-query": "git://github.com/pelias/query.git#elasticsearch2", "pelias-suggester-pipeline": "2.0.4", "pelias-text-analyzer": "^1.0.1", "stats-lite": "1.0.3", diff --git a/query/autocomplete_defaults.js b/query/autocomplete_defaults.js index 08e33aeb..7233a436 100644 --- a/query/autocomplete_defaults.js +++ b/query/autocomplete_defaults.js @@ -15,10 +15,8 @@ module.exports = _.merge({}, peliasQuery.defaults, { 'boundary:circle:radius': '50km', 'boundary:circle:distance_type': 'plane', 'boundary:circle:optimize_bbox': 'indexed', - 'boundary:circle:_cache': true, 'boundary:rect:type': 'indexed', - 'boundary:rect:_cache': true, 'ngram:analyzer': 'peliasQueryPartialToken', 'ngram:field': 'name.default', diff --git a/query/reverse_defaults.js b/query/reverse_defaults.js index 06ad6400..203b37bd 100644 --- a/query/reverse_defaults.js +++ b/query/reverse_defaults.js @@ -15,10 +15,8 @@ module.exports = _.merge({}, peliasQuery.defaults, { 'boundary:circle:radius': '500km', 'boundary:circle:distance_type': 'plane', 'boundary:circle:optimize_bbox': 'indexed', - 'boundary:circle:_cache': true, 'boundary:rect:type': 'indexed', - 'boundary:rect:_cache': true, 'ngram:analyzer': 'peliasQueryPartialToken', 'ngram:field': 'name.default', diff --git a/query/search_defaults.js b/query/search_defaults.js index 0ffdd79f..9d220d4c 100644 --- a/query/search_defaults.js +++ b/query/search_defaults.js @@ -15,10 +15,8 @@ module.exports = _.merge({}, peliasQuery.defaults, { 'boundary:circle:radius': '50km', 'boundary:circle:distance_type': 'plane', 'boundary:circle:optimize_bbox': 'indexed', - 'boundary:circle:_cache': true, 'boundary:rect:type': 'indexed', - 'boundary:rect:_cache': true, 'ngram:analyzer': 'peliasIndexOneEdgeGram', 'ngram:field': 'name.default', diff --git a/test/unit/fixture/reverse_boundary_circle.js b/test/unit/fixture/reverse_boundary_circle.js index 897f019f..4fc728a2 100644 --- a/test/unit/fixture/reverse_boundary_circle.js +++ b/test/unit/fixture/reverse_boundary_circle.js @@ -14,7 +14,6 @@ module.exports = { 'distance': vs.distance, 'distance_type': 'plane', 'optimize_bbox': 'indexed', - '_cache': true, 'center_point': { 'lat': 29.49136, 'lon': -82.50622 @@ -41,4 +40,4 @@ module.exports = { ], 'size': vs.size, 'track_scores': true -}; \ No newline at end of file +}; diff --git a/test/unit/fixture/reverse_null_island.js b/test/unit/fixture/reverse_null_island.js index 5f020ad2..9620b36a 100644 --- a/test/unit/fixture/reverse_null_island.js +++ b/test/unit/fixture/reverse_null_island.js @@ -16,7 +16,6 @@ module.exports = { 'distance': '500km', 'distance_type': 'plane', 'optimize_bbox': 'indexed', - '_cache': true, 'center_point': { 'lat': 0, 'lon': 0 diff --git a/test/unit/fixture/reverse_standard.js b/test/unit/fixture/reverse_standard.js index d0b0b734..adab3ef4 100644 --- a/test/unit/fixture/reverse_standard.js +++ b/test/unit/fixture/reverse_standard.js @@ -16,7 +16,6 @@ module.exports = { 'distance': '500km', 'distance_type': 'plane', 'optimize_bbox': 'indexed', - '_cache': true, 'center_point': { 'lat': 29.49136, 'lon': -82.50622 diff --git a/test/unit/fixture/reverse_with_boundary_country.js b/test/unit/fixture/reverse_with_boundary_country.js index 789cadaf..c63b4ccc 100644 --- a/test/unit/fixture/reverse_with_boundary_country.js +++ b/test/unit/fixture/reverse_with_boundary_country.js @@ -25,7 +25,6 @@ module.exports = { 'distance': '500km', 'distance_type': 'plane', 'optimize_bbox': 'indexed', - '_cache': true, 'center_point': { 'lat': 29.49136, 'lon': -82.50622 diff --git a/test/unit/fixture/reverse_with_source_filtering.js b/test/unit/fixture/reverse_with_source_filtering.js index 28fce18b..e81c98ef 100644 --- a/test/unit/fixture/reverse_with_source_filtering.js +++ b/test/unit/fixture/reverse_with_source_filtering.js @@ -16,7 +16,6 @@ module.exports = { 'distance': '500km', 'distance_type': 'plane', 'optimize_bbox': 'indexed', - '_cache': true, 'center_point': { 'lat': 29.49136, 'lon': -82.50622 diff --git a/test/unit/fixture/search_linguistic_bbox.js b/test/unit/fixture/search_linguistic_bbox.js index 6afe7be6..a672eb15 100644 --- a/test/unit/fixture/search_linguistic_bbox.js +++ b/test/unit/fixture/search_linguistic_bbox.js @@ -86,7 +86,6 @@ module.exports = { 'bottom': 47.47, 'left': -103.16 }, - '_cache': true, 'type': 'indexed' } }] diff --git a/test/unit/fixture/search_linguistic_focus_bbox.js b/test/unit/fixture/search_linguistic_focus_bbox.js index d5042c0f..b9785532 100644 --- a/test/unit/fixture/search_linguistic_focus_bbox.js +++ b/test/unit/fixture/search_linguistic_focus_bbox.js @@ -116,7 +116,6 @@ module.exports = { 'bottom': 47.47, 'left': -103.16 }, - '_cache': true, 'type': 'indexed' } }]