adiwg-mdjson_schemas 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7a9bd3ab7da9c422a0e5cf859185cd3c8daaeb5
-  data.tar.gz: 56c80a97d2394b6008d9c630c6b4ae1777331daf
+  metadata.gz: 210524881f60b4064492a4b480dd53de4f8c2cc8
+  data.tar.gz: 214c5f7fe2472a6a25e7ee305875dce341460487
 SHA512:
-  metadata.gz: d066830e47479d2b208f1f0da0f69e764e836357043023c1db32a24183c8d6f83538bc31b82fb4633e028c9a539999a8834b44d31f3baacc0b2853cc96b1660f
-  data.tar.gz: cfa0b32b4e442dbfdcf51f14ad3c1755c77f89dc3f2537a7a208c6cc8079381a90e18e687bfe5ab90ee0bb80bbae75d7383f4ecd506bcf22c5f9027436cd653b
+  metadata.gz: 59b9ee2d72e9f5e23c5802b042b344e268fcbbdf04fbb318c723beea390c6af344031d3c69e41ce61be6614c3bc296320d3d50341058f9df9009e7776c46a0d5
+  data.tar.gz: f565fb2bc11e4c6014930359903ec7576e96f8f79143d8c31a4564ad376a40b4b827514776f3bc94b8d0ad479bcf54dbfe7f89a94baa43190998adcf81647581

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Change Log
 
-## [v2.5.0](https://github.com/adiwg/mdJson-schemas/tree/v2.5.0)
+## [v2.5.1](https://github.com/adiwg/mdJson-schemas/tree/v2.5.1)
 
+[Full Changelog](https://github.com/adiwg/mdJson-schemas/compare/v2.5.0...v2.5.1)
+
+**Implemented enhancements:**
+
+- geographicExtent 'description' rule change [\#153](https://github.com/adiwg/mdJson-schemas/issues/153)
+
+## [v2.5.0](https://github.com/adiwg/mdJson-schemas/tree/v2.5.0) (2018-10-03)
 [Full Changelog](https://github.com/adiwg/mdJson-schemas/compare/v2.4.9...v2.5.0)
 
 **Implemented enhancements:**
@@ -18,7 +25,6 @@
 - spatialResolution rule change [\#160](https://github.com/adiwg/mdJson-schemas/issues/160)
 - geodetic new object [\#159](https://github.com/adiwg/mdJson-schemas/issues/159)
 - obliqueLinePoint new object [\#158](https://github.com/adiwg/mdJson-schemas/issues/158)
-- projection new object [\#157](https://github.com/adiwg/mdJson-schemas/issues/157)
 - referenceSystemParameterSet new object [\#156](https://github.com/adiwg/mdJson-schemas/issues/156)
 - spatialReferenceSystem rule change [\#155](https://github.com/adiwg/mdJson-schemas/issues/155)
 - boundingBox 'altitude' rule change [\#154](https://github.com/adiwg/mdJson-schemas/issues/154)

data/adiwg-json_schemas.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", ">= 0"
   spec.add_development_dependency "json-schema", "~> 2.8.0"
   spec.add_development_dependency "minitest", "~>5"
-  spec.add_development_dependency "adiwg-mdcodes", "~> 2.7.0"
+  spec.add_development_dependency "adiwg-mdcodes", "~> 2.7.1"
 end

data/examples/projection.json

@@ -3,6 +3,10 @@
     "identifier": "identifier",
     "name": "name"
   },
+  "gridIdentifier": {
+    "identifier": "utm",
+    "namespace": "org.adiwg.code.mapGridSystem"
+  },
   "gridZone": "gridZone",
   "standardParallel1": 9.9,
   "standardParallel2": 9.9,
@@ -31,7 +35,12 @@
     }
   ],
   "landsatNumber": 9,
-  "landsatPath": 9
+  "landsatPath": 9,
+  "local": {
+    "description": "description",
+    "georeference": "georeference",
+    "fixedToEarth": true
+  }
 }, {
   "projectionIdentifier": {
     "identifier": "alaska",
@@ -47,4 +56,21 @@
   "gridIdentifier": {
     "identifier": "utm",
     "namespace": "org.adiwg.code.mapGridSystem"
-  }}]
+  },
+  "projectionIdentifier": {
+    "identifier": "mercator",
+    "name": "Mercator",
+    "namespace": "org.adiwg.code.mapProjection"
+  }
+}, {
+  "local": {
+    "description": "description",
+    "georeference": "georeference",
+    "fixedToEarth": true
+  },
+  "projectionIdentifier": {
+    "identifier": "localPlanar",
+    "name": "Custom",
+    "namespace": "org.adiwg.code.mapProjection"
+  }
+}]

data/examples/referenceSystemParameterSet.json

@@ -27,12 +27,5 @@
       "verticalResolution": 9.9,
       "unitOfMeasure": "unitOfMeasure"
     }
-  },
-  {
-    "local": {
-      "description": "description",
-      "georeference": "georeference",
-      "fixedToEarth": true
-    }
   }
 ]

data/lib/adiwg/mdjson_schemas/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mdjson-schemas",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "JSON schemas, examples, and templates for ADIwg metadata standards",
   "main": "index.js",
   "directories": {

data/schema/projection.json

@@ -9,6 +9,7 @@
     "ISO 19115-2": ["referenceSystemInfo > MD_CRS > projection"],
     "FGDC CSDGM": ["metadata > spref > horizsys > planar > mapproj"]
   },
+  "required": ["projectionIdentifier"],
   "additionalProperties": true,
   "properties": {
     "projectionIdentifier": {
@@ -51,7 +52,7 @@
                   "enum": ["org.adiwg.code.mapProjection"]
                 },
                 "identifier": {
-                  "enum": ["alaska", "albers", "azimuthalEquidistant", "equidistantConic", "equirectangular", "generalVertical", "gnomonic", "lambertConic", "lambertEqualArea", "mercator", "miller", "obliqueMercator", "orthographic", "parameters", "polarStereo", "polyconic", "robinson", "sinusoidal", "spaceOblique", "stereographic", "transverseMercator", "grinten"]
+                  "enum": ["alaska", "albers", "azimuthalEquidistant", "equidistantConic", "equirectangular", "generalVertical", "gnomonic", "lambertConic", "lambertEqualArea", "mercator", "miller", "obliqueMercator", "orthographic", "parameters", "polarStereo", "polyconic", "robinson", "sinusoidal", "spaceOblique", "stereographic", "transverseMercator", "grinten", "localPlanar", "localSystem"]
                 }
               }
             },
@@ -275,19 +276,11 @@
       "translation": {
         "FGDC CSDGM": ["spref > horizsys > planar > mapprojp > pathnum"]
       }
-    }
-  },
-  "oneOf": [
-    {
-      "title": "projectionIdentifier is required.",
-      "required": ["projectionIdentifier"]
     },
-    {
-      "title": "gridIdentifier is required.",
-      "required": ["gridIdentifier"]
+    "local": {
+      "$ref": "#/definitions/local"
     }
-  ],
-
+  },
   "definitions": {
     "obliqueLinePoint": {
       "type": "array",
@@ -328,6 +321,37 @@
           }
         }
       }
+    },
+    "local": {
+      "type": "object",
+      "description": "A description of a local coordinate system.",
+      "example": "../examples/projection.json#/4",
+      "translation": {
+        "FGDC CSDGM": ["spref > horizsys > local", "spref > horizsys > planar > localp"]
+      },
+      "required": ["description", "georeference"],
+      "additionalProperties": true,
+      "properties": {
+        "description": {
+          "type": "string",
+          "description": "A description of the local reference system.",
+          "translation": {
+            "FGDC CSDGM": ["spref > horizsys > local > localgeo", "spref > horizsys > planar > localp > localpd"]
+          }
+        },
+        "georeference": {
+          "type": "string",
+          "description": "A description of the information provided to register the local system to the Earth (e.g. control points, satellite ephemeral data, inertial navigation data).",
+          "translation": {
+            "FGDC CSDGM": ["spref > horizsys > local > localdes", "spref > horizsys > planar > localp > localpgi"]
+          }
+        },
+        "fixedToEarth": {
+          "type": "boolean",
+          "default": true,
+          "description": "True if the z-axis of the coordinate system coincides with a plumb line through the origin that locally is aligned with the surface of the Earth."
+        }
+      }
     }
   }
 }

data/schema/referenceSystemParameterSet.json

@@ -15,9 +15,6 @@
     },
     "verticalDatum": {
       "$ref": "./verticalDatum.json#"
-    },
-    "local": {
-      "$ref": "#/definitions/local"
     }
   },
   "oneOf": [{
@@ -31,43 +28,6 @@
     {
       "title": "verticalDatum is required.",
       "required": ["verticalDatum"]
-    },
-    {
-      "title": "local is required.",
-      "required": ["local"]
-    }
-  ],
-  "definitions": {
-    "local": {
-      "type": "object",
-      "description": "A description of a local coordinate system.",
-      "example": "../examples/referenceSystemParameterSet.json#/3",
-      "translation": {
-        "FGDC CSDGM": ["spref > horizsys > local", "spref > horizsys > planar > localp"]
-      },
-      "required": ["description", "georeference"],
-      "additionalProperties": true,
-      "properties": {
-        "description": {
-          "type": "string",
-          "description": "A description of the local reference system.",
-          "translation": {
-            "FGDC CSDGM": ["spref > horizsys > local > localgeo", "spref > horizsys > planar > localp > localpd"]
-          }
-        },
-        "georeference": {
-          "type": "string",
-          "description": "A description of the information provided to register the local system to the Earth (e.g. control points, satellite ephemeral data, inertial navigation data).",
-          "translation": {
-            "FGDC CSDGM": ["spref > horizsys > local > localdes", "spref > horizsys > planar > localp > localpgi"]
-          }
-        },
-        "fixedToEarth": {
-          "type": "boolean",
-          "default": true,
-          "description": "True if the z-axis of the coordinate system coincides with a plumb line through the origin that locally is aligned with the surface of the Earth."
-        }
-      }
     }
-  }
+  ]
 }

data/schema/schema.json

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

data/test/tc_projection.rb

@@ -19,7 +19,7 @@ class TestProjection < TestHelper
     def test_mapGridSystem
         codes = ADIWG::Mdcodes::getCodelistDetail('adiwg_mapGridSystem')["codelist"]
         data = codes.map do |c|
-            {:gridIdentifier => {:identifier => c["code"], :namespace => "org.adiwg.code.mapGridSystem"}}
+            {:gridIdentifier => {:identifier => c["code"], :namespace => "org.adiwg.code.mapGridSystem"}, :projectionIdentifier => {:identifier => "identifier"}}
         end
         errors = JSON::Validator.fully_validate('projection.json', data, strict: @@strict, list: true)
         assert(errors.empty?, errors.join("\n"))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdjson_schemas
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Josh Bradley, Stan Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.7.1
 description: JSON schemas for validating according to the the ADIwg project and data
   metadata standard. The schemas comply with JSON Schema draft version 4.
 email:
@@ -369,7 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: JSON schemas for the ADIwg metadata standard