adiwg-mdtranslator 2.20.0.pre.beta.3 → 2.21.0.pre.beta.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec23318ef18dc9729c5aaa6c608b55c856234d8e31a893b6c011f02494f75718
-  data.tar.gz: d28e618a12660f940c9fbc4d3ea380c1109cdc2c7756a32872c2f2e84b4e2c64
+  metadata.gz: 24a46249aaab639bcbfcf96546503546a9474db0aaf8d3d9136190cbd7ae2c19
+  data.tar.gz: da85309bcd6c126043a653d5e436535d7d29c4eb2107a416acb1cdc4575d3696
 SHA512:
-  metadata.gz: 6c81ced313a48931ef23b337d408f512932836b81368c535eb197dc0950795b8510deea40f5a130b4372b3110f1d9020fb943d7537de8e80184dc88b25fe8994
-  data.tar.gz: 0566ba79a6004232a532bd7eda527bb60a90191ea0a0ba47baf38764efa014341074a31418cdc798f82a2fe5a5860f13d9f8a3e9dce8d170389edea39392a47d
+  metadata.gz: 966ff66ba5977d8f190b38535637cf43b0d346291ed81928179814b8bbb081a2967d56bba02f80847525e0f86fce8c0e1d405d71fbd7dcf1338c7cc5e2c2a31c
+  data.tar.gz: ae9ec9bd0c85646c0b7b99d79adda40be5ea40de1bb14eb133471028a3b9800b86138591abf2e1c87d6c3bc8e5e07741a66f816755558823cdc76697d30b9845

data/.github/workflows/test.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1
         with:
           ruby-version: "3.1" # Not needed with a .ruby-version file
       - run: bundle install

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    adiwg-mdtranslator (2.20.0.pre.beta.3)
-      adiwg-mdcodes (= 2.9.4.pre.beta.0)
-      adiwg-mdjson_schemas (= 2.9.3.pre.beta.0)
+    adiwg-mdtranslator (2.21.0.pre.beta.0)
+      adiwg-mdcodes (= 2.10.0)
+      adiwg-mdjson_schemas (= 2.10.0.pre.beta.5)
       builder (~> 3.2)
       coderay (~> 1.1)
       jbuilder (~> 2.5)
@@ -17,13 +17,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionview (7.1.3.3)
+      activesupport (= 7.1.3.3)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (7.1.3.2)
+    activesupport (7.1.3.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -35,9 +35,9 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    adiwg-mdcodes (2.9.4.pre.beta.0)
+    adiwg-mdcodes (2.10.0)
       json (~> 2.0)
-    adiwg-mdjson_schemas (2.9.3.pre.beta.0)
+    adiwg-mdjson_schemas (2.10.0.pre.beta.5)
     base64 (0.2.0)
     bigdecimal (3.1.8)
     builder (3.2.4)
@@ -67,7 +67,7 @@ GEM
     nokogiri (1.15.6-x86_64-linux)
       racc (~> 1.4)
     public_suffix (5.0.5)
-    racc (1.7.3)
+    racc (1.8.0)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -76,7 +76,9 @@ GEM
       loofah (~> 2.21)
       nokogiri (~> 1.14)
     rake (13.1.0)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
+    strscan (3.1.0)
     thor (0.20.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)

data/README.md

@@ -23,27 +23,6 @@ Or install it yourself as:
 
     $ mdtranslator help translate
 
-## Development
-
-### Requirements
-
-Requires
-- [Ruby](https://www.ruby-lang.org/en/documentation/installation/)
-- bundler (`gem install bundler`)
-- rake (`gem install rake`)
-
-### Tests
-
-In order to run the tests, first install the dependencies
-
-    $ bundle install
-
-Then, run the rake command
-
-    $ bundle exec rake
-
-_TODO: There are currently 4 tests that are not passing, related to mdJSON readers and writers_
-
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/mdTranslator/fork )

data/Rakefile

@@ -23,7 +23,6 @@ Rake::TestTask.new do |t|
       'test/writers/iso19115-3/tc*.rb',
       'test/writers/mdJson/tc*.rb',
       'test/writers/sbJson/tc*.rb',
-      'test/writers/dcat_us/tc*.rb',
       'test/translator/tc*.rb'
    ]
    t.verbose = true

data/adiwg-mdtranslator.gemspec

@@ -34,8 +34,8 @@ Gem::Specification.new do |spec|
    spec.add_runtime_dependency "thor", "~> 0.19"
    spec.add_runtime_dependency "uuidtools", "~> 2.1"
    spec.add_runtime_dependency "json-schema", "~> 2.7"
-   spec.add_runtime_dependency "adiwg-mdjson_schemas", "2.9.3.pre.beta.0"
-   spec.add_runtime_dependency "adiwg-mdcodes", "2.9.4.pre.beta.0"
+   spec.add_runtime_dependency "adiwg-mdjson_schemas", "2.10.0.pre.beta.5"
+   spec.add_runtime_dependency "adiwg-mdcodes", "2.10.0"
    spec.add_runtime_dependency "jbuilder", "~> 2.5"
    spec.add_runtime_dependency "kramdown", ">= 1.13", "< 3.0"
    spec.add_runtime_dependency "coderay", "~> 1.1"

data/lib/adiwg/mdtranslator/internal/internal_metadata_obj.rb

@@ -143,7 +143,8 @@ class InternalMetadata
          associatedResources: [],
          additionalDocuments: [],
          funding: [],
-         dataQuality: []
+         dataQuality: [],
+         acquisitions: []
       }
    end
 
@@ -158,6 +159,7 @@ class InternalMetadata
    # acquisition ----------------------------
    def newAcquisition
       {
+         scope: {},
          plans: [],
          requirements: [],
          objectives: [],
@@ -175,19 +177,23 @@ class InternalMetadata
          averageAirTemperature: nil,
          maxRelativeHumidity: nil,
          maxAltitude: nil,
-         meteorologicalConditions: nil
+         meteorologicalConditions: nil,
+         solarAzimuth: nil,
+         solarElevation: nil
+         
       }
    end
 
    def newEvent
       {
          eventId: nil,
+         identifier: {},
          trigger: nil,
          context: nil,
          sequence: nil,
          dateTime: nil,
          expectedObjectives: [],
-         relatedPass: nil,
+         relatedPass: {},
          relatedSensors: []
       }
    end
@@ -199,7 +205,29 @@ class InternalMetadata
          identifier: {},
          instrumentType: nil,
          description: nil,
-         mountedOn: nil
+         mountedOn: {},
+         histories: [],
+         hostId: {}
+      }
+   end
+
+   def newInstrumentationEvent
+      {
+         citations: [],
+         description: nil,
+         extent: {},
+         eventType: nil,
+         revisionHistories: [],
+      }
+   end
+
+   def newInstrumentationEventList
+      {
+         citation: {},
+         description: nil,
+         locale: {},
+         constraints: [],
+         instrumentationEvents: []
       }
    end
 
@@ -240,14 +268,15 @@ class InternalMetadata
    def newOperation
       {
          operationId: nil,
+         description: nil,
          citation: {},
          identifier: {},
          status: nil,
          operationType: nil,
          objectives: [],
-         parentOperations: nil,
+         parentOperation: {},
          childOperations: [],
-         plan: nil,
+         plan: {},
          platforms: [],
          significantEvents: []
       }
@@ -267,6 +296,14 @@ class InternalMetadata
       }
    end
 
+   def newRevision
+      {
+         description: nil,
+         responsibleParty: {},
+         dateInfo: []
+      }
+   end
+
    def newPlatform
       {
          platformId: nil,
@@ -274,7 +311,8 @@ class InternalMetadata
          identifier: {},
          description: nil,
          sponsors: [],
-         instruments: []
+         instruments: [],
+         history: []
       }
    end
 

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_dataQuality.rb

@@ -28,24 +28,39 @@ module ADIWG
 
                   # data quality 2.1 (attracc) - attribute accuracy
                   xAccuracy = xDataQual.xpath('./attracc')
-                  accuracyReport = xAccuracy.xpath('./attraccr').text
-                  report = intMetadataClass.newDataQualityReport
-                  report[:type] = 'NonQuantitativeAttributeCorrectness'
-                  descriptiveResult = intMetadataClass.newDescriptiveResult
-                  descriptiveResult[:statement] = accuracyReport
-                  report[:descriptiveResult] << descriptiveResult
-                  hDataQuality[:report] << report
-
-                  # data quality 2.1 (qattracc) - Quantitative Attribute Accuracy Assessment
-                  xQuantitativeAccuracy = xDataQual.xpath('./qattracc')
-                  unless xQuantitativeAccuracy.xpath('./attraccv').empty?
-                     value = xQuantitativeAccuracy.xpath('./attraccv').text
-                     report = intMetadataClass.newDataQualityReport
-                     report[:type] = 'QuantitativeAttributeAccuracy'
-                     quantitativeResult = intMetadataClass.newQuantitativeResult
-                     quantitativeResult[:values] << value
-                     report[:quantitativeResult] << quantitativeResult
-                     hDataQuality[:report] << report
+                  unless xAccuracy.empty?
+                     # data quality 2.1.1 (attraccr) - Attribute Accuracy Report
+                     xAccuracyReport = xAccuracy.xpath('./attraccr')
+                     unless xAccuracyReport.empty?
+                        report = intMetadataClass.newDataQualityReport
+                        report[:type] = 'DQ_NonQuantitativeAttributeCorrectness'
+                        descriptiveResult = intMetadataClass.newDescriptiveResult
+                        descriptiveResult[:name] = 'Attribute Accuracy Report'
+                        descriptiveResult[:statement] = xAccuracyReport.text
+                        report[:descriptiveResult] << descriptiveResult
+                        hDataQuality[:report] << report
+                     end
+                     # data quality 2.1.2 (qattracc) - Quantitative Attribute Accuracy Assessment
+                     xQuantitativeAccuracy = xAccuracy.xpath('./qattracc')
+                     unless xQuantitativeAccuracy.empty?
+                        report = intMetadataClass.newDataQualityReport
+                        report[:type] = 'DQ_QuantitativeAttributeAccuracy'
+                        # data quality 2.1.2.1 (attraccv) - Attribute Accuracy Value
+                        xQuantitativeAccuracyValue = xQuantitativeAccuracy.xpath('./attraccv')
+                        unless xQuantitativeAccuracyValue.empty?
+                           quantitativeResult = intMetadataClass.newQuantitativeResult
+                           quantitativeResult[:name] = 'Attribute Accuracy Value'
+                           quantitativeResult[:values] << xQuantitativeAccuracyValue.text
+                           report[:quantitativeResult] << quantitativeResult
+                        end
+                        # data quality 2.1.2.2 (attracce) - Attribute Accuracy Explanation
+                        xEvaluationMethod = xQuantitativeAccuracy.xpath('./attracce')
+                        unless xEvaluationMethod.empty?
+                           report[:evaluationMethod] = intMetadataClass.newEvaluationMethod
+                           report[:evaluationMethod][:methodDescription] = xEvaluationMethod.text
+                        end
+                        hDataQuality[:report] << report unless report[:quantitativeResult].empty? && report[:evaluationMethod].empty?
+                     end
                   end
 
                   # data quality 2.2 (logic) - logical consistency (required) (not implemented)
@@ -55,9 +70,11 @@ module ADIWG
                   else
                      logic = xLogic.text
                      report = intMetadataClass.newDataQualityReport
-                     report[:type] = 'ConceptualConsistency'
-                     report[:qualityMeasure] = intMetadataClass.newQualityMeasure
-                     report[:qualityMeasure][:description] = logic
+                     report[:type] = 'DQ_ConceptualConsistency'
+                     descriptiveResult = intMetadataClass.newDescriptiveResult
+                     descriptiveResult[:name] = 'Logical Consistency Report'
+                     descriptiveResult[:statement] = logic
+                     report[:descriptiveResult] << descriptiveResult
                      hDataQuality[:report] << report
                   end
 
@@ -68,59 +85,86 @@ module ADIWG
                   else
                      complete = xComplete.text
                      report = intMetadataClass.newDataQualityReport
-                     report[:type] = 'Omission'
+                     report[:type] = 'DQ_CompletenessOmission'
                      descriptiveResult = intMetadataClass.newDescriptiveResult
+                     descriptiveResult[:name] = 'Completeness Report'
                      descriptiveResult[:statement] = complete
                      report[:descriptiveResult] << descriptiveResult
                      hDataQuality[:report] << report
                   end
 
-                  # data quality 2.4 (position) - positional accuracy
+                  # data quality 2.4 (posacc) - Positional Accuracy
                   xPositionalAccuracy = xDataQual.xpath('./posacc')
                   unless xPositionalAccuracy.empty?
-                     # horizontal positional accuracy
-                     xHorizontal = xPositionalAccuracy.xpath('./horizpa')
-                     unless xHorizontal.empty?
+                     # data quality 2.4.1 (horizpa) - Horizontal Positional Accuracy
+                     xHorizontalAccuracy = xPositionalAccuracy.xpath('./horizpa')
+                     unless xHorizontalAccuracy.empty?
                         report = intMetadataClass.newDataQualityReport
-                        report[:type] = 'AbsoluteExternalPositionalAccuracy'
-                        unless xHorizontal.xpath('qhorizpa/horizpae').empty?
-                           report[:qualityMeasure] = intMetadataClass.newQualityMeasure
-                           report[:qualityMeasure][:description] = xHorizontal.xpath('qhorizpa/horizpae').text
-                           name = 'Horizontal Positional Accuracy Report'
-                           report[:qualityMeasure][:nameOfMeasure] << name
+                        report[:type] = 'DQ_AbsoluteExternalPositionalAccuracy'
+                        # data quality 2.4.1.1 (horizpar) - Horizontal Positional Accuracy Report
+                        xHorizontalAccuracyReport = xHorizontalAccuracy.xpath('./horizpar')
+                        unless xHorizontalAccuracyReport.empty?
+                           descriptiveResult = intMetadataClass.newDescriptiveResult
+                           descriptiveResult[:name] = 'Horizontal Positional Accuracy Report'
+                           descriptiveResult[:statement] = xHorizontalAccuracyReport.text
+                           report[:descriptiveResult] << descriptiveResult
                         end
-                        unless xHorizontal.xpath('horizpar').empty?
-                           report[:evaluationMethod] = intMetadataClass.newEvaluationMethod
-                           report[:evaluationMethod][:methodDescription] = xHorizontal.xpath('horizpar').text
-                        end
-                        unless xHorizontal.xpath('qhorizpa/horizpav').empty?
-                           quantitativeResult = intMetadataClass.newQuantitativeResult
-                           value = xHorizontal.xpath('qhorizpa/horizpav').text
-                           quantitativeResult[:values] << value
-                           report[:quantitativeResult] << quantitativeResult
+                        # data quality 2.4.1.2 (qhorizpa) - Quantitative Horizontal Positional Accuracy Assessment
+                        xQuantitativeHorizontalAccuracy = xHorizontalAccuracy.xpath('./qhorizpa')
+                        unless xQuantitativeHorizontalAccuracy.empty?
+                           # data quality 2.4.1.2.1 (horizpav) - Horizontal Positional Accuracy Value
+                           xHorizontalAccuracyValue = xQuantitativeHorizontalAccuracy.xpath('horizpav')
+                           unless xHorizontalAccuracyValue.empty?
+                              quantitativeResult = intMetadataClass.newQuantitativeResult
+                              value = xHorizontalAccuracyValue.text
+                              quantitativeResult[:name] = 'Horizontal Positional Accuracy Value'
+                              quantitativeResult[:values] << value
+                              report[:quantitativeResult] << quantitativeResult
+                           end
+                           # data quality 2.4.1.2.2 (horizpae) - Horizontal Positional Accuracy Explanation
+                           xHorizontalAccuracyExplanation = xQuantitativeHorizontalAccuracy.xpath('horizpae')
+                           unless xHorizontalAccuracyExplanation.empty?
+                              descriptiveResult = intMetadataClass.newDescriptiveResult
+                              descriptiveResult[:name] = 'Horizontal Positional Accuracy Explanation'
+                              descriptiveResult[:statement] = xHorizontalAccuracyExplanation.text
+                              report[:descriptiveResult] << descriptiveResult
+                           end
                         end
                         hDataQuality[:report] << report
                      end
-                     # vertical positional accuracy
-                     xVertical = xPositionalAccuracy.xpath('./vertacc')
-                     unless xVertical.empty?
+                     # data quality 2.4.2 (vertacc) - Vertical Positional Accuracy
+                     xVerticalAccuracy = xPositionalAccuracy.xpath('./vertacc')
+                     unless xVerticalAccuracy.empty?
                         report = intMetadataClass.newDataQualityReport
-                        report[:type] = 'AbsoluteExternalPositionalAccuracy'
-                        unless xVertical.xpath('qvertpa/vertacce').empty?
-                           report[:qualityMeasure] = intMetadataClass.newQualityMeasure
-                           report[:qualityMeasure][:description] = xVertical.xpath('qvertpa/vertacce').text
-                           name = 'Vertical Positional Accuracy Report'
-                           report[:qualityMeasure][:nameOfMeasure] << name
-                        end
-                        unless xVertical.xpath('vertaccr').empty?
-                           report[:evaluationMethod] = intMetadataClass.newEvaluationMethod
-                           report[:evaluationMethod][:methodDescription] = xVertical.xpath('vertaccr').text
+                        report[:type] = 'DQ_AbsoluteExternalPositionalAccuracy'
+                        # data quality 2.4.2.1 (vertaccr) - Vertical Positional Accuracy Report
+                        xVerticalAccuracyReport = xVerticalAccuracy.xpath('./vertaccr')
+                        unless xVerticalAccuracyReport.empty?
+                           descriptiveResult = intMetadataClass.newDescriptiveResult
+                           descriptiveResult[:name] = 'Vertical Positional Accuracy Report'
+                           descriptiveResult[:statement] = xVerticalAccuracyReport.text
+                           report[:descriptiveResult] << descriptiveResult
                         end
-                        unless xVertical.xpath('qvertpa/vertaccv').empty?
-                           quantitativeResult = intMetadataClass.newQuantitativeResult
-                           value = xVertical.xpath('qvertpa/vertaccv').text
-                           quantitativeResult[:values] << value
-                           report[:quantitativeResult] << quantitativeResult
+                        # data quality 2.4.2.2 (qvertpa) - Quantitative Vertical Positional Accuracy Assessment
+                        xVerticalAccuracyAssessment = xVerticalAccuracy.xpath('./qvertpa')
+                        unless xVerticalAccuracyAssessment.empty?
+                           # data quality 2.4.2.2.1 (vertaccv) - Vertical Positional Accuracy Value
+                           xVerticalAccuracyValue = xVerticalAccuracyAssessment.xpath('vertaccv')
+                           unless xVerticalAccuracyValue.empty?
+                              quantitativeResult = intMetadataClass.newQuantitativeResult
+                              value = xVerticalAccuracyValue.text
+                              quantitativeResult[:name] = 'Vertical Positional Accuracy Value'
+                              quantitativeResult[:values] << value
+                              report[:quantitativeResult] << quantitativeResult
+                           end
+                           # data quality 2.4.2.2.2 (vertacce) - Vertical Positional Accuracy Explanation
+                           xVerticalAccuracyExplanation = xVerticalAccuracyAssessment.xpath('vertacce')
+                           unless xVerticalAccuracyExplanation.empty?
+                              descriptiveResult = intMetadataClass.newDescriptiveResult
+                              descriptiveResult[:name] = 'Vertical Positional Accuracy Explanation'
+                              descriptiveResult[:statement] = xVerticalAccuracyExplanation.text
+                              report[:descriptiveResult] << descriptiveResult
+                           end
                         end
                         hDataQuality[:report] << report
                      end

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_acquisition.rb

@@ -0,0 +1,133 @@
+require_relative 'module_scope'
+require_relative 'module_objective'
+require_relative 'module_requirement'
+require_relative 'module_platform'
+require_relative 'module_instrument'
+require_relative 'module_operation'
+require_relative 'module_pass'
+require_relative 'module_event'
+require_relative 'module_environment'
+require_relative 'module_plan'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module MdJson
+ 
+            module Acquisition
+ 
+               def self.unpack(hAcquisition, responseObj, inContext = nil)
+ 
+                  @MessagePath = ADIWG::Mdtranslator::Readers::MdJson::MdJson
+
+                  outContext = 'acquisition'
+                  outContext = inContext + ' > ' + outContext unless inContext.nil?
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intAcquisition = intMetadataClass.newAcquisition
+ 
+                  if hAcquisition.has_key?('scope')
+                     unless hAcquisition['scope'].empty?
+                        hReturn = Scope.unpack(hAcquisition['scope'], responseObj, outContext)
+                        unless hReturn.nil?
+                           intAcquisition[:scope] = hReturn
+                        end
+                     end
+                  end
+
+                  if hAcquisition.has_key?('plan')
+                     aItems = hAcquisition['plan']
+                     aItems.each do |item|
+                        hReturn = Plan.unpack(item, responseObj, outContext)
+                        unless hReturn.nil?
+                           intAcquisition[:plans] << hReturn
+                        end
+                     end
+                  end
+
+                  if hAcquisition.has_key?('requirement')
+                     aItems = hAcquisition['requirement']
+                     aItems.each do |item|
+                        hReturn = Requirement.unpack(item, responseObj, outContext)
+                        unless hReturn.nil?
+                           intAcquisition[:requirements] << hReturn
+                        end
+                     end
+                  end
+
+                  if hAcquisition.has_key?('objective')
+                     aItems = hAcquisition['objective']
+                     aItems.each do |item|
+                        hReturn = Objective.unpack(item, responseObj, outContext)
+                        unless hReturn.nil?
+                           intAcquisition[:objectives] << hReturn
+                        end
+                     end
+                  end
+
+                  if hAcquisition.has_key?('platform')
+                     aItems = hAcquisition['platform']
+                     aItems.each do |item|
+                        hReturn = Platform.unpack(item, responseObj, outContext)
+                        unless hReturn.nil?
+                           intAcquisition[:platforms] << hReturn
+                        end
+                     end
+                  end
+
+                  if hAcquisition.has_key?('instrument')
+                     aItems = hAcquisition['instrument']
+                     aItems.each do |item|
+                        hReturn = Instrument.unpack(item, responseObj, outContext)
+                        unless hReturn.nil?
+                           intAcquisition[:instruments] << hReturn
+                        end
+                     end
+                  end
+
+                  if hAcquisition.has_key?('operation')
+                     aItems = hAcquisition['operation']
+                     aItems.each do |item|
+                        hReturn = Operation.unpack(item, responseObj, outContext)
+                        unless hReturn.nil?
+                           intAcquisition[:operations] << hReturn
+                        end
+                     end
+                  end
+
+                  if hAcquisition.has_key?('event')
+                     aItems = hAcquisition['event']
+                     aItems.each do |item|
+                        hReturn = Event.unpack(item, responseObj, outContext)
+                        unless hReturn.nil?
+                           intAcquisition[:events] << hReturn
+                        end
+                     end
+                  end
+
+                  if hAcquisition.has_key?('pass')
+                     aItems = hAcquisition['pass']
+                     aItems.each do |item|
+                        hReturn = Pass.unpack(item, responseObj, outContext)
+                        unless hReturn.nil?
+                           intAcquisition[:passes] << hReturn
+                        end
+                     end
+                  end
+                  
+                  if hAcquisition.has_key?('environment')
+                     intAcquisition[:environment] = Environment.unpack(hAcquisition['environment'], responseObj, outContext)
+                  end
+                  
+                  return intAcquisition
+
+               end
+
+            end
+ 
+         end
+      end
+   end
+end
+ 

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_conformanceResult.rb

@@ -23,6 +23,11 @@ module ADIWG
               intConformanceResult[:scope] = Scope.unpack(hConformanceResult['scope'], responseObj)
             end
 
+            # name
+            if hConformanceResult.has_key?('name')
+              intConformanceResult[:name] = hConformanceResult['name']
+            end
+
             #specification
             if hConformanceResult.has_key?('specification')
               intConformanceResult[:specification] = Citation.unpack(hConformanceResult['specification'], responseObj)

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_coverageResult.rb

@@ -26,6 +26,10 @@ module ADIWG
               intResult[:scope] = Scope.unpack(hResult['scope'], responseObj)
             end
 
+            # name
+            if hResult.has_key?('name')
+              intResult[:name] = hResult['name']
+            end
 
             # spatialRepresentationType
             if hResult.has_key?('spatialRepresentationType')

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_dataQuality.rb

@@ -35,6 +35,13 @@ module ADIWG
               end
             end
 
+            if hDataQuality.has_key?('systemIdentifier')
+              systemIdentifier = hDataQuality['systemIdentifier']
+              intDataQuality[:systemIdentifier] = {}
+              intDataQuality[:systemIdentifier][:uid] = systemIdentifier['uid']
+              intDataQuality[:systemIdentifier][:label] = systemIdentifier['label']
+            end
+
             if hDataQuality.has_key?('standaloneQualityReport')
               hObject = hDataQuality['standaloneQualityReport']
               unless hObject.empty?

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_descriptiveResult.rb

@@ -25,6 +25,10 @@ module ADIWG
               intResult[:scope] = Scope.unpack(hResult['scope'], responseObj)
             end
 
+            if hResult.has_key?('name')
+              intResult[:name] = hResult['name']
+            end
+
             if hResult.has_key?('statement')
               intResult[:statement] = hResult['statement']
             end