pelias-query
Advanced tools
Comparing version 8.11.0 to 8.12.0
@@ -171,3 +171,4 @@ // This query is used for component geocodes, where the individual fields have | ||
[ | ||
'phrase.default' | ||
'phrase.default', | ||
'category' | ||
], | ||
@@ -447,6 +448,9 @@ false | ||
if (vs.isset('input:housenumber') && vs.isset('input:street')) { | ||
funcScoreShould.push(addHouseNumberAndStreet(vs)); | ||
if (vs.isset('input:query')) { | ||
funcScoreShould.push(addQuery(vs)); | ||
} | ||
if (vs.isset('input:street')) { | ||
if (vs.isset('input:housenumber')) { | ||
funcScoreShould.push(addHouseNumberAndStreet(vs)); | ||
} | ||
funcScoreShould.push(addStreet(vs)); | ||
@@ -453,0 +457,0 @@ } |
{ | ||
"name": "pelias-query", | ||
"version": "8.11.0", | ||
"version": "8.12.0", | ||
"description": "An Elasticsearch query builder for Pelias", | ||
@@ -5,0 +5,0 @@ "engines": { |
@@ -64,2 +64,28 @@ var StructuredFallbackQuery = require('../../layout/StructuredFallbackQuery'); | ||
test('VariableStore with query and address fields should add query w/o address first', function(t) { | ||
var query = new StructuredFallbackQuery(); | ||
var vs = new VariableStore(); | ||
vs.var('size', 'size value'); | ||
vs.var('track_scores', 'track_scores value'); | ||
vs.var('input:query', 'query value'); | ||
vs.var('input:housenumber', 'house number value'); | ||
vs.var('input:street', 'street value'); | ||
vs.var('input:neighbourhood', 'neighbourhood value'); | ||
vs.var('input:borough', 'borough value'); | ||
vs.var('input:locality', 'locality value'); | ||
vs.var('input:county', 'county value'); | ||
vs.var('input:region', 'region value'); | ||
vs.var('input:country', 'country value'); | ||
vs.var('boost:address', 19); | ||
vs.var('boost:street', 17); | ||
var actual = query.render(vs); | ||
var expected = require('../fixtures/structuredFallbackQuery/query.json'); | ||
t.deepEquals(actual, expected); | ||
t.end(); | ||
}); | ||
test('input:postcode set should include it at the address layer query', function(t) { | ||
@@ -66,0 +92,0 @@ var query = new StructuredFallbackQuery(); |
286334
78
7972