From c3fd896325f6934c3c7ccb5919e0aa711ca5c5d3 Mon Sep 17 00:00:00 2001
From: Stephen Hess <stephen.k.hess@gmail.com>
Date: Tue, 7 Mar 2017 11:51:23 -0500
Subject: [PATCH] added helper vars for clarity

---
 routes/v1.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/routes/v1.js b/routes/v1.js
index 46f44893..545506d6 100644
--- a/routes/v1.js
+++ b/routes/v1.js
@@ -80,6 +80,21 @@ function addRoutes(app, peliasConfig) {
   const isPipServiceEnabled = require('../controller/predicates/is_pip_service_enabled')(peliasConfig.api.pipService);
   const pipService = require('../service/pointinpolygon')(peliasConfig.api.pipService);
 
+  const coarse_reverse_should_execute = all(
+    not(hasErrors), isPipServiceEnabled, isCoarseReverse
+  );
+
+  // execute under the following conditions:
+  // - there are no errors or data
+  // - request is not coarse OR pip service is disabled
+  const original_reverse_should_execute = all(
+    not(hasDataOrErrors),
+    any(
+      not(isCoarseReverse),
+      not(isPipServiceEnabled)
+    )
+  );
+
   var base = '/v1/';
 
   /** ------------------------- routers ------------------------- **/
@@ -151,23 +166,8 @@ function addRoutes(app, peliasConfig) {
     reverse: createRouter([
       sanitizers.reverse.middleware,
       middleware.calcSize(),
-      controllers.coarse_reverse(pipService,
-        all(
-          not(hasErrors), isPipServiceEnabled, isCoarseReverse
-        )
-      ),
-      controllers.search(peliasConfig.api, esclient, queries.reverse,
-        // execute under the following conditions:
-        // - there are no errors or data
-        // - request is not coarse OR pip service is disabled
-        all(
-          not(hasDataOrErrors),
-          any(
-            not(isCoarseReverse),
-            not(isPipServiceEnabled)
-          )
-        )
-      ),
+      controllers.coarse_reverse(pipService, coarse_reverse_should_execute),
+      controllers.search(peliasConfig.api, esclient, queries.reverse, original_reverse_should_execute),
       postProc.distances('point.'),
       // reverse confidence scoring depends on distance from origin
       //  so it must be calculated first