Merge branch 'master' into staging

query/autocomplete.js

@@ -47,6 +47,7 @@ query.score( peliasQuery.view.population( views.pop_subquery ) );
 
 // non-scoring hard filters
 query.filter( peliasQuery.view.sources );
+query.filter( peliasQuery.view.layers );
 
 // --------------------------------
 
@@ -63,6 +64,11 @@ function generateQuery( clean ){
     vs.var( 'sources', clean.sources );
   }
 
+  // layers
+  if( check.array(clean.layers) && clean.layers.length ){
+    vs.var( 'layers', clean.layers);
+  }
+
   // pass the input tokens to the views so they can choose which tokens
   // are relevant for their specific function.
   if( check.array( clean.tokens ) ){

query/reverse.js

@@ -16,6 +16,7 @@ query.sort( peliasQuery.view.sort_distance );
 // non-scoring hard filters
 query.filter( peliasQuery.view.boundary_circle );
 query.filter( peliasQuery.view.sources );
+query.filter( peliasQuery.view.layers );
 
 // --------------------------------
 
@@ -31,6 +32,9 @@ function generateQuery( clean ){
   // sources
   vs.var( 'sources', clean.sources);
 
+  // layers
+  vs.var( 'layers', clean.layers);
+
   // focus point to score by distance
   if( check.number(clean['point.lat']) &&
       check.number(clean['point.lon']) ){

test/unit/fixture/autocomplete_with_layer_filtering.js

@@ -0,0 +1,66 @@
+
+module.exports = {
+  'query': {
+    'bool': {
+      'must': [{
+        'constant_score': {
+          'query': {
+            'match': {
+              'name.default': {
+                'analyzer': 'peliasQueryPartialToken',
+                'boost': 100,
+                'query': 'test',
+                'type': 'phrase',
+                'operator': 'and',
+                'slop': 3
+              }
+            }
+          }
+        }
+      }],
+      'should':[{
+        'function_score': {
+          'query': {
+            'match_all': {}
+          },
+          'max_boost': 20,
+          'score_mode': 'first',
+          'boost_mode': 'replace',
+          'functions': [{
+            'field_value_factor': {
+              'modifier': 'log1p',
+              'field': 'popularity',
+              'missing': 1
+            },
+            'weight': 1
+          }]
+        }
+      },{
+        'function_score': {
+          'query': {
+            'match_all': {}
+          },
+          'max_boost': 20,
+          'score_mode': 'first',
+          'boost_mode': 'replace',
+          'functions': [{
+            'field_value_factor': {
+              'modifier': 'log1p',
+              'field': 'population',
+              'missing': 1
+            },
+            'weight': 3
+          }]
+        }
+      }],
+      'filter': [{
+        'terms': {
+          'layer': ['country']
+        }
+      }]
+    }
+  },
+  'sort': [ '_score' ],
+  'size': 20,
+  'track_scores': true
+};

test/unit/fixture/reverse_with_layer_filtering.js

@@ -0,0 +1,41 @@
+var vs = require('../../../query/reverse_defaults');
+
+module.exports = {
+  'query': {
+    'bool': {
+      'filter': [
+        {
+          'geo_distance': {
+            'distance': '500km',
+            'distance_type': 'plane',
+            'optimize_bbox': 'indexed',
+            'center_point': {
+              'lat': 29.49136,
+              'lon': -82.50622
+            }
+          }
+        },
+        {
+          'terms': {
+            'layer': ['country']
+          }
+        }
+      ]
+    }
+  },
+  'sort': [
+    '_score',
+    {
+      '_geo_distance': {
+        'center_point': {
+          'lat': 29.49136,
+          'lon': -82.50622
+        },
+        'order': 'asc',
+        'distance_type': 'plane'
+      }
+    }
+  ],
+  'size': vs.size,
+  'track_scores': true
+};

test/unit/query/autocomplete.js

@@ -129,6 +129,22 @@ module.exports.tests.query = function(test, common) {
     t.end();
   });
 
+  test('valid layers filter', function(t) {
+    var query = generate({
+      'text': 'test',
+      'layers': ['country'],
+      tokens: ['test'],
+      tokens_complete: [],
+      tokens_incomplete: ['test']
+    });
+
+    var compiled = JSON.parse( JSON.stringify( query ) );
+    var expected = require('../fixture/autocomplete_with_layer_filtering');
+
+    t.deepEqual(compiled, expected, 'valid autocomplete query with layer filtering');
+    t.end();
+  });
+
   test('single character street address', function(t) {
     var query = generate({
       text: 'k road, laird',

test/unit/query/reverse.js

@@ -125,6 +125,23 @@ module.exports.tests.query = function(test, common) {
     t.deepEqual(compiled, expected, 'valid reverse query with source filtering');
     t.end();
   });
+
+  test('valid layers filter', function(t) {
+    var query = generate({
+      'point.lat': 29.49136,
+      'point.lon': -82.50622,
+      'boundary.circle.lat': 29.49136,
+      'boundary.circle.lon': -82.50622,
+      'boundary.circle.radius': 500,
+      'layers': ['country']
+    });
+
+    var compiled = JSON.parse( JSON.stringify( query ) );
+    var expected = require('../fixture/reverse_with_layer_filtering');
+
+    t.deepEqual(compiled, expected, 'valid reverse query with source filtering');
+    t.end();
+  });
 };
 
 module.exports.all = function (tape, common) {