Browse Source

removed superseded initial coarse reverse call

pull/900/head
Stephen Hess 8 years ago
parent
commit
0f55ff2546
  1. 14
      routes/v1.js

14
routes/v1.js

@ -97,14 +97,9 @@ function addRoutes(app, peliasConfig) {
const placeholderService = serviceWrapper(placeholderConfiguration); const placeholderService = serviceWrapper(placeholderConfiguration);
const isPlaceholderServiceEnabled = _.constant(placeholderConfiguration.isEnabled()); const isPlaceholderServiceEnabled = _.constant(placeholderConfiguration.isEnabled());
// use coarse reverse when requested layers are all coarse
const coarse_reverse_should_execute = all(
isPipServiceEnabled, isCoarseReverse, not(hasRequestErrors)
);
// fallback to coarse reverse when regular reverse didn't return anything // fallback to coarse reverse when regular reverse didn't return anything
const coarse_reverse_fallback_should_execute = all( const coarse_reverse_should_execute = all(
isPipServiceEnabled, not(isCoarseReverse), not(hasRequestErrors), not(hasResponseData) isPipServiceEnabled, not(hasRequestErrors), not(hasResponseData)
); );
const placeholderShouldExecute = all( const placeholderShouldExecute = all(
@ -114,7 +109,7 @@ function addRoutes(app, peliasConfig) {
// execute under the following conditions: // execute under the following conditions:
// - there are no errors or data // - there are no errors or data
// - request is not coarse OR pip service is disabled // - request is not coarse OR pip service is disabled
const original_reverse_should_execute = all( const non_coarse_reverse_should_execute = all(
not(hasResponseDataOrRequestErrors), not(hasResponseDataOrRequestErrors),
any( any(
not(isCoarseReverse), not(isCoarseReverse),
@ -202,9 +197,8 @@ function addRoutes(app, peliasConfig) {
sanitizers.reverse.middleware, sanitizers.reverse.middleware,
middleware.requestLanguage, middleware.requestLanguage,
middleware.calcSize(), middleware.calcSize(),
controllers.search(peliasConfig.api, esclient, queries.reverse, non_coarse_reverse_should_execute),
controllers.coarse_reverse(pipService, coarse_reverse_should_execute), controllers.coarse_reverse(pipService, coarse_reverse_should_execute),
controllers.search(peliasConfig.api, esclient, queries.reverse, original_reverse_should_execute),
controllers.coarse_reverse(pipService, coarse_reverse_fallback_should_execute),
postProc.distances('point.'), postProc.distances('point.'),
// reverse confidence scoring depends on distance from origin // reverse confidence scoring depends on distance from origin
// so it must be calculated first // so it must be calculated first

Loading…
Cancel
Save