Merge pull request #18 from Turistforeningen/feat/max-min-near

Add support for max & min $near queries

README.md

@@ -52,6 +52,8 @@ useful when building an API and accepting various user specificed queries.
 |-----------|---------------|--------------|
 | bbox | `?bbox=0,1,2,3` | `{ geojson: { $geoWithin: { $geometry: { … } } } }` |
 | near | `?near=0,1` | `{ geojson: { $near: { $geometry: { … } } } }` |
+| near (max distance) | `?near=0,1,2` | `{ geojson: { $near: { …, $maxDistance: 2 } } }` |
+| near (max & min distance) | `?near=0,1,2,3` | `{ geojson: { $near: { …, $minDistance: 3 } } }` |
 
 * Custom query functions
   * `after` (date)

examples/test.js

@@ -58,6 +58,27 @@ describe('Example App', function() {
       .end(done);
   });
 
+  it('returns places near point with max distance', function(done) {
+    app.get(url + '?near=6.13037,61.00607,7000')
+      .expect(200)
+      .expect(function(res) {
+        assert.equal(res.body.length, 2);
+        assert.equal(res.body[0].name, 'Solrenningen');
+        assert.equal(res.body[1].name, 'Åsedalen');
+      })
+      .end(done);
+  });
+
+  it('returns places near point with max and min distance', function(done) {
+    app.get(url + '?near=6.13037,61.00607,7000,1000')
+      .expect(200)
+      .expect(function(res) {
+        assert.equal(res.body.length, 1);
+        assert.equal(res.body[0].name, 'Åsedalen');
+      })
+      .end(done);
+  });
+
   it('returns places inside bbox', function(done) {
     var bbox = [
       '5.5419158935546875',

index.js

@@ -69,11 +69,14 @@ module.exports.prototype.customNear = function(field) {
   return function(query, point) {
     point = point.split(',');
 
-    if (point.length === 2) {
+    if (point.length >= 2) {
       point[0] = parseFloat(point[0], 10);
       point[1] = parseFloat(point[1], 10);
 
       if (!isNaN(point.reduce(function(a,b){return a+b;}))) {
+        var max = parseInt(point[2], 10);
+        var min = parseInt(point[3], 10);
+
         query[field] = {
           $near: {
             $geometry: {
@@ -82,6 +85,14 @@ module.exports.prototype.customNear = function(field) {
             },
           },
         };
+
+        if (!isNaN(max)) {
+          query[field].$near.$maxDistance = parseInt(point[2], 10);
+
+          if (!isNaN(min)) {
+            query[field].$near.$minDistance = parseInt(point[3], 10);
+          }
+        }
       }
     }
   };