Browse Source

Merge pull request #908 from pelias/camel-convention

updated variable names for camel-case convention
pull/910/head
Stephen K Hess 8 years ago committed by GitHub
parent
commit
71f8c8ecb4
  1. 8
      routes/v1.js

8
routes/v1.js

@ -98,7 +98,7 @@ function addRoutes(app, peliasConfig) {
const isPlaceholderServiceEnabled = _.constant(placeholderConfiguration.isEnabled()); const isPlaceholderServiceEnabled = _.constant(placeholderConfiguration.isEnabled());
// 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_should_execute = all( const coarseReverseShouldExecute = all(
isPipServiceEnabled, not(hasRequestErrors), not(hasResponseData) isPipServiceEnabled, not(hasRequestErrors), not(hasResponseData)
); );
@ -109,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 non_coarse_reverse_should_execute = all( const nonCoarseReverseShouldExecute = all(
not(hasResponseDataOrRequestErrors), not(hasResponseDataOrRequestErrors),
any( any(
not(isCoarseReverse), not(isCoarseReverse),
@ -197,8 +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.search(peliasConfig.api, esclient, queries.reverse, nonCoarseReverseShouldExecute),
controllers.coarse_reverse(pipService, coarse_reverse_should_execute), controllers.coarse_reverse(pipService, coarseReverseShouldExecute),
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