Remove focus_selected_layers query view

This query extends the standard focus query view with hardcoded layers for which the query applies. The intent was to apply the focus scoring only to non-admin areas, but the list of layers was already out of date, as it was missing streets. The query is fundamentally problematic with custom layers as well.
pelias · Jun 13, 2018 · cbb8249 · cbb8249
1 parent b16dbea
commit cbb8249
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 70 deletions.
diff --git a/query/autocomplete.js b/query/autocomplete.js
@@ -7,7 +7,6 @@ const logger = require('pelias-logger').get('api');
 // additional views (these may be merged in to pelias/query at a later date)
 var views = {
   ngrams_strict:              require('./view/ngrams_strict'),
-  focus_selected_layers:      require('./view/focus_selected_layers'),
   ngrams_last_token_only:     require('./view/ngrams_last_token_only'),
   phrase_first_tokens_only:   require('./view/phrase_first_tokens_only'),
   pop_subquery:               require('./view/pop_subquery'),
@@ -42,7 +41,7 @@ query.score( peliasQuery.view.admin('neighbourhood') );
 
 // scoring boost
 query.score( views.boost_exact_matches );
-query.score( views.focus_selected_layers( views.ngrams_strict ) );
+query.score( peliasQuery.view.focus( views.ngrams_strict ) );
 query.score( peliasQuery.view.popularity( views.pop_subquery ) );
 query.score( peliasQuery.view.population( views.pop_subquery ) );
 

diff --git a/query/view/focus_selected_layers.js b/query/view/focus_selected_layers.js
diff --git a/test/unit/fixture/autocomplete_linguistic_focus.js b/test/unit/fixture/autocomplete_linguistic_focus.js
@@ -46,21 +46,7 @@ module.exports = {
             'weight': 15
           }],
           'score_mode': 'avg',
-          'boost_mode': 'replace',
-          'filter': {
-            'or': [
-              {
-                'term': {
-                  'layer': 'venue'
-                }
-              },
-              {
-                'term': {
-                  'layer': 'address'
-                }
-              }
-            ]
-          }
+          'boost_mode': 'replace'
         }
       },{
         'function_score': {

diff --git a/test/unit/fixture/autocomplete_linguistic_focus_null_island.js b/test/unit/fixture/autocomplete_linguistic_focus_null_island.js
@@ -46,21 +46,7 @@ module.exports = {
             'weight': 15
           }],
           'score_mode': 'avg',
-          'boost_mode': 'replace',
-          'filter': {
-            'or': [
-              {
-                'term': {
-                  'layer': 'venue'
-                }
-              },
-              {
-                'term': {
-                  'layer': 'address'
-                }
-              }
-            ]
-          }
+          'boost_mode': 'replace'
         }
       },{
         'function_score': {