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

Merge pull request #668 from pelias/add-street-to-trim-by-granularity 

Add street to trim by granularity
pull/625/head
Stephen K Hess 8 years ago committed by GitHub
parent
768843b0fb 80e9fc06e4
commit
ba9fc0abeb
3 changed files with 133 additions and 1 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. 1
      middleware/trimByGranularity.js
  2. 96
      test/unit/fixture/search_fallback.js
  3. 37
      test/unit/middleware/trimByGranularity.js

1
middleware/trimByGranularity.js
Unescape View File

@ -16,6 +16,7 @@ var _ = require('lodash');
var layers = [ var layers = [
'venue', 'venue',
'address', 'address',
'street',
'neighbourhood', 'neighbourhood',
'borough', 'borough',
'locality', 'locality',

96
test/unit/fixture/search_fallback.js
Unescape View File

@ -109,10 +109,97 @@ module.exports = {
'address_parts.street': 'street value' 'address_parts.street': 'street value'
} }
}, },
{
'multi_match': {
'query': 'neighbourhood value',
'type': 'phrase',
'fields': [
'parent.neighbourhood',
'parent.neighbourhood_a'
]
}
},
{
'multi_match': {
'query': 'borough value',
'type': 'phrase',
'fields': [
'parent.borough',
'parent.borough_a'
]
}
},
{
'multi_match': {
'query': 'city value',
'type': 'phrase',
'fields': [
'parent.locality',
'parent.locality_a',
'parent.localadmin',
'parent.localadmin_a'
]
}
},
{
'multi_match': {
'query': 'county value',
'type': 'phrase',
'fields': [
'parent.county',
'parent.county_a',
'parent.macrocounty',
'parent.macrocounty_a'
]
}
},
{
'multi_match': {
'query': 'state value',
'type': 'phrase',
'fields': [
'parent.region',
'parent.region_a',
'parent.macroregion',
'parent.macroregion_a'
]
}
},
{
'multi_match': {
'query': 'country value',
'type': 'phrase',
'fields': [
'parent.country',
'parent.country_a',
'parent.dependency',
'parent.dependency_a'
]
}
}
],
'should': [
{ {
'match_phrase': { 'match_phrase': {
'address_parts.zip': 'postalcode value' 'address_parts.zip': 'postalcode value'
} }
}
],
'filter': {
'term': {
'layer': 'address'
}
}
}
},
{
'bool': {
'_name': 'fallback.street',
'must': [
{
'match_phrase': {
'address_parts.street': 'street value'
}
}, },
{ {
'multi_match': { 'multi_match': {
@ -183,9 +270,16 @@ module.exports = {
} }
} }
], ],
'should': [
{
'match_phrase': {
'address_parts.zip': 'postalcode value'
}
}
],
'filter': { 'filter': {
'term': { 'term': {
'layer': 'address' 'layer': 'street'
} }
} }
} }

37
test/unit/middleware/trimByGranularity.js
Unescape View File

@ -20,6 +20,7 @@ module.exports.tests.trimByGranularity = function(test, common) {
{ name: 'venue 1', _matched_queries: ['fallback.venue'] }, { name: 'venue 1', _matched_queries: ['fallback.venue'] },
{ name: 'venue 2', _matched_queries: ['fallback.venue'] }, { name: 'venue 2', _matched_queries: ['fallback.venue'] },
{ name: 'address 1', _matched_queries: ['fallback.address'] }, { name: 'address 1', _matched_queries: ['fallback.address'] },
{ name: 'street 1', _matched_queries: ['fallback.street'] },
{ name: 'neighbourhood 1', _matched_queries: ['fallback.neighbourhood'] }, { name: 'neighbourhood 1', _matched_queries: ['fallback.neighbourhood'] },
{ name: 'locality 1', _matched_queries: ['fallback.locality'] }, { name: 'locality 1', _matched_queries: ['fallback.locality'] },
{ name: 'localadmin 1', _matched_queries: ['fallback.localadmin'] }, { name: 'localadmin 1', _matched_queries: ['fallback.localadmin'] },
@ -55,6 +56,7 @@ module.exports.tests.trimByGranularity = function(test, common) {
data: [ data: [
{ name: 'address 1', _matched_queries: ['fallback.address'] }, { name: 'address 1', _matched_queries: ['fallback.address'] },
{ name: 'address 2', _matched_queries: ['fallback.address'] }, { name: 'address 2', _matched_queries: ['fallback.address'] },
{ name: 'street 1', _matched_queries: ['fallback.street'] },
{ name: 'neighbourhood 1', _matched_queries: ['fallback.neighbourhood'] }, { name: 'neighbourhood 1', _matched_queries: ['fallback.neighbourhood'] },
{ name: 'locality 1', _matched_queries: ['fallback.locality'] }, { name: 'locality 1', _matched_queries: ['fallback.locality'] },
{ name: 'localadmin 1', _matched_queries: ['fallback.localadmin'] }, { name: 'localadmin 1', _matched_queries: ['fallback.localadmin'] },
@ -83,6 +85,41 @@ module.exports.tests.trimByGranularity = function(test, common) {
testIt(); testIt();
}); });
test('all records with fallback.* matched_queries name should retain only streets when they are most granular', function(t) {
var req = { clean: {} };
var res = {
data: [
{ name: 'street 1', _matched_queries: ['fallback.street'] },
{ name: 'street 2', _matched_queries: ['fallback.street'] },
{ name: 'neighbourhood 1', _matched_queries: ['fallback.neighbourhood'] },
{ name: 'locality 1', _matched_queries: ['fallback.locality'] },
{ name: 'localadmin 1', _matched_queries: ['fallback.localadmin'] },
{ name: 'county 1', _matched_queries: ['fallback.county'] },
{ name: 'macrocounty 1', _matched_queries: ['fallback.macrocounty'] },
{ name: 'region 1', _matched_queries: ['fallback.region'] },
{ name: 'macroregion 1', _matched_queries: ['fallback.macroregion'] },
{ name: 'dependency 1', _matched_queries: ['fallback.dependency'] },
{ name: 'country 1', _matched_queries: ['fallback.country'] },
{ name: 'unknown', _matched_queries: ['fallback.unknown'] }
]
};
var expected_data = [
{ name: 'street 1', _matched_queries: ['fallback.street'] },
{ name: 'street 2', _matched_queries: ['fallback.street'] },
];
function testIt() {
trimByGranularity(req, res, function() {
t.deepEquals(res.data, expected_data, 'only street records should be here');
t.end();
});
}
testIt();
});
test('all records with fallback.* matched_queries name should retain only neighbourhoods when they are most granular', function(t) { test('all records with fallback.* matched_queries name should retain only neighbourhoods when they are most granular', function(t) {
var req = { clean: {} }; var req = { clean: {} };

Write Preview
Loading…
Cancel
Save