adiwg-mdjson_schemas 2.4.5 → 2.4.7

data/examples/metadataInfo.json

@@ -40,7 +40,7 @@
     {
       "role": "role",
       "roleExtent": [{
-        "temporalExtent": [{          
+        "temporalExtent": [{
           "timePeriod": {
             "startDateTime": "2016-10-24T11:10:15.2-10:00"
           }
@@ -66,6 +66,62 @@
   }, {
     "uri": "http://adiwg.org"
   }],
+  "metadataConstraint": [{
+    "type": "use",
+    "useLimitation": [
+      "useLimitation0",
+      "useLimitation1"
+    ],
+    "scope": {
+      "scopeCode": "scopeCode"
+    },
+    "graphic": [{
+      "fileName": "fileName0"
+    }, {
+      "fileName": "fileName1"
+    }],
+    "reference": [{
+      "title": "title0"
+    }, {
+      "title": "title1"
+    }],
+    "releasability": {
+      "statement": "statement"
+    },
+    "responsibleParty": [{
+      "role": "role0",
+      "roleExtent": [{
+        "temporalExtent": [{
+          "timePeriod": {
+            "startDateTime": "2016-10-24T11:10:15.2-10:00"
+          }
+        }]
+      }],
+      "party": [{
+        "contactId": "individualId0"
+      }]
+    }],
+    "legal": {
+      "useConstraint": [
+        "useConstraint0",
+        "useConstraint1"
+      ],
+      "accessConstraint": [
+        "accessConstraint0",
+        "accessConstraint1"
+      ],
+      "otherConstraint": [
+        "otherConstraint0",
+        "otherConstraint1"
+      ]
+    },
+    "security": {
+      "classification": "classification",
+      "classificationSystem": "classificationSystem",
+      "userNote": "userNote",
+      "handlingDescription": "handlingDescription"
+    }
+  }],
   "metadataMaintenance": {
     "frequency": "frequency"
   },

data/examples/resourceInfo.json

@@ -39,7 +39,7 @@
   }, {
     "role": "role2",
     "roleExtent": [{
-      "temporalExtent": [{        
+      "temporalExtent": [{
         "timePeriod": {
           "startDateTime": "2016-10-24T11:10:15.2-10:00"
         }
@@ -120,7 +120,7 @@
     "coverageName": "coverageName1",
     "coverageDescription": "coverageDescription1"
   }],
-  "taxonomy": {
+  "taxonomy": [{
     "taxonomicSystem": [{
       "citation": {
         "title": "title"
@@ -146,10 +146,10 @@
     }],
     "identificationProcedure": "identificationProcedure",
     "taxonomicClassification": {
-      "taxonomicRank": "taxonomicRank",
-      "latinName": "latinName"
+      "taxonomicLevel": "taxonomicLevel",
+      "taxonomicName": "taxonomicName"
     }
-  },
+  }],
   "graphicOverview": [{
     "fileName": "fileName0"
   }, {

data/examples/taxonomicClassification.json

@@ -1,25 +1,25 @@
 [{
   "taxonomicSystemId": "999999",
-  "taxonomicRank": "taxonomicRank0",
-  "latinName": "latinName",
+  "taxonomicLevel": "taxonomicLevel0",
+  "taxonomicName": "taxonomicName",
   "commonName": ["commonName0", "commonName1"],
   "subClassification": [{
-      "taxonomicRank": "taxonomicRank00",
-      "latinName": "latinName",
+      "taxonomicLevel": "taxonomicLevel00",
+      "taxonomicName": "taxonomicName",
       "commonName": [
         "commonName0",
         "commonName1"
       ],
       "subClassification": [{
-        "taxonomicRank": "taxonomicRank000",
-        "latinName": "latinName",
+        "taxonomicLevel": "taxonomicLevel000",
+        "taxonomicName": "taxonomicName",
         "commonName": [
           "commonName0",
           "commonName1"
         ],
         "subClassification": [{
-            "taxonomicRank": "taxonomicRank0000.1",
-            "latinName": "latinName",
+            "taxonomicLevel": "taxonomicLevel0000.1",
+            "taxonomicName": "taxonomicName",
             "commonName": [
               "commonName0",
               "commonName1"
@@ -27,8 +27,8 @@
             "subClassification": []
           },
           {
-            "taxonomicRank": "taxonomicRank0000.2",
-            "latinName": "latinName",
+            "taxonomicLevel": "taxonomicLevel0000.2",
+            "taxonomicName": "taxonomicName",
             "commonName": [
               "commonName0",
               "commonName1"
@@ -39,15 +39,15 @@
       }]
     },
     {
-      "taxonomicRank": "taxonomicRank01",
-      "latinName": "latinName",
+      "taxonomicLevel": "taxonomicLevel01",
+      "taxonomicName": "taxonomicName",
       "commonName": [
         "commonName0",
         "commonName1"
       ],
       "subClassification": [{
-        "taxonomicRank": "taxonomicRank010",
-        "latinName": "latinName",
+        "taxonomicLevel": "taxonomicLevel010",
+        "taxonomicName": "taxonomicName",
         "commonName": [
           "commonName0",
           "commonName1"

data/examples/taxonomy.json

@@ -98,7 +98,7 @@
       "commonName0",
       "commonName1"
     ],
-    "taxonomicRank": "taxonomicRank0",
-    "latinName": "latinName0"
+    "taxonomicLevel": "taxonomicLevel0",
+    "taxonomicName": "taxonomicName0"
   }
 }]

data/examples/vectorRepresentation.json

@@ -7,4 +7,14 @@
     "objectType": "objectType",
     "objectCount": 9
   }]
+}, {
+  "topologyLevel": "topologyLevel"
+}, {
+  "vectorObject": [{
+    "objectType": "objectType",
+    "objectCount": 9
+  }, {
+    "objectType": "objectType",
+    "objectCount": 9
+  }]
 }]

data/lib/adiwg/mdjson_schemas/version.rb

@@ -1,6 +1,6 @@
 module ADIWG
     module MdjsonSchemas
         # Current schema version number
-        VERSION = "2.4.5"
+        VERSION = "2.4.7"
     end
 end

data/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "mdjson-schemas",
-  "version": "2.4.2",
+  "version": "2.4.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -39,14 +39,12 @@
       "dev": true
     },
     "buildify": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/buildify/-/buildify-0.4.0.tgz",
-      "integrity": "sha1-IMi94gSIsyWIzpKkGJZyoITToMQ=",
+      "version": "github:powmedia/buildify#20458a121411f759dcc5ec1b441695eb7fc2b3b7",
       "dev": true,
       "requires": {
         "clean-css": "0.6.0",
         "mkdirp": "0.3.2",
-        "uglify-js": "1.3.4",
+        "uglify-es": "3.0.22",
         "underscore": "1.3.3"
       },
       "dependencies": {
@@ -130,7 +128,7 @@
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
       "dev": true,
       "requires": {
         "fs.realpath": "1.0.0",
@@ -264,7 +262,7 @@
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
       "dev": true,
       "requires": {
         "brace-expansion": "1.1.8"
@@ -354,12 +352,18 @@
     "rimraf": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=",
       "dev": true,
       "requires": {
         "glob": "7.1.2"
       }
     },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true
+    },
     "supports-color": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
@@ -369,11 +373,15 @@
         "has-flag": "1.0.0"
       }
     },
-    "uglify-js": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-1.3.4.tgz",
-      "integrity": "sha1-KCzsQNtWh5jg7G1x0MmJ0yPwY2s=",
-      "dev": true
+    "uglify-es": {
+      "version": "3.0.22",
+      "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.0.22.tgz",
+      "integrity": "sha512-4bvwQuswYIpkeZRJ7v9ZVwsOXKeWnop9EUL5FmGy+KVQHtYBf0GzIKryzvY7j6eBTAw9otf4b9VsrufW9CcDHA==",
+      "dev": true,
+      "requires": {
+        "commander": "2.9.0",
+        "source-map": "0.5.7"
+      }
     },
     "underscore": {
       "version": "1.3.3",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mdjson-schemas",
-  "version": "2.4.5",
+  "version": "2.4.7",
   "description": "JSON schemas, examples, and templates for ADIwg metadata standards",
   "main": "index.js",
   "directories": {
@@ -10,7 +10,7 @@
   },
   "scripts": {
     "test": "mocha",
-    "prepublish": "scripts/prepublish.js",
+    "prepublishOnly": "scripts/prepublish.js",
     "pretest": "scripts/prepublish.js"
   },
   "files": [
@@ -40,7 +40,7 @@
   "homepage": "https://github.com/adiwg/mdJson-schemas#readme",
   "devDependencies": {
     "ajv": "^5.2.2",
-    "buildify": "^0.4.0",
+    "buildify": "github:powmedia/buildify#20458a121411f759dcc5ec1b441695eb7fc2b3b7",
     "glob": "^7.1.2",
     "mkdirp": "^0.5.1",
     "mocha": "^3.5.0",

data/schema/constraint.json

@@ -1,8 +1,8 @@
 {
   "id": "constraint.json#",
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "description": "schema for resource constraint",
-  "example":"../examples/constraint.json",
+  "description": "schema for constraint",
+  "example": "../examples/constraint.json",
   "required": ["type"],
   "anyOf": [{
     "type": "object",
@@ -87,7 +87,7 @@
     "legalConstraint": {
       "type": "object",
       "description": "Restrictions and legal prerequisites for accessing and using the resource or metadata.",
-      "example":"../examples/legalConstraint.json",
+      "example": "../examples/legalConstraint.json",
       "translation": {
         "ISO 19115-2": ["MD_LegalConstraints"]
       },
@@ -126,12 +126,22 @@
             "type": "string"
           }
         }
-      }
+      },
+      "anyOf": [{
+        "title": "accessConstraint is required",
+        "required": ["accessConstraint"]
+      }, {
+        "title": "useConstraint is required",
+        "required": ["useConstraint"]
+      }, {
+        "title": "otherConstraint is required",
+        "required": ["otherConstraint"]
+      }]
     },
     "securityConstraint": {
       "type": "object",
       "description": "Handling restrictions imposed on the resource or metadata for national security or similar security concerns.",
-      "example":"../examples/securityConstraint.json",
+      "example": "../examples/securityConstraint.json",
       "translation": {
         "ISO 19115-2": ["MD_SecurityConstraints"]
       },

data/schema/dataDictionary.json

@@ -22,6 +22,7 @@
       "translation": {
         "ISO 19115-2": ["FC_FeatureCatalogue > scope"]
       },
+      "minItems": 1,
       "items": {
         "type": "string"
       }

data/schema/distribution.json

@@ -4,7 +4,7 @@
   "type": "object",
   "title": "distribution",
   "description": "Information about the distributor of and options for obtaining the resource.",
-  "example":"../examples/distribution.json",
+  "example": "../examples/distribution.json",
   "translation": {
     "ISO 19115-2": ["MD_Metadata > distribution > MD_Distribution"],
     "FGDC CSDGM": ["distinfo"]
@@ -16,6 +16,15 @@
       "description": "A description of a set of distribution options.",
       "translation": {}
     },
+    "liabilityStatement": {
+      "type": "string",
+      "description": "A statement of the liability assumed by the resource owner.",
+      "translation": {
+        "ISO 19115-2": ["MD_DataIdentification > resourceConstraints > MD_LegalConstraints > otherConstraints"],
+        "FGDC CSDGM": ["distinfo > distliab"],
+        "sbJSON": ["rights"]
+      }
+    },
     "distributor": {
       "type": "array",
       "description": "Information about the distributor of and options for obtaining the resource.",
@@ -23,10 +32,18 @@
         "ISO 19115-2": ["MD_Distribution"],
         "FGDC CSDGM": ["distinfo"]
       },
+      "minItems": 1,
       "items": {
         "$ref": "./distributor.json#",
         "description": "Information about the distributor of and options for obtaining the resource."
       }
     }
-  }
+  },
+  "anyOf": [{
+    "title": "description is required",
+    "required": ["description"]
+  }, {
+    "title": "distributor is required",
+    "required": ["distributor"]
+  }]
 }

data/schema/format.json

@@ -31,6 +31,15 @@
       "description": "Recommendations of algorithms or processes that can be applied to read or expand resources to which compression techniques have been applied.",
       "translation": {},
       "minLength": 1
+    },
+    "technicalPrerequisite": {
+      "type": "string",
+      "description": "Description of any technical capabilities that the consumer must have to use the data set in the form(s) provided by the distributor.",
+      "translation": {
+        "FGDC CSDGM": ["distinfo > techpreq"]
+      },
+      "minLength": 1
     }
+
   }
 }

data/schema/funding.json

@@ -59,6 +59,13 @@
           "type": "string",
           "description": "The contactId of the entity receiving the allocation."
         },
+        "responsibleParty": {
+          "type": "array",
+          "description": "Individuals and/or organizations other than source and recipient that serve as contact points or other roles related to the allocation",
+          "items": {
+            "$ref": "responsibility.json#"
+          }
+        },
         "matching": {
           "type": "boolean",
           "description": "Indicates whether the funds are to be considered matching funds.",

data/schema/metadataInfo.json

@@ -51,7 +51,6 @@
         "ISO 19115-2": ["MI_Metadata > dateStamp"],
         "FGDC CSDGM": ["metainfo > metrd"]
       },
-      "minItems": 1,
       "items": {
         "$ref": "common.json#/definitions/dateObject"
       }
@@ -64,6 +63,17 @@
         "$ref": "./onlineResource.json#"
       }
     },
+    "metadataConstraint": {
+      "type": "array",
+      "description": "Provides information about restrictions on the access and use of metadata.",
+      "translation": {
+        "ISO 19115-2": ["MI_Metadata > metadataConstraints"],
+        "FGDC CSDGM": ["metainfo > metac", "metainfo > metuc"]
+      },
+      "items": {
+        "$ref": "./constraint.json#"
+      }
+    },
     "alternateMetadataReference": {
       "type": "array",
       "description": "Reference to alternative metadata for the resource.",