pelias
/
api
mirror of https://github.com/pelias/api.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

remove ngram analysis from search endpoint

remove_ngrams_from_search
Peter Johnson 9 years ago
parent
fdcdea3258
commit
9b3715c8c0
12 changed files with 27 additions and 119 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      query/search.js
  2. 16
      test/unit/fixture/search_boundary_country.js
  3. 13
      test/unit/fixture/search_full_address.js
  4. 12
      test/unit/fixture/search_linguistic_bbox.js
  5. 12
      test/unit/fixture/search_linguistic_focus.js
  6. 12
      test/unit/fixture/search_linguistic_focus_bbox.js
  7. 12
      test/unit/fixture/search_linguistic_focus_null_island.js
  8. 12
      test/unit/fixture/search_linguistic_only.js
  9. 15
      test/unit/fixture/search_linguistic_viewport.js
  10. 15
      test/unit/fixture/search_linguistic_viewport_min_diagonal.js
  11. 12
      test/unit/fixture/search_partial_address.js
  12. 12
      test/unit/fixture/search_regions_address.js

3
query/search.js
Unescape View File

@ -11,10 +11,9 @@ var query = new peliasQuery.layout.FilteredBooleanQuery();
// mandatory matches // mandatory matches
query.score( peliasQuery.view.boundary_country, 'must' ); query.score( peliasQuery.view.boundary_country, 'must' );
query.score( peliasQuery.view.ngrams, 'must' ); query.score( peliasQuery.view.phrase, 'must' );
// scoring boost // scoring boost
query.score( peliasQuery.view.phrase );
query.score( peliasQuery.view.focus( peliasQuery.view.phrase ) ); query.score( peliasQuery.view.focus( peliasQuery.view.phrase ) );
query.score( peliasQuery.view.popularity( peliasQuery.view.phrase ) ); query.score( peliasQuery.view.popularity( peliasQuery.view.phrase ) );
query.score( peliasQuery.view.population( peliasQuery.view.phrase ) ); query.score( peliasQuery.view.population( peliasQuery.view.phrase ) );

16
test/unit/fixture/search_boundary_country.js
Unescape View File

@ -15,25 +15,17 @@ module.exports = {
}, },
{ {
'match': { 'match': {
'name.default': { 'phrase.default': {
'query': 'test', 'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'boost': 1, 'boost': 1,
'analyzer': 'peliasOneEdgeGram' 'slop': 2
} }
} }
} }
], ],
'should': [{ 'should': [{
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'boost': 1,
'slop': 2
}
}
},{
'function_score': { 'function_score': {
'query': { 'query': {
'match': { 'match': {

13
test/unit/fixture/search_full_address.js
Unescape View File

@ -8,15 +8,6 @@ module.exports = {
'query': { 'query': {
'bool': { 'bool': {
'must': [{ 'must': [{
'match': {
'name.default': {
'query': '123 main st',
'analyzer': 'peliasOneEdgeGram',
'boost': 1
}
}
}],
'should': [{
'match': { 'match': {
'phrase.default': { 'phrase.default': {
'query': '123 main st', 'query': '123 main st',
@ -26,8 +17,8 @@ module.exports = {
'boost': 1 'boost': 1
} }
} }
}, }],
{ 'should': [{
'function_score': { 'function_score': {
'query': { 'query': {
'match': { 'match': {

12
test/unit/fixture/search_linguistic_bbox.js
Unescape View File

@ -5,15 +5,6 @@ module.exports = {
'query': { 'query': {
'bool': { 'bool': {
'must': [{ 'must': [{
'match': {
'name.default': {
'query': 'test',
'boost': 1,
'analyzer': 'peliasOneEdgeGram'
}
}
}],
'should': [{
'match': { 'match': {
'phrase.default': { 'phrase.default': {
'query': 'test', 'query': 'test',
@ -23,7 +14,8 @@ module.exports = {
'slop': 2 'slop': 2
} }
} }
},{ }],
'should': [{
'function_score': { 'function_score': {
'query': { 'query': {
'match': { 'match': {

12
test/unit/fixture/search_linguistic_focus.js
Unescape View File

@ -5,15 +5,6 @@ module.exports = {
'query': { 'query': {
'bool': { 'bool': {
'must': [{ 'must': [{
'match': {
'name.default': {
'query': 'test',
'boost': 1,
'analyzer': 'peliasOneEdgeGram'
}
}
}],
'should': [{
'match': { 'match': {
'phrase.default': { 'phrase.default': {
'query': 'test', 'query': 'test',
@ -23,7 +14,8 @@ module.exports = {
'slop': 2 'slop': 2
} }
} }
}, { }],
'should': [{
'function_score': { 'function_score': {
'query': { 'query': {
'match': { 'match': {

12
test/unit/fixture/search_linguistic_focus_bbox.js
Unescape View File

@ -5,15 +5,6 @@ module.exports = {
'query': { 'query': {
'bool': { 'bool': {
'must': [{ 'must': [{
'match': {
'name.default': {
'query': 'test',
'boost': 1,
'analyzer': 'peliasOneEdgeGram'
}
}
}],
'should': [{
'match': { 'match': {
'phrase.default': { 'phrase.default': {
'query': 'test', 'query': 'test',
@ -23,7 +14,8 @@ module.exports = {
'slop': 2 'slop': 2
} }
} }
}, { }],
'should': [{
'function_score': { 'function_score': {
'query': { 'query': {
'match': { 'match': {

12
test/unit/fixture/search_linguistic_focus_null_island.js
Unescape View File

@ -5,15 +5,6 @@ module.exports = {
'query': { 'query': {
'bool': { 'bool': {
'must': [{ 'must': [{
'match': {
'name.default': {
'query': 'test',
'boost': 1,
'analyzer': 'peliasOneEdgeGram'
}
}
}],
'should': [{
'match': { 'match': {
'phrase.default': { 'phrase.default': {
'query': 'test', 'query': 'test',
@ -23,7 +14,8 @@ module.exports = {
'slop': 2 'slop': 2
} }
} }
}, { }],
'should': [{
'function_score': { 'function_score': {
'query': { 'query': {
'match': { 'match': {

12
test/unit/fixture/search_linguistic_only.js
Unescape View File

@ -5,15 +5,6 @@ module.exports = {
'query': { 'query': {
'bool': { 'bool': {
'must': [{ 'must': [{
'match': {
'name.default': {
'query': 'test',
'boost': 1,
'analyzer': 'peliasOneEdgeGram'
}
}
}],
'should': [{
'match': { 'match': {
'phrase.default': { 'phrase.default': {
'query': 'test', 'query': 'test',
@ -23,7 +14,8 @@ module.exports = {
'slop': 2 'slop': 2
} }
} }
},{ }],
'should': [{
'function_score': { 'function_score': {
'query': { 'query': {
'match': { 'match': {

15
test/unit/fixture/search_linguistic_viewport.js
Unescape View File

@ -4,17 +4,6 @@ module.exports = {
'query': { 'query': {
'bool': { 'bool': {
'must': [ 'must': [
{
'match': {
'name.default': {
'analyzer': 'peliasOneEdgeGram',
'boost': 1,
'query': 'test'
}
}
}
],
'should': [
{ {
'match': { 'match': {
'phrase.default': { 'phrase.default': {
@ -25,7 +14,9 @@ module.exports = {
'query': 'test' 'query': 'test'
} }
} }
}, }
],
'should': [
{ {
'function_score': { 'function_score': {
'query': { 'query': {

15
test/unit/fixture/search_linguistic_viewport_min_diagonal.js
Unescape View File

@ -4,17 +4,6 @@ module.exports = {
'query': { 'query': {
'bool': { 'bool': {
'must': [ 'must': [
{
'match': {
'name.default': {
'analyzer': 'peliasOneEdgeGram',
'boost': 1,
'query': 'test'
}
}
}
],
'should': [
{ {
'match': { 'match': {
'phrase.default': { 'phrase.default': {
@ -25,7 +14,9 @@ module.exports = {
'query': 'test' 'query': 'test'
} }
} }
}, }
],
'should': [
{ {
'function_score': { 'function_score': {
'query': { 'query': {

12
test/unit/fixture/search_partial_address.js
Unescape View File

@ -8,15 +8,6 @@ module.exports = {
'query': { 'query': {
'bool': { 'bool': {
'must': [{ 'must': [{
'match': {
'name.default': {
'query': 'soho grand',
'analyzer': 'peliasOneEdgeGram',
'boost': 1
}
}
}],
'should': [{
'match': { 'match': {
'phrase.default': { 'phrase.default': {
'query': 'soho grand', 'query': 'soho grand',
@ -26,7 +17,8 @@ module.exports = {
'boost': 1 'boost': 1
} }
} }
},{ }],
'should': [{
'function_score': { 'function_score': {
'query': { 'query': {
'match': { 'match': {

12
test/unit/fixture/search_regions_address.js
Unescape View File

@ -8,15 +8,6 @@ module.exports = {
'query': { 'query': {
'bool': { 'bool': {
'must': [{ 'must': [{
'match': {
'name.default': {
'query': '1 water st',
'analyzer': 'peliasOneEdgeGram',
'boost': 1
}
}
}],
'should': [{
'match': { 'match': {
'phrase.default': { 'phrase.default': {
'query': '1 water st', 'query': '1 water st',
@ -26,7 +17,8 @@ module.exports = {
'boost': 1 'boost': 1
} }
} }
},{ }],
'should': [{
'function_score': { 'function_score': {
'query': { 'query': {
'match': { 'match': {

Write Preview
Loading…
Cancel
Save