Add ability to query bounding box of features by id (#2)

* Add endpoint to get features by id(s)

* Add option to get feature bounding box

Author: c-w

controllers/features.js

@@ -18,18 +18,20 @@ exports.upsert = function(req, res) {
         });
     });
 };
+*/
 
 exports.getById = function(req, res) {
-    services.activities.get(req.params.userId, req.params.activityId, function(err, activity) {
+    let query = {
+        id: req.query.id.split(','),
+        include: req.query.include
+    };
+
+    services.features.getById(query, (err, features) => {
         if (err) return common.utils.handleError(res, err);
 
-        services.activities.toJsonApi(activity, function(err, activityJson) {
-            if (err) return common.utils.handleError(res, err);
-            res.send(activityJson);
-        });
+        res.send({ "features": features });
     });
 };
-*/
 
 exports.getByPoint = function(req, res) {
     let query = {

server.js

@@ -15,6 +15,7 @@ app.use(cors());
 app.use(morgan("combined", { "stream": log.stream }));
 app.use(bodyParser.json({ limit: '50mb' }));
 
+app.get('/features/id/:id',                         controllers.features.getById);
 app.get('/features/bbox/:north/:west/:south/:east', controllers.features.getByBoundingBox);
 app.get('/features/point/:latitude/:longitude',     controllers.features.getByPoint);
 app.get('/features/name/:name',                     controllers.features.getByName);

services/features.js

@@ -33,25 +33,52 @@ function executeQuery(query, callback) {
 }
 
 function getById(query, callback) {
-    let getQuery = `SELECT ${buildQueryColumns(query)} FROM features WHERE id = ${escapeSql(query.id)}`;
+    const ids = query.id.constructor === Array ? query.id : [query.id];
+    const getQuery = `SELECT ${buildQueryColumns(query)} FROM features WHERE id IN (${escapeSql(ids.join(','))})`;
     executeQuery(getQuery, (err, rows) => {
         if (err) return callback(err);
         if (!rows || rows.length === 0) return callback(null, null);
 
-        return callback(null, rows[0]);
+        return callback(null, rows);
     });
 }
 
+function parseBoundingBox(bbox_geo_json) {
+    const match = /^POLYGON\(\((.*)\)\)$/.exec(bbox_geo_json)
+    if (!match || match.length !== 2) {
+        return null;
+    }
+
+    const coords = match[1].split(',').map(point => point.split(' '));
+    if (coords.length !== 5 || coords.some(point => point.length !== 2)) {
+        return null;
+    }
+
+    const minX = parseFloat(coords[0][0]);
+    const minY = parseFloat(coords[0][1]);
+    const maxX = parseFloat(coords[2][0]);
+    const maxY = parseFloat(coords[2][1]);
+
+    return [
+        maxY, // north
+        minX, // west
+        minY, // south
+        maxX // east
+    ];
+}
+
 function rowToFeature(row, columns) {
     if (!row) return;
 
     row['createdAt'] = row['created_at'];
     row['updatedAt'] = row['updated_at'];
     if (row['hull_geo_json']) row['hull'] = JSON.parse(row['hull_geo_json']);
+    if (row['bbox_geo_json']) row['bbox'] = parseBoundingBox(row['bbox_geo_json']);
 
     delete row['created_at'];
     delete row['updated_at'];
     delete row['hull_geo_json'];
+    delete row['bbox_geo_json'];
 
     return row;
 }
@@ -74,6 +101,7 @@ function buildQueryColumns(query) {
     if (query.include) {
         let includeArray = query.include.split(',');
 
+        if (includeArray.indexOf('bbox') !== -1) queryColumns += ',ST_AsText(ST_Envelope(hull)) as bbox_geo_json';
         if (includeArray.indexOf('hull') !== -1) queryColumns += ',ST_AsGeoJSON(hull) as hull_geo_json';
         if (includeArray.indexOf('properties') !== -1) queryColumns += ',properties';
     }

services/featuresCosmosDb.js

@@ -113,12 +113,13 @@ function init(callback) {
 }
 
 function getById(query, callback) {
-    let getQuery = `SELECT ${buildQueryColumns(query)} FROM features WHERE id = ${escapeSql(query.id)}`;
+    const ids = query.id.constructor === Array ? query.id : [query.id];
+    const getQuery = `SELECT ${buildQueryColumns(query)} FROM features WHERE id IN (${escapeSql(ids.join(','))})`;
     executeQuery(getQuery, (err, rows) => {
         if (err) return callback(err);
         if (!rows || rows.length === 0) return callback(null, null);
 
-        return callback(null, rows[0]);
+        return callback(null, rows);
     });
 }
 

test/functional/features.js

@@ -108,4 +108,27 @@ describe('features endpoint', function() {
             done();
         });
     });
+
+    it('can get features by id', function(done) {
+        request.get(`${featuresEndpoint}/id/fake-3830198`, {
+            headers: {
+                Authorization: "Bearer " + fixtures.accessToken
+            },
+            json: true
+        }, function(err, resp) {
+            assert(!err);
+            assert.equal(resp.statusCode, HttpStatus.OK);
+
+            assert(resp.body.features);
+            assert(resp.body.features.length > 0);
+
+            let feature = resp.body.features[0];
+
+            assert.equal(feature.id, fixtures.feature.id);
+            assert.equal(feature.name, fixtures.feature.name);
+            assert.equal(feature.layer, fixtures.feature.layer);
+
+            done();
+        });
+    });
 });