Browse Source

Merge pull request #855 from pelias/revert-844-greenkeeper/pelias-query-8.16.0

Revert "Update pelias-query to the latest version 🚀"
pull/845/head
Julian Simioni 8 years ago committed by GitHub
parent
commit
603fee8b47
  1. 2
      package.json
  2. 6
      test/unit/fixture/search_boundary_country.js
  3. 9
      test/unit/fixture/search_fallback.js
  4. 9
      test/unit/fixture/search_fallback_postalcode_only.js
  5. 6
      test/unit/fixture/search_linguistic_bbox.js
  6. 6
      test/unit/fixture/search_linguistic_focus.js
  7. 6
      test/unit/fixture/search_linguistic_focus_bbox.js
  8. 6
      test/unit/fixture/search_linguistic_focus_null_island.js
  9. 6
      test/unit/fixture/search_linguistic_only.js
  10. 6
      test/unit/fixture/search_linguistic_viewport.js
  11. 6
      test/unit/fixture/search_linguistic_viewport_min_diagonal.js
  12. 6
      test/unit/fixture/search_with_category_filtering.js
  13. 6
      test/unit/fixture/search_with_source_filtering.js
  14. 6
      test/unit/fixture/structured_geocoding/boundary_country.json
  15. 9
      test/unit/fixture/structured_geocoding/fallback.json
  16. 6
      test/unit/fixture/structured_geocoding/linguistic_bbox.json
  17. 6
      test/unit/fixture/structured_geocoding/linguistic_focus.json
  18. 6
      test/unit/fixture/structured_geocoding/linguistic_focus_bbox.json
  19. 6
      test/unit/fixture/structured_geocoding/linguistic_focus_null_island.json
  20. 6
      test/unit/fixture/structured_geocoding/linguistic_only.json
  21. 6
      test/unit/fixture/structured_geocoding/linguistic_viewport.json
  22. 6
      test/unit/fixture/structured_geocoding/linguistic_viewport_min_diagonal.json
  23. 9
      test/unit/fixture/structured_geocoding/postalcode_only.js
  24. 7
      test/unit/fixture/structured_geocoding/with_source_filtering.json

2
package.json

@ -61,7 +61,7 @@
"pelias-logger": "0.2.0",
"pelias-mock-logger": "^1.0.1",
"pelias-model": "4.6.0",
"pelias-query": "8.16.0",
"pelias-query": "8.15.0",
"pelias-text-analyzer": "1.7.3",
"predicates": "^1.0.1",
"retry": "^0.10.1",

6
test/unit/fixture/search_boundary_country.js

@ -1,6 +1,8 @@
module.exports = {
'query': {
'function_score': {
'query': {
'filtered': {
'query': {
'bool': {
'should': [
@ -23,7 +25,9 @@ module.exports = {
}
}
}
],
]
}
},
'filter': {
'bool': {
'must': [

9
test/unit/fixture/search_fallback.js

@ -1,6 +1,8 @@
module.exports = {
'query': {
'function_score': {
'query': {
'filtered': {
'query': {
'bool': {
'should': [
@ -826,6 +828,13 @@ module.exports = {
]
}
},
'filter': {
'bool': {
'must': []
}
}
}
},
'max_boost': 20,
'functions': [
{

9
test/unit/fixture/search_fallback_postalcode_only.js

@ -1,6 +1,8 @@
module.exports = {
'query': {
'function_score': {
'query': {
'filtered': {
'query': {
'bool': {
'should': [
@ -28,6 +30,13 @@ module.exports = {
]
}
},
'filter': {
'bool': {
'must': []
}
}
}
},
'max_boost': 20,
'functions': [
{

6
test/unit/fixture/search_linguistic_bbox.js

@ -1,6 +1,8 @@
module.exports = {
'query': {
'function_score': {
'query': {
'filtered': {
'query': {
'bool': {
'should': [
@ -23,7 +25,9 @@ module.exports = {
}
}
}
],
]
}
},
'filter': {
'bool': {
'must': [

6
test/unit/fixture/search_linguistic_focus.js

@ -1,6 +1,8 @@
module.exports = {
'query': {
'function_score': {
'query': {
'filtered': {
'query': {
'bool': {
'should': [
@ -23,7 +25,9 @@ module.exports = {
}
}
}
],
]
}
},
'filter': {
'bool': {
'must': [

6
test/unit/fixture/search_linguistic_focus_bbox.js

@ -1,6 +1,8 @@
module.exports = {
'query': {
'function_score': {
'query': {
'filtered': {
'query': {
'bool': {
'should': [
@ -23,7 +25,9 @@ module.exports = {
}
}
}
],
]
}
},
'filter': {
'bool': {
'must': [

6
test/unit/fixture/search_linguistic_focus_null_island.js

@ -1,6 +1,8 @@
module.exports = {
'query': {
'function_score': {
'query': {
'filtered': {
'query': {
'bool': {
'should': [
@ -23,7 +25,9 @@ module.exports = {
}
}
}
],
]
}
},
'filter': {
'bool': {
'must': [

6
test/unit/fixture/search_linguistic_only.js

@ -1,6 +1,8 @@
module.exports = {
'query': {
'function_score': {
'query': {
'filtered': {
'query': {
'bool': {
'should': [
@ -23,7 +25,9 @@ module.exports = {
}
}
}
],
]
}
},
'filter': {
'bool': {
'must': [

6
test/unit/fixture/search_linguistic_viewport.js

@ -1,6 +1,8 @@
module.exports = {
'query': {
'function_score': {
'query': {
'filtered': {
'query': {
'bool': {
'should': [
@ -23,7 +25,9 @@ module.exports = {
}
}
}
],
]
}
},
'filter': {
'bool': {
'must': [

6
test/unit/fixture/search_linguistic_viewport_min_diagonal.js

@ -1,6 +1,8 @@
module.exports = {
'query': {
'function_score': {
'query': {
'filtered': {
'query': {
'bool': {
'should': [
@ -23,7 +25,9 @@ module.exports = {
}
}
}
],
]
}
},
'filter': {
'bool': {
'must': [

6
test/unit/fixture/search_with_category_filtering.js

@ -1,6 +1,8 @@
module.exports = {
'query': {
'function_score': {
'query': {
'filtered': {
'query': {
'bool': {
'should': [
@ -23,7 +25,9 @@ module.exports = {
}
}
}
],
]
}
},
'filter': {
'bool': {
'must': [

6
test/unit/fixture/search_with_source_filtering.js

@ -1,6 +1,8 @@
module.exports = {
'query': {
'function_score': {
'query': {
'filtered': {
'query': {
'bool': {
'should': [
@ -23,7 +25,9 @@ module.exports = {
}
}
}
],
]
}
},
'filter': {
'bool': {
'must': [

6
test/unit/fixture/structured_geocoding/boundary_country.json

@ -1,9 +1,13 @@
{
"query": {
"function_score": {
"query": {
"filtered": {
"query": {
"bool": {
"should": [],
"should": []
}
},
"filter": {
"bool": {
"must": [

9
test/unit/fixture/structured_geocoding/fallback.json

@ -1,6 +1,8 @@
{
"query": {
"function_score": {
"query": {
"filtered": {
"query": {
"bool": {
"should": [
@ -827,6 +829,13 @@
]
}
},
"filter": {
"bool": {
"must": []
}
}
}
},
"max_boost": 20,
"functions": [
{

6
test/unit/fixture/structured_geocoding/linguistic_bbox.json

@ -1,9 +1,13 @@
{
"query": {
"function_score": {
"query": {
"filtered": {
"query": {
"bool": {
"should": [],
"should": []
}
},
"filter": {
"bool": {
"must": [

6
test/unit/fixture/structured_geocoding/linguistic_focus.json

@ -1,9 +1,13 @@
{
"query": {
"function_score": {
"query": {
"filtered": {
"query": {
"bool": {
"should": [],
"should": []
}
},
"filter": {
"bool": {
"must": [

6
test/unit/fixture/structured_geocoding/linguistic_focus_bbox.json

@ -1,9 +1,13 @@
{
"query": {
"function_score": {
"query": {
"filtered": {
"query": {
"bool": {
"should": [],
"should": []
}
},
"filter": {
"bool": {
"must": [

6
test/unit/fixture/structured_geocoding/linguistic_focus_null_island.json

@ -1,9 +1,13 @@
{
"query": {
"function_score": {
"query": {
"filtered": {
"query": {
"bool": {
"should": [],
"should": []
}
},
"filter": {
"bool": {
"must": [

6
test/unit/fixture/structured_geocoding/linguistic_only.json

@ -1,9 +1,13 @@
{
"query": {
"function_score": {
"query": {
"filtered": {
"query": {
"bool": {
"should": [],
"should": []
}
},
"filter": {
"bool": {
"must": [

6
test/unit/fixture/structured_geocoding/linguistic_viewport.json

@ -1,9 +1,13 @@
{
"query": {
"function_score": {
"query": {
"filtered": {
"query": {
"bool": {
"should": [],
"should": []
}
},
"filter": {
"bool": {
"must": [

6
test/unit/fixture/structured_geocoding/linguistic_viewport_min_diagonal.json

@ -1,9 +1,13 @@
{
"query": {
"function_score": {
"query": {
"filtered": {
"query": {
"bool": {
"should": [],
"should": []
}
},
"filter": {
"bool": {
"must": [

9
test/unit/fixture/structured_geocoding/postalcode_only.js

@ -1,6 +1,8 @@
module.exports = {
'query': {
'function_score': {
'query': {
'filtered': {
'query': {
'bool': {
'should': [
@ -28,6 +30,13 @@ module.exports = {
]
}
},
'filter': {
'bool': {
'must': []
}
}
}
},
'max_boost': 20,
'functions': [
{

7
test/unit/fixture/structured_geocoding/with_source_filtering.json

@ -1,10 +1,13 @@
{
"query": {
"function_score": {
"query": {
"filtered": {
"query": {
"bool": {
"should": [
],
"should": []
}
},
"filter": {
"bool": {
"must": [

Loading…
Cancel
Save