Merge branch 'nfzManagement' into dev

Author: gondzo

data/no-fly-zones.json

@@ -48,7 +48,7 @@
     "isPermanent": true,
     "mission": "594d77ec37275a4d97dddb0c",
     "style": {
-      "fillColor": "#FF0000"
+      "fillColor": "red"
     }
   },
   {
@@ -108,7 +108,7 @@
     "isPermanent": true,
     "mission": "594d77ec37275a4d97dddb0c",
     "style": {
-      "fillColor": "#FF0000"
+      "fillColor": "red"
     }
   },
   {
@@ -189,7 +189,7 @@
     "startTime": "2016-12-11T17:46:23.169Z",
     "endTime": "2030-12-11T17:46:23.169Z",
     "style": {
-      "fillColor": "#FF0000"
+      "fillColor": "yellow"
     }
   }
 ]

models/NoFlyZone.js

@@ -16,8 +16,16 @@ const helper = require('../common/helper');
 const ObjectId = mongoose.Schema.Types.ObjectId;
 const Mixed = mongoose.Schema.Types.Mixed;
 
+const CircleSchema = new mongoose.Schema({
+  center: [Number],
+  radius: Number,
+});
+
 const NoFlyZoneSchema = new mongoose.Schema({
   location: {type: Mixed, required: true, index: '2dsphere'},
+  // if defined, the polygon is an approximated circle
+  // circle contains data for frontend
+  circle: {type: CircleSchema, default: null},
   description: String,
   startTime: Date,
   endTime: Date,

services/MissionService.js

@@ -60,13 +60,12 @@ function* search(entity) {
 // the joi schema for getSingle
 getSingle.schema = {
   id: joi.string().required(),
-  userId: joi.string().required(),
 };
 
 /**
  * Get a mission identified by id
  */
-function* getSingle(id, userId) {
+function* getSingle(id) {
   const mission = yield Mission.findOne({_id: id});
   if (!mission) {
     throw new errors.NotFoundError(`mission not found with specified id ${id}`);

services/NoFlyZoneService.js

@@ -89,8 +89,8 @@ function* search(criteria) {
           $or: [
             {
               isPermanent: false,
-              startTime: {$gte: new Date()},
-              endTime: {$lte: new Date()},
+              startTime: {$lte: new Date()},
+              endTime: {$gte: new Date()},
             },
             {
               isPermanent: true,
@@ -105,6 +105,7 @@ function* search(criteria) {
     items: NoFlyZone
       .find(filter)
       .skip(criteria.offset)
+      .sort('-id')
       .limit(criteria.limit),
   };
 }
@@ -134,9 +135,13 @@ function* create(values) {
 create.schema = {
   values: joi.object().keys({
     location: joi.geoJSON().required(),
+    circle: {
+      center: joi.array().items(joi.number()),
+      radius: joi.number(),
+    },
     description: joi.string().required(),
-    startTime: joi.date().iso(),
-    endTime: joi.date().iso(),
+    startTime: joi.date().iso().allow(null),
+    endTime: joi.date().iso().allow(null),
     style: joi.object(),
     isActive: joi.bool().required(),
     isPermanent: joi.bool().required(),
@@ -161,6 +166,10 @@ update.schema = {
   values: {
     id: joi.any().strip(),
     location: joi.geoJSON().required(),
+    circle: joi.object({
+      center: joi.array().items(joi.number()),
+      radius: joi.number(),
+    }).allow(null),
     description: joi.string().required(),
     startTime: joi.date().iso(),
     endTime: joi.date().iso(),