Updated schemas, added MultiPolygon, updated modules

Author: jscottsf

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "dendra-web-api",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "Dendra public facing REST API.",
   "license": "BSD-2-Clause-FreeBSD",
   "author": "J. Scott Smith <[email protected]>",
@@ -32,18 +32,18 @@
     "node": ">=6.11.0"
   },
   "dependencies": {
-    "@dendra-science/api-hooks-common": "0.0.1",
+    "@dendra-science/api-hooks-common": "0.0.2",
     "@dendra-science/math": "0.0.1",
     "@dendra-science/utils": "0.0.1",
-    "ajv": "^5.5.1",
+    "ajv": "^5.5.2",
     "babel-runtime": "^6.26.0",
     "body-parser": "^1.18.2",
     "compression": "^1.7.1",
     "cors": "^2.8.4",
     "express": "^4.16.2",
     "feathers": "^2.2.3",
     "feathers-authentication": "^1.3.1",
-    "feathers-authentication-hooks": "^0.1.5",
+    "feathers-authentication-hooks": "^0.1.6",
     "feathers-authentication-jwt": "^0.3.2",
     "feathers-authentication-local": "^0.4.4",
     "feathers-configuration": "^0.4.2",
@@ -54,21 +54,21 @@
     "feathers-rest": "^1.8.1",
     "feathers-sequelize": "^2.4.0",
     "feathers-socketio": "^2.0.1",
-    "mathjs": "^3.17.0",
+    "mathjs": "^3.18.0",
     "mongodb": "^2.2.33",
     "mysql2": "^1.5.1",
     "passport": "^0.4.0",
     "pug": "^2.0.0-rc.4",
     "request": "^2.83.0",
-    "sequelize": "^4.27.0",
+    "sequelize": "^4.28.6",
     "winston": "^2.4.0"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.0",
     "babel-preset-es2015-node6": "^0.4.0",
     "chai": "^4.1.2",
-    "eslint": "^4.13.0",
+    "eslint": "^4.13.1",
     "eslint-config-standard": "^10.2.1",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-node": "^5.2.1",

package.json

@@ -42,6 +42,7 @@
     "datapoints_config": {
       "type": "array",
       "description": "Service configuration used for fetching datapoints",
+      "minItems": 1,
       "items": {
         "type": "object",
         "properties": {
@@ -74,20 +75,19 @@
           "path"
         ],
         "additionalProperties": false
-      },
-      "minItems": 1
+      }
     },
     "derivation_description": {
       "type": "string",
       "example": "Calculated server-side based on the Celsius datastream."
     },
     "derived_from_datastream_ids": {
       "type": "array",
+      "minItems": 1,
       "items": {
         "$ref": "types.json#/definitions/datastreamId",
         "example": "592f155746a1b867a114e021"
-      },
-      "minItems": 1
+      }
     },
     "description": {
       "$ref": "types.json#/definitions/description",

schema/datastream.json

@@ -19,11 +19,11 @@
     "roles": {
       "type": "array",
       "description": "The person's roles within this organization (e.g. 'admin', 'contact', 'curator', 'manager')",
+      "minItems": 1,
       "items": {
         "type": "string",
         "example": "contact"
-      },
-      "minItems": 1
+      }
     }
   },
   "properties": {

schema/membership.json

@@ -8,14 +8,26 @@
     "_id": {
       "$ref": "types.json#/definitions/organizationId"
     },
+    "description": {
+      "$ref": "types.json#/definitions/description",
+      "example": "The UC Natural Reserve System is a network of protected natural areas throughout California used for monitoring, education, and research. As part of a climate change monitoring grant, each reserve has a weather station on site."
+    },
     "email": {
       "$ref": "types.json#/definitions/email",
       "example": "[email protected]"
     },
-    "name": {
+    "full_name": {
       "type": "string",
       "example": "University of California Natural Reserve System"
     },
+    "name": {
+      "type": "string",
+      "example": "UC Natural Reserve System"
+    },
+    "slug": {
+      "$ref": "types.json#/definitions/slug",
+      "example": "ucnrs"
+    },
     "url": {
       "$ref": "types.json#/definitions/url",
       "example": "http://www.ucnrs.org"
@@ -25,8 +37,11 @@
     "_id": {"$ref": "#/definitions/_id"},
     "created_at": {"$ref": "types.json#/definitions/createdAt"},
     "updated_at": {"$ref": "types.json#/definitions/updatedAt"},
+    "description": {"$ref": "#/definitions/description"},
     "email": {"$ref": "#/definitions/email"},
+    "full_name": {"$ref": "#/definitions/full_name"},
     "name": {"$ref": "#/definitions/name"},
+    "slug": {"$ref": "#/definitions/slug"},
     "url": {"$ref": "#/definitions/url"}
   },
   "required": [
@@ -46,8 +61,11 @@
       "schema": {
         "type": "object",
         "properties": {
+          "description": {"$ref": "#/definitions/description"},
           "email": {"$ref": "#/definitions/email"},
+          "full_name": {"$ref": "#/definitions/full_name"},
           "name": {"$ref": "#/definitions/name"},
+          "slug": {"$ref": "#/definitions/slug"},
           "url": {"$ref": "#/definitions/url"}
         }
       },
@@ -65,8 +83,11 @@
       "schema": {
         "type": "object",
         "properties": {
+          "description": {"$ref": "#/definitions/description"},
           "email": {"$ref": "#/definitions/email"},
+          "full_name": {"$ref": "#/definitions/full_name"},
           "name": {"$ref": "#/definitions/name"},
+          "slug": {"$ref": "#/definitions/slug"},
           "url": {"$ref": "#/definitions/url"}
         }
       },