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

Merge pull request #338 from pelias/improved_population_popularity_boosting 

better population and popularity boosting
pull/341/head
Peter Johnson a.k.a. insertcoffee 9 years ago
parent
bfd2720681 8ceac4cbb0
commit
928f06121f
17 changed files with 542 additions and 331 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      package.json
  2. 3
      query/autocomplete.js
  3. 13
      query/defaults.js
  4. 3
      query/search.js
  5. 65
      test/unit/fixture/autocomplete_linguistic_focus.js
  6. 65
      test/unit/fixture/autocomplete_linguistic_focus_null_island.js
  7. 62
      test/unit/fixture/autocomplete_linguistic_only.js
  8. 62
      test/unit/fixture/search_boundary_country.js
  9. 59
      test/unit/fixture/search_full_address.js
  10. 62
      test/unit/fixture/search_linguistic_bbox.js
  11. 65
      test/unit/fixture/search_linguistic_focus.js
  12. 65
      test/unit/fixture/search_linguistic_focus_bbox.js
  13. 65
      test/unit/fixture/search_linguistic_focus_null_island.js
  14. 62
      test/unit/fixture/search_linguistic_only.js
  15. 62
      test/unit/fixture/search_partial_address.js
  16. 62
      test/unit/fixture/search_regions_address.js

2
package.json
Unescape View File

@ -51,7 +51,7 @@
"pelias-config": "^1.0.1",
"pelias-esclient": "0.0.25",
"pelias-logger": "^0.0.8",
"pelias-query": "2.0.0",
"pelias-query": "^5.0.0",
"pelias-schema": "1.0.0",
"pelias-suggester-pipeline": "2.0.2",
"stats-lite": "^1.0.3",

3
query/autocomplete.js
Unescape View File

@ -14,7 +14,8 @@ query.score( peliasQuery.view.ngrams, 'must' );
// scoring boost
query.score( peliasQuery.view.phrase );
query.score( peliasQuery.view.focus( peliasQuery.view.ngrams ) );
query.score( peliasQuery.view.popularity(['admin0','admin1','admin2']) );
query.score( peliasQuery.view.popularity( peliasQuery.view.phrase ) );
query.score( peliasQuery.view.population( peliasQuery.view.phrase ) );
// --------------------------------

13
query/defaults.js
Unescape View File

@ -33,6 +33,7 @@ module.exports = extend( false, peliasQuery.defaults, {
'focus:offset': '1km',
'focus:scale': '50km',
'focus:decay': 0.5,
'focus:weight': 2,
'function_score:score_mode': 'avg',
'function_score:boost_mode': 'replace',
@ -79,6 +80,16 @@ module.exports = extend( false, peliasQuery.defaults, {
'admin:neighborhood:analyzer': 'peliasAdmin',
'admin:neighborhood:field': 'neighborhood',
'admin:neighborhood:boost': 1
'admin:neighborhood:boost': 1,
'popularity:field': 'popularity',
'popularity:modifier': 'log1p',
'popularity:max_boost': 20,
'popularity:weight': 1,
'population:field': 'population',
'population:modifier': 'log1p',
'population:max_boost': 20,
'population:weight': 2
});

3
query/search.js
Unescape View File

@ -15,7 +15,8 @@ query.score( peliasQuery.view.ngrams, 'must' );
// scoring boost
query.score( peliasQuery.view.phrase );
query.score( peliasQuery.view.focus( peliasQuery.view.phrase ) );
query.score( peliasQuery.view.popularity(['admin0','admin1','admin2']) );
query.score( peliasQuery.view.popularity( peliasQuery.view.phrase ) );
query.score( peliasQuery.view.population( peliasQuery.view.phrase ) );
// address components
query.score( peliasQuery.view.address('housenumber') );

65
test/unit/fixture/autocomplete_linguistic_focus.js
Unescape View File

@ -45,51 +45,68 @@ module.exports = {
'scale': '50km',
'decay': 0.5
}
}
},
'weight': 2
}],
'score_mode': 'avg',
'boost_mode': 'replace'
}
},
{
},{
'function_score': {
'query': {
'filtered': {
'filter': {
'exists': {
'field': 'popularity'
}
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
},
'max_boost': 2,
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'or': [
{
'type': {
'value': 'admin0'
'exists': {
'field': 'popularity'
}
},
{
'type': {
'value': 'admin1'
}
'functions': [{
'field_value_factor': {
'modifier': 'log1p',
'field': 'popularity'
},
{
'type': {
'value': 'admin2'
'weight': 1
}]
}
},{
'function_score': {
'query': {
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
]
},
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'exists': {
'field': 'population'
}
},
'functions': [{
'field_value_factor': {
'modifier': 'sqrt',
'field': 'popularity'
'modifier': 'log1p',
'field': 'population'
},
'weight': 1
'weight': 2
}]
}
}]

65
test/unit/fixture/autocomplete_linguistic_focus_null_island.js
Unescape View File

@ -45,51 +45,68 @@ module.exports = {
'scale': '50km',
'decay': 0.5
}
}
},
'weight': 2
}],
'score_mode': 'avg',
'boost_mode': 'replace'
}
},
{
},{
'function_score': {
'query': {
'filtered': {
'filter': {
'exists': {
'field': 'popularity'
}
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
},
'max_boost': 2,
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'or': [
{
'type': {
'value': 'admin0'
'exists': {
'field': 'popularity'
}
},
{
'type': {
'value': 'admin1'
}
'functions': [{
'field_value_factor': {
'modifier': 'log1p',
'field': 'popularity'
},
{
'type': {
'value': 'admin2'
'weight': 1
}]
}
},{
'function_score': {
'query': {
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
]
},
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'exists': {
'field': 'population'
}
},
'functions': [{
'field_value_factor': {
'modifier': 'sqrt',
'field': 'popularity'
'modifier': 'log1p',
'field': 'population'
},
'weight': 1
'weight': 2
}]
}
}]

62
test/unit/fixture/autocomplete_linguistic_only.js
Unescape View File

@ -23,46 +23,62 @@ module.exports = {
'slop': 2
}
}
},
{
},{
'function_score': {
'query': {
'filtered': {
'filter': {
'exists': {
'field': 'popularity'
}
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
},
'max_boost': 2,
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'or': [
{
'type': {
'value': 'admin0'
'exists': {
'field': 'popularity'
}
},
{
'type': {
'value': 'admin1'
}
'functions': [{
'field_value_factor': {
'modifier': 'log1p',
'field': 'popularity'
},
{
'type': {
'value': 'admin2'
'weight': 1
}]
}
},{
'function_score': {
'query': {
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
]
},
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'exists': {
'field': 'population'
}
},
'functions': [{
'field_value_factor': {
'modifier': 'sqrt',
'field': 'popularity'
'modifier': 'log1p',
'field': 'population'
},
'weight': 1
'weight': 2
}]
}
}]

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

@ -33,46 +33,62 @@ module.exports = {
'slop': 2
}
}
},
{
},{
'function_score': {
'query': {
'filtered': {
'filter': {
'exists': {
'field': 'popularity'
}
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
},
'max_boost': 2,
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'or': [
{
'type': {
'value': 'admin0'
'exists': {
'field': 'popularity'
}
},
{
'type': {
'value': 'admin1'
}
'functions': [{
'field_value_factor': {
'modifier': 'log1p',
'field': 'popularity'
},
{
'type': {
'value': 'admin2'
'weight': 1
}]
}
},{
'function_score': {
'query': {
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
]
},
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'exists': {
'field': 'population'
}
},
'functions': [{
'field_value_factor': {
'modifier': 'sqrt',
'field': 'popularity'
'modifier': 'log1p',
'field': 'population'
},
'weight': 1
'weight': 2
}]
}
}]

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

@ -30,42 +30,59 @@ module.exports = {
{
'function_score': {
'query': {
'filtered': {
'filter': {
'exists': {
'field': 'popularity'
}
'match': {
'phrase.default': {
'query': '123 main st',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
},
'max_boost': 2,
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'or': [
{
'type': {
'value': 'admin0'
'exists': {
'field': 'popularity'
}
},
{
'type': {
'value': 'admin1'
}
'functions': [{
'field_value_factor': {
'modifier': 'log1p',
'field': 'popularity'
},
{
'type': {
'value': 'admin2'
'weight': 1
}]
}
},{
'function_score': {
'query': {
'match': {
'phrase.default': {
'query': '123 main st',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
},
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'exists': {
'field': 'population'
}
]
},
'functions': [{
'field_value_factor': {
'modifier': 'sqrt',
'field': 'popularity'
'modifier': 'log1p',
'field': 'population'
},
'weight': 1
'weight': 2
}]
}
},{

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

@ -23,46 +23,62 @@ module.exports = {
'slop': 2
}
}
},
{
},{
'function_score': {
'query': {
'filtered': {
'filter': {
'exists': {
'field': 'popularity'
}
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
},
'max_boost': 2,
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'or': [
{
'type': {
'value': 'admin0'
'exists': {
'field': 'popularity'
}
},
{
'type': {
'value': 'admin1'
}
'functions': [{
'field_value_factor': {
'modifier': 'log1p',
'field': 'popularity'
},
{
'type': {
'value': 'admin2'
'weight': 1
}]
}
},{
'function_score': {
'query': {
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
]
},
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'exists': {
'field': 'population'
}
},
'functions': [{
'field_value_factor': {
'modifier': 'sqrt',
'field': 'popularity'
'modifier': 'log1p',
'field': 'population'
},
'weight': 1
'weight': 2
}]
}
}]

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

@ -47,51 +47,68 @@ module.exports = {
'scale': '50km',
'decay': 0.5
}
}
},
'weight': 2
}],
'score_mode': 'avg',
'boost_mode': 'replace'
}
},
{
},{
'function_score': {
'query': {
'filtered': {
'filter': {
'exists': {
'field': 'popularity'
}
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
},
'max_boost': 2,
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'or': [
{
'type': {
'value': 'admin0'
'exists': {
'field': 'popularity'
}
},
{
'type': {
'value': 'admin1'
}
'functions': [{
'field_value_factor': {
'modifier': 'log1p',
'field': 'popularity'
},
{
'type': {
'value': 'admin2'
'weight': 1
}]
}
},{
'function_score': {
'query': {
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
]
},
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'exists': {
'field': 'population'
}
},
'functions': [{
'field_value_factor': {
'modifier': 'sqrt',
'field': 'popularity'
'modifier': 'log1p',
'field': 'population'
},
'weight': 1
'weight': 2
}]
}
}]

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

@ -47,51 +47,68 @@ module.exports = {
'scale': '50km',
'decay': 0.5
}
}
},
'weight': 2
}],
'score_mode': 'avg',
'boost_mode': 'replace'
}
},
{
},{
'function_score': {
'query': {
'filtered': {
'filter': {
'exists': {
'field': 'popularity'
}
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
},
'max_boost': 2,
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'or': [
{
'type': {
'value': 'admin0'
'exists': {
'field': 'popularity'
}
},
{
'type': {
'value': 'admin1'
}
'functions': [{
'field_value_factor': {
'modifier': 'log1p',
'field': 'popularity'
},
{
'type': {
'value': 'admin2'
'weight': 1
}]
}
},{
'function_score': {
'query': {
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
]
},
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'exists': {
'field': 'population'
}
},
'functions': [{
'field_value_factor': {
'modifier': 'sqrt',
'field': 'popularity'
'modifier': 'log1p',
'field': 'population'
},
'weight': 1
'weight': 2
}]
}
}]

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

@ -47,51 +47,68 @@ module.exports = {
'scale': '50km',
'decay': 0.5
}
}
},
'weight': 2
}],
'score_mode': 'avg',
'boost_mode': 'replace'
}
},
{
},{
'function_score': {
'query': {
'filtered': {
'filter': {
'exists': {
'field': 'popularity'
}
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
},
'max_boost': 2,
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'or': [
{
'type': {
'value': 'admin0'
'exists': {
'field': 'popularity'
}
},
{
'type': {
'value': 'admin1'
}
'functions': [{
'field_value_factor': {
'modifier': 'log1p',
'field': 'popularity'
},
{
'type': {
'value': 'admin2'
'weight': 1
}]
}
},{
'function_score': {
'query': {
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
]
},
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'exists': {
'field': 'population'
}
},
'functions': [{
'field_value_factor': {
'modifier': 'sqrt',
'field': 'popularity'
'modifier': 'log1p',
'field': 'population'
},
'weight': 1
'weight': 2
}]
}
}]

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

@ -23,46 +23,62 @@ module.exports = {
'slop': 2
}
}
},
{
},{
'function_score': {
'query': {
'filtered': {
'filter': {
'exists': {
'field': 'popularity'
}
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
},
'max_boost': 2,
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'or': [
{
'type': {
'value': 'admin0'
'exists': {
'field': 'popularity'
}
},
{
'type': {
'value': 'admin1'
}
'functions': [{
'field_value_factor': {
'modifier': 'log1p',
'field': 'popularity'
},
{
'type': {
'value': 'admin2'
'weight': 1
}]
}
},{
'function_score': {
'query': {
'match': {
'phrase.default': {
'query': 'test',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
]
},
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'exists': {
'field': 'population'
}
},
'functions': [{
'field_value_factor': {
'modifier': 'sqrt',
'field': 'popularity'
'modifier': 'log1p',
'field': 'population'
},
'weight': 1
'weight': 2
}]
}
}]

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

@ -26,46 +26,62 @@ module.exports = {
'boost': 1
}
}
},
{
},{
'function_score': {
'query': {
'filtered': {
'filter': {
'exists': {
'field': 'popularity'
}
'match': {
'phrase.default': {
'query': 'soho grand',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
},
'max_boost': 2,
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'or': [
{
'type': {
'value': 'admin0'
'exists': {
'field': 'popularity'
}
},
{
'type': {
'value': 'admin1'
}
'functions': [{
'field_value_factor': {
'modifier': 'log1p',
'field': 'popularity'
},
{
'type': {
'value': 'admin2'
'weight': 1
}]
}
},{
'function_score': {
'query': {
'match': {
'phrase.default': {
'query': 'soho grand',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
},
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'exists': {
'field': 'population'
}
]
},
'functions': [{
'field_value_factor': {
'modifier': 'sqrt',
'field': 'popularity'
'modifier': 'log1p',
'field': 'population'
},
'weight': 1
'weight': 2
}]
}
},{

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

@ -26,46 +26,62 @@ module.exports = {
'boost': 1
}
}
},
{
},{
'function_score': {
'query': {
'filtered': {
'filter': {
'exists': {
'field': 'popularity'
}
'match': {
'phrase.default': {
'query': '1 water st',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
},
'max_boost': 2,
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'or': [
{
'type': {
'value': 'admin0'
'exists': {
'field': 'popularity'
}
},
{
'type': {
'value': 'admin1'
}
'functions': [{
'field_value_factor': {
'modifier': 'log1p',
'field': 'popularity'
},
{
'type': {
'value': 'admin2'
'weight': 1
}]
}
},{
'function_score': {
'query': {
'match': {
'phrase.default': {
'query': '1 water st',
'analyzer': 'peliasPhrase',
'type': 'phrase',
'slop': 2,
'boost': 1
}
}
},
'max_boost': 20,
'score_mode': 'first',
'boost_mode': 'replace',
'filter': {
'exists': {
'field': 'population'
}
]
},
'functions': [{
'field_value_factor': {
'modifier': 'sqrt',
'field': 'popularity'
'modifier': 'log1p',
'field': 'population'
},
'weight': 1
'weight': 2
}]
}
},{

Write Preview
Loading…
Cancel
Save