Browse Source

Merge pull request #863 from pelias/log-coarse-reverse

Add coarse reverse logging so we can tell how often it's getting called
pull/864/head
Diana Shkolnikov 8 years ago committed by GitHub
parent
commit
cde2d12341
  1. 3
      controller/coarse_reverse.js
  2. 20
      query/search.js

3
controller/coarse_reverse.js

@ -92,6 +92,7 @@ function setup(service, should_execute) {
service(centroid, isDNT(req), (err, results) => {
// if there's an error, log it and bail
if (err) {
logger.info(`[controller:coarse_reverse][error]`);
logger.error(err);
return next();
}
@ -101,6 +102,8 @@ function setup(service, should_execute) {
return req.clean.layers.indexOf(granularity) !== -1;
});
logger.info(`[controller:coarse_reverse][queryType:pip][result_count:${Object.keys(results).length}]`);
// now remove everything from the response that is more granular than the
// most granular layer requested. that is, if req.clean.layers=['county'],
// remove neighbourhoods, localities, and localadmins

20
query/search.js

@ -144,6 +144,9 @@ function generateQuery( clean ){
}
function getQuery(vs) {
logger.info(`[query:search] [search_input_type:${determineQueryType(vs)}]`);
if (hasStreet(vs) ||
isCityStateOnlyWithOptionalCountry(vs) ||
isCityCountryOnly(vs) ||
@ -160,6 +163,23 @@ function getQuery(vs) {
}
function determineQueryType(vs) {
if (vs.isset('input:housenumber') && vs.isset('input:street')) {
return 'address';
}
else if (vs.isset('input:street')) {
return 'street';
}
else if (vs.isset('input:query')) {
return 'venue';
}
else if (['neighbourhood', 'borough', 'postcode', 'county', 'region','country'].some(
(layer)=> { return vs.isset(`input:${layer}`);})) {
return 'admin';
}
return 'other';
}
function hasStreet(vs) {
return vs.isset('input:street');
}

Loading…
Cancel
Save