From 3c0430865a868382453ac3b70c9a5e09f11cc9fe Mon Sep 17 00:00:00 2001
From: Mike Wooldridge <mike@hellion.org>
Date: Mon, 30 Jan 2017 15:48:07 -0800
Subject: [PATCH 1/3] fix(#250): add @borrows JSDoc references to
 values-builder.js

For geospatial() and geospatialRegion()
---
 lib/values-builder.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/values-builder.js b/lib/values-builder.js
index cb0c9d78..fd7e9bfe 100644
--- a/lib/values-builder.js
+++ b/lib/values-builder.js
@@ -44,7 +44,7 @@ var qb     = require('./query-builder.js').builder;
  * clause of the values query before calling the
  * {@link valuesBuilder.BuiltQuery#where},
  * {@link valuesBuilder.BuiltQuery#aggregates},
- * {@link valuesBuilder.BuiltQuery#slice}, or 
+ * {@link valuesBuilder.BuiltQuery#slice}, or
  * {@link valuesBuilder.BuiltQuery#withOptions}
  * functions to specify the optional clauses of the built query.
  * @namespace valuesBuilder
@@ -69,6 +69,8 @@ var qb     = require('./query-builder.js').builder;
  * @borrows queryBuilder#geoProperty        as valuesBuilder#geoProperty
  * @borrows queryBuilder#geoPropertyPair    as valuesBuilder#geoPropertyPair
  * @borrows queryBuilder#geoOption          as valuesBuilder#geoOption
+ * @borrows queryBuilder#geospatial         as valuesBuilder#geospatial
+ * @borrows queryBuilder#geospatialRegion   as valuesBuilder#geospatialRegion
  * @borrows queryBuilder#heatmap            as valuesBuilder#heatmap
  * @borrows queryBuilder#latlon             as valuesBuilder#latlon
  * @borrows queryBuilder#locksFragment      as valuesBuilder#locksFragment
@@ -180,7 +182,7 @@ ValueBuilder.prototype.fromIndexes = valuesFromIndexes;
  * returned by the values query builder functions.
  * @returns {valuesBuilder.BuiltQuery} a built query
  */
-ValueBuilder.prototype.where = function valuesWhere() {  
+ValueBuilder.prototype.where = function valuesWhere() {
   var self = this;
 
   var args = mlutil.asArray.apply(null, arguments);
@@ -214,7 +216,7 @@ ValueBuilder.prototype.where = function valuesWhere() {
       if (queries === null) {
         queries = [arg];
       } else {
-        queries.push(arg);        
+        queries.push(arg);
       }
     }
 
@@ -249,7 +251,7 @@ ValueBuilder.prototype.where = function valuesWhere() {
  * a user-defined aggregate function.
  * @returns {valuesBuilder.BuiltQuery} a built query
  */
-ValueBuilder.prototype.aggregates = function valuesAggregates() {  
+ValueBuilder.prototype.aggregates = function valuesAggregates() {
   var self = this;
 
   var args = mlutil.asArray.apply(null, arguments);
@@ -313,7 +315,7 @@ function udf() {
  * function.
  * @returns {valuesBuilder.BuiltQuery} a built query
  */
-ValueBuilder.prototype.slice = function valuesSlice() {  
+ValueBuilder.prototype.slice = function valuesSlice() {
   var self = this;
 
   var args = mlutil.asArray.apply(null, arguments);
@@ -336,7 +338,7 @@ ValueBuilder.prototype.slice = function valuesSlice() {
  * @param {...string} [values] - options modifying the default behaviour of the query
  * @returns {valuesBuilder.BuiltQuery} a built query
  */
-ValueBuilder.prototype.withOptions = function valuesWithOptions() {  
+ValueBuilder.prototype.withOptions = function valuesWithOptions() {
   var self = this;
 
   // TODO: share with values.js

From c043ea45097695ebd4a45d7c69ef1654ddf7727c Mon Sep 17 00:00:00 2001
From: Mike Wooldridge <mike@hellion.org>
Date: Mon, 30 Jan 2017 16:06:34 -0800
Subject: [PATCH 2/3] Export the new geospatialRegion() method in
 values-builder.js

Method comes via query-builder.js
---
 lib/values-builder.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/values-builder.js b/lib/values-builder.js
index fd7e9bfe..56d63eba 100644
--- a/lib/values-builder.js
+++ b/lib/values-builder.js
@@ -441,6 +441,7 @@ module.exports = {
     geoPropertyPair:    qb.geoPropertyPair,
     geoOption:          qb.geoOption,
     geospatial:         qb.geospatial,
+    geospatialRegion:   qb.geospatialRegion,
     heatmap:            qb.heatmap,
     jsontype:           qb.jsontype,
     latlon:             qb.latlon,

From 7feb5ca4b9ee518e53fdf6117feced72e10463ae Mon Sep 17 00:00:00 2001
From: Mike Wooldridge <mike@hellion.org>
Date: Tue, 31 Jan 2017 13:24:34 -0800
Subject: [PATCH 3/3] Revert geospatialRegion() updates

Values query over region index is not currently supported.
---
 lib/values-builder.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/values-builder.js b/lib/values-builder.js
index 56d63eba..124ad3d3 100644
--- a/lib/values-builder.js
+++ b/lib/values-builder.js
@@ -70,7 +70,6 @@ var qb     = require('./query-builder.js').builder;
  * @borrows queryBuilder#geoPropertyPair    as valuesBuilder#geoPropertyPair
  * @borrows queryBuilder#geoOption          as valuesBuilder#geoOption
  * @borrows queryBuilder#geospatial         as valuesBuilder#geospatial
- * @borrows queryBuilder#geospatialRegion   as valuesBuilder#geospatialRegion
  * @borrows queryBuilder#heatmap            as valuesBuilder#heatmap
  * @borrows queryBuilder#latlon             as valuesBuilder#latlon
  * @borrows queryBuilder#locksFragment      as valuesBuilder#locksFragment
@@ -441,7 +440,6 @@ module.exports = {
     geoPropertyPair:    qb.geoPropertyPair,
     geoOption:          qb.geoOption,
     geospatial:         qb.geospatial,
-    geospatialRegion:   qb.geospatialRegion,
     heatmap:            qb.heatmap,
     jsontype:           qb.jsontype,
     latlon:             qb.latlon,