(models) remove format parameter in findBoxById

Author: ubergesundheit

packages/models/CHANGELOG.md

@@ -1,6 +1,7 @@
 # @sensebox/opensensemap-api-models Changelog
 
 ## Unreleased
+- Remove format argument of findBoxById
 
 ## v0.0.9
 - Fix measurements with 'content-type: json' not parsed with JSON.parse.

packages/models/package.json

@@ -7,7 +7,6 @@
   "dependencies": {
     "@sensebox/osem-protos": "^1.1.0",
     "@sensebox/sketch-templater": "^1.1.1",
-    "@turf/helpers": "^4.6.0",
     "bcrypt": "^1.0.2",
     "bunyan": "^1.8.12",
     "config": "^1.29.2",

packages/models/src/box/box.js

@@ -16,7 +16,6 @@ const { mongoose } = require('../db'),
   ModelError = require('../modelError'),
   Sketcher = require('@sensebox/sketch-templater'),
   fs = require('fs'),
-  { point } = require('@turf/helpers'),
   log = require('../log');
 
 const templateSketcher = new Sketcher();
@@ -242,7 +241,7 @@ boxSchema.statics.initNew = function ({
 
 };
 
-boxSchema.statics.findBoxById = function findBoxById (id, { lean = true, populate = true, includeSecrets = false, onlyLastMeasurements = false, onlyLocations = false, format, projection = {} } = {}) {
+boxSchema.statics.findBoxById = function findBoxById (id, { lean = true, populate = true, includeSecrets = false, onlyLastMeasurements = false, onlyLocations = false, projection = {} } = {}) {
   let fullBox = populate;
   if (populate) {
     Object.assign(projection, BOX_PROPS_FOR_POPULATION);
@@ -281,14 +280,6 @@ boxSchema.statics.findBoxById = function findBoxById (id, { lean = true, populat
         throw new ModelError('Box not found', { type: 'NotFoundError' });
       }
 
-      if (format === 'geojson') {
-        const coordinates = box.currentLocation.coordinates;
-        box.currentLocation = undefined;
-        box.loc = undefined;
-
-        return point(coordinates, box);
-      }
-
       if (fullBox === true) {
         // fill in box.loc manually, as toJSON & virtuals are not supported in lean queries.
         box.loc = [{ geometry: box.currentLocation, type: 'Feature' }];

packages/models/test/tests/1-box.js

@@ -299,26 +299,6 @@ describe('Box model', function () {
       });
     });
 
-    it('should allow to return box as geojson', function () {
-      const boxId = Object.keys(testBoxes)[0];
-
-      return Box.findBoxById(boxId, { format: 'geojson' }).then(function (
-        geojsonBox
-      ) {
-        expect(geojsonBox).an('object');
-        expect(geojsonBox.type).equal('Feature');
-        expect(geojsonBox.geometry).an('object');
-
-        expect(geojsonBox.geometry.coordinates).an('array');
-        expect(geojsonBox.geometry.coordinates).lengthOf.within(2, 3);
-        for (const coord of geojsonBox.geometry.coordinates) {
-          expect(coord).a('number');
-        }
-        expect(Math.abs(geojsonBox.geometry.coordinates[0])).most(180);
-        expect(Math.abs(geojsonBox.geometry.coordinates[1])).most(90);
-      });
-    });
-
     it('should allow to disable population and specify own projection', function () {
       const boxId = Object.keys(testBoxes)[0];