Extract to function

2017-05-31 12:52:41 -04:00
parent 4e53803b3b
commit ef3cad6599
1 changed files with 14 additions and 10 deletions
@@ -81,16 +81,7 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param
                overviewsQueryRewriter, queryRewriteData, { bbox: params.bbox }
            );

-            var overrideParams = _.reduce(_.pick(params, 'start', 'end', 'bins'),
-                function castNumbers(overrides, val, k) {
-                    if (!Number.isFinite(+val)) {
-                        throw new Error('Invalid number format for parameter \'' + k + '\'');
-                    }
-                    overrides[k] = +val;
-                    return overrides;
-                },
-                {ownFilter: ownFilter}
-            );
+            var overrideParams = getOverrideParams(params, ownFilter);

            var dataview = dataviewFactory.getDataview(query, dataviewDefinition);
            dataview.getResult(pg, overrideParams, this);
@@ -101,6 +92,19 @@ DataviewBackend.prototype.getDataview = function (mapConfigProvider, user, param
    );
 };

+function getOverrideParams(params, ownFilter) {
+    return _.reduce(_.pick(params, 'start', 'end', 'bins'),
+        function castNumbers(overrides, val, k) {
+            if (!Number.isFinite(+val)) {
+                throw new Error('Invalid number format for parameter \'' + k + '\'');
+            }
+            overrides[k] = +val;
+            return overrides;
+        },
+        {ownFilter: ownFilter}
+    );
+}
+
 DataviewBackend.prototype.search = function (mapConfigProvider, user, params, callback) {
    var dataviewName = params.dataviewName;