adiwg-mdjson_schemas 2.4.5 → 2.4.7

data/schema/resourceInfo.json

@@ -173,11 +173,34 @@
       }
     },
     "taxonomy": {
+      "description": "Information on the taxa (1 or more) included in the data set, including keywords, taxonomic system and coverage information, and taxonomic classification system.",
       "translation": {
         "ISO 19115-2": ["MD_DataIdentification > taxonomy"],
         "FGDC CSDGM": ["idinfo > taxonomy"]
       },
-      "$ref": "taxonomy.json"
+      "oneOf": [{
+        "type": "array",
+        "title": "taxonomy",
+        "description": "An array of taxonomic objects",
+        "example": "../examples/taxonomy.json",
+        "translation": {
+          "ISO 19115-2": ["MD_TaxonSys"],
+          "FGDC CSDGM": ["idinfo > taxonomy"]
+        },
+        "items": {
+          "$ref": "taxonomy.json"
+        }
+      }, {
+        "type": "object",
+        "title": "taxonomy",
+        "description": "DEPRECATED, please use an array.",
+        "translation": {
+          "ISO 19115-2": ["MD_DataIdentification > taxonomy"],
+          "FGDC CSDGM": ["idinfo > taxonomy"]
+        },
+        "deprecated": true,
+        "$ref": "taxonomy.json"
+      }]
     },
     "graphicOverview": {
       "type": "array",
@@ -195,7 +218,6 @@
       "translation": {
         "ISO 19115-2": ["MD_DataIdentification > resourceFormat > MD_Format"]
       },
-      "minItems": 1,
       "uniqueItems": true,
       "items": {
         "$ref": "./format.json#"

data/schema/schema.json

@@ -1,7 +1,7 @@
 {
   "id": "schema.json#",
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "version": "2.4.5",
+  "version": "2.4.7",
   "description": "schema for ADIwg mdJSON metadata",
   "example": "../examples/mdJson.json",
   "type": "object",

data/schema/scope.json

@@ -35,6 +35,7 @@
     "scopeDescription": {
       "type": "object",
       "additionalProperties": true,
+      "minProperties": 1,
       "properties": {
         "dataset": {
           "type": "string",

data/schema/taxonomy.json

@@ -34,7 +34,6 @@
       "type": "array",
       "description": "Information on any non-authoritative materials (e.g. field guides) useful for reconstructing the actual process.",
       "translation": {},
-      "minItems": 1,
       "items": {
         "$ref": "./identifier.json#"
       }
@@ -107,15 +106,22 @@
         "ISO 19115-2": ["MD_TaxonSys > taxonCl > MD_TaxonCl"],
         "FGDC CSDGM": ["idinfo > taxonomy > taxoncl"]
       },
-      "required": ["latinName", "taxonomicRank"],
       "additionalProperties": true,
+      "oneOf": [{
+        "title": "Requires taxonomicName and taxonomicLevel",
+        "required": ["taxonomicName", "taxonomicLevel"]
+      }, {
+        "title": "Requires latinName and taxonomicRank",
+        "deprecated": true,
+        "required": ["latinName", "taxonomicRank"]
+      }],
       "properties": {
         "taxonomicSystemId": {
           "type": "string",
           "description": "The ID assigned by the taxonomic system to the taxonomicRank.",
           "minLength": 1
         },
-        "taxonomicRank": {
+        "taxonomicLevel": {
           "type": "string",
           "description": "Name of the taxonomic rank for which the taxonValue is provided. Example: \"Kingdom\", \"Division\", \"Phylum\", \"Subphylum\", \"SuperClass\", \"Class\", \"SubClass\", \"InfraClass\", \"Superorder\", \"Order\", \"Suborder\", \"Infraorder\", \"Superfamily\", \"Family\", \"Subfamily\", \"Tribe\", \"Subtribe\", \"Genus\", \"Species\".",
           "translation": {
@@ -123,7 +129,16 @@
             "FGDC CSDGM": ["idinfo > taxonomy > taxoncl > taxonrn"]
           }
         },
-        "latinName": {
+        "taxonomicRank": {
+          "type": "string",
+          "deprecated": true,
+          "description": "DEPRECATED, use taxonomicLevel",
+          "translation": {
+            "ISO 19115-2": [" MD_TaxonCl > taxonrn"],
+            "FGDC CSDGM": ["idinfo > taxonomy > taxoncl > taxonrn"]
+          }
+        },
+        "taxonomicName": {
           "type": "string",
           "description": "Taxonomic rank value of the taxon being described.",
           "translation": {
@@ -131,6 +146,15 @@
             "FGDC CSDGM": ["idinfo > taxonomy > taxoncl > taxonrv"]
           }
         },
+        "latinName": {
+          "type": "string",
+          "deprecated": true,
+          "description": "DEPRECATED, use taxonomicName",
+          "translation": {
+            "ISO 19115-2": ["MD_TaxonCl > taxonrv"],
+            "FGDC CSDGM": ["idinfo > taxonomy > taxoncl > taxonrv"]
+          }
+        },
         "commonName": {
           "type": "array",
           "description": "Specification of applicable common names. These common names may be general descriptions of a group of organisms if appropriate (e.g. insects, vertebrate, grasses, waterfowl, vascular plants, etc.).",

data/schema/timePeriod.json

@@ -91,7 +91,26 @@
         "seconds": {
           "$ref": "#/definitions/durationPart"
         }
-      }
+      },
+      "anyOf": [{
+        "title": "years is required",
+        "required": ["years"]
+      }, {
+        "title": "months is required",
+        "required": ["months"]
+      }, {
+        "title": "days is required",
+        "required": ["days"]
+      }, {
+        "title": "hours is required",
+        "required": ["hours"]
+      }, {
+        "title": "minutes is required",
+        "required": ["minutes"]
+      }, {
+        "title": "seconds is required",
+        "required": ["seconds"]
+      }]
     },
     "durationPart": {
       "type": "integer"

data/schema/vectorRepresentation.json

@@ -14,6 +14,7 @@
     },
     "vectorObject": {
       "type": "array",
+      "minItems": 1,
       "description": "Information about the geometric objects used in the resource",
       "translation": {},
       "items": {
@@ -21,6 +22,13 @@
       }
     }
   },
+  "anyOf": [{
+    "title": "vectorObject is required",
+    "required": ["vectorObject"]
+  }, {
+    "title": "topologyLevel is required",
+    "required": ["topologyLevel"]
+  }],
   "definitions": {
     "vectorObject": {
       "type": "object",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdjson_schemas
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.4.7
 platform: ruby
 authors:
 - Josh Bradley, Stan Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement