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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 673fe90b50664af5833748a5fda2bebc8673e4ddeef1a2178d910edbabd93428
-  data.tar.gz: e8a7c9a20ffc9d05a6eddaef3a8f17ff466120d467511f95030689d0526449ae
+  metadata.gz: 24a46249aaab639bcbfcf96546503546a9474db0aaf8d3d9136190cbd7ae2c19
+  data.tar.gz: da85309bcd6c126043a653d5e436535d7d29c4eb2107a416acb1cdc4575d3696
 SHA512:
-  metadata.gz: 02bebf2b017b6a5f521a33e65a538d35ea7fc50a004abe6cc01672127aa6919846b0abc55de9ba812e1aab94c5f29291e780b9fd0272f4b7de9de93b99751910
-  data.tar.gz: bd92dc9a82ff2974b0b7543dea038401c902f970f35d43775776c6509edb662dccd5cfa52f6dddaa373e92af233f0b24ae1683ee91c82dc9933b32cd90a1509b
+  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.10)
-      adiwg-mdcodes (= 2.10.1)
-      adiwg-mdjson_schemas (= 2.10.1)
+    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)
@@ -35,9 +35,9 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    adiwg-mdcodes (2.10.1)
+    adiwg-mdcodes (2.10.0)
       json (~> 2.0)
-    adiwg-mdjson_schemas (2.10.1)
+    adiwg-mdjson_schemas (2.10.0.pre.beta.5)
     base64 (0.2.0)
     bigdecimal (3.1.8)
     builder (3.2.4)

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.10.1"
-   spec.add_runtime_dependency "adiwg-mdcodes", "2.10.1"
+   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

@@ -56,10 +56,8 @@ module ADIWG
                         # data quality 2.1.2.2 (attracce) - Attribute Accuracy Explanation
                         xEvaluationMethod = xQuantitativeAccuracy.xpath('./attracce')
                         unless xEvaluationMethod.empty?
-                           evaluationMethod = intMetadataClass.newEvaluationMethod
-                           evaluationMethod[:name] = 'Attribute Accuracy Explanation'
-                           evaluationMethod[:methodDescription] = xEvaluationMethod.text
-                           report[:evaluationMethod] << evaluationMethod
+                           report[:evaluationMethod] = intMetadataClass.newEvaluationMethod
+                           report[:evaluationMethod][:methodDescription] = xEvaluationMethod.text
                         end
                         hDataQuality[:report] << report unless report[:quantitativeResult].empty? && report[:evaluationMethod].empty?
                      end
@@ -103,29 +101,35 @@ module ADIWG
                      unless xHorizontalAccuracy.empty?
                         report = intMetadataClass.newDataQualityReport
                         report[:type] = 'DQ_AbsoluteExternalPositionalAccuracy'
-                        # Combine Horizontal Positional Accuracy Report and Explanation
-                        descriptive_result_text = ''
+                        # data quality 2.4.1.1 (horizpar) - Horizontal Positional Accuracy Report
                         xHorizontalAccuracyReport = xHorizontalAccuracy.xpath('./horizpar')
                         unless xHorizontalAccuracyReport.empty?
-                           descriptive_result_text += xHorizontalAccuracyReport.text
+                           descriptiveResult = intMetadataClass.newDescriptiveResult
+                           descriptiveResult[:name] = 'Horizontal Positional Accuracy Report'
+                           descriptiveResult[:statement] = xHorizontalAccuracyReport.text
+                           report[:descriptiveResult] << descriptiveResult
                         end
+                        # 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?
-                              descriptive_result_text += " Value: #{xHorizontalAccuracyValue.text}"
+                              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?
-                              descriptive_result_text += " Explanation: #{xHorizontalAccuracyExplanation.text}"
+                              descriptiveResult = intMetadataClass.newDescriptiveResult
+                              descriptiveResult[:name] = 'Horizontal Positional Accuracy Explanation'
+                              descriptiveResult[:statement] = xHorizontalAccuracyExplanation.text
+                              report[:descriptiveResult] << descriptiveResult
                            end
                         end
-                        unless descriptive_result_text.empty?
-                           descriptiveResult = intMetadataClass.newDescriptiveResult
-                           descriptiveResult[:name] = 'Horizontal Positional Accuracy Report'
-                           descriptiveResult[:statement] = descriptive_result_text
-                           report[:descriptiveResult] << descriptiveResult
-                        end
                         hDataQuality[:report] << report
                      end
                      # data quality 2.4.2 (vertacc) - Vertical Positional Accuracy
@@ -133,29 +137,35 @@ module ADIWG
                      unless xVerticalAccuracy.empty?
                         report = intMetadataClass.newDataQualityReport
                         report[:type] = 'DQ_AbsoluteExternalPositionalAccuracy'
-                        # Combine Vertical Positional Accuracy Report and Explanation
-                        descriptive_result_text = ''
+                        # data quality 2.4.2.1 (vertaccr) - Vertical Positional Accuracy Report
                         xVerticalAccuracyReport = xVerticalAccuracy.xpath('./vertaccr')
                         unless xVerticalAccuracyReport.empty?
-                           descriptive_result_text += xVerticalAccuracyReport.text
+                           descriptiveResult = intMetadataClass.newDescriptiveResult
+                           descriptiveResult[:name] = 'Vertical Positional Accuracy Report'
+                           descriptiveResult[:statement] = xVerticalAccuracyReport.text
+                           report[:descriptiveResult] << descriptiveResult
                         end
+                        # 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?
-                              descriptive_result_text += " Value: #{xVerticalAccuracyValue.text}"
+                              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?
-                              descriptive_result_text += " Explanation: #{xVerticalAccuracyExplanation.text}"
+                              descriptiveResult = intMetadataClass.newDescriptiveResult
+                              descriptiveResult[:name] = 'Vertical Positional Accuracy Explanation'
+                              descriptiveResult[:statement] = xVerticalAccuracyExplanation.text
+                              report[:descriptiveResult] << descriptiveResult
                            end
                         end
-                        unless descriptive_result_text.empty?
-                           descriptiveResult = intMetadataClass.newDescriptiveResult
-                           descriptiveResult[:name] = 'Vertical Positional Accuracy Report'
-                           descriptiveResult[:statement] = descriptive_result_text
-                           report[:descriptiveResult] << descriptiveResult
-                        end
                         hDataQuality[:report] << report
                      end
                   end
@@ -180,4 +190,4 @@ module ADIWG
          end
       end
    end
-end
+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_dataDictionary.rb

@@ -38,14 +38,6 @@ module ADIWG
                   intMetadataClass = InternalMetadata.new
                   intDictionary = intMetadataClass.newDataDictionary
 
-                  # dictionary - id 
-                  if hDictionary.has_key?('dictionaryId')
-                     s = hDictionary['dictionaryId']
-                     if s != ''
-                        intDictionary[:dictionaryId] = s
-                     end
-                  end
-
                   # dictionary - description
                   if hDictionary.has_key?('description')
                      s = hDictionary['description']

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

@@ -0,0 +1,47 @@
+module ADIWG
+    module Mdtranslator
+        module Readers
+            module MdJson
+  
+                module Environment
+                    def self.unpack(hEnvironment, responseObj, inContext = nil)
+
+                        intMetadataClass = InternalMetadata.new
+                        intEnvironment = intMetadataClass.newEnvironment
+
+                        outContext = 'environment'
+                        outContext = inContext + ' > ' + outContext unless inContext.nil?
+
+                        if hEnvironment.has_key?('averageAirTemperature')
+                            intEnvironment[:averageAirTemperature] = hEnvironment['averageAirTemperature']
+                        end
+
+                        if hEnvironment.has_key?('maxRelativeHumidity')
+                            intEnvironment[:maxRelativeHumidity] = hEnvironment['maxRelativeHumidity']
+                        end
+
+                        if hEnvironment.has_key?('maxAltitude')
+                            intEnvironment[:maxAltitude] = hEnvironment['maxAltitude']
+                        end
+
+                        if hEnvironment.has_key?('meteorologicalConditions')
+                            intEnvironment[:meteorologicalConditions] = hEnvironment['meteorologicalConditions']
+                        end
+
+                        if hEnvironment.has_key?('solarAzimuth')
+                            intEnvironment[:solarAzimuth] = hEnvironment['solarAzimuth']
+                        end
+
+                        if hEnvironment.has_key?('solarElevation')
+                            intEnvironment[:solarElevation] = hEnvironment['solarElevation']
+                        end
+
+                        intEnvironment
+
+                    end
+                end
+
+            end
+        end
+    end
+end

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

@@ -0,0 +1,88 @@
+require_relative 'module_identifier'
+require_relative 'module_dateTime'
+require_relative 'module_objective'
+require_relative 'module_pass'
+require_relative 'module_instrument'
+
+module ADIWG
+    module Mdtranslator
+        module Readers
+            module MdJson
+  
+                module Event
+                    def self.unpack(hEvent, responseObj, inContext = nil)
+                        @MessagePath = ADIWG::Mdtranslator::Readers::MdJson::MdJson
+
+                        intMetadataClass = InternalMetadata.new
+                        intEvent = intMetadataClass.newEvent
+
+                        outContext = 'Event'
+                        outContext = inContext + ' > ' + outContext unless inContext.nil?
+
+                        if hEvent.has_key?('eventId')
+                            intEvent[:eventId] = hEvent['eventId']
+                        else
+                            @MessagePath.issueWarning(40, responseObj, outContext)
+                        end
+
+                        if hEvent.has_key?('identifier')
+                            intEvent[:identifier] = Identifier.unpack(hEvent['identifier'], responseObj, outContext)
+                        else
+                            @MessagePath.issueWarning(40, responseObj, outContext)
+                        end
+
+                        if hEvent.has_key?('trigger')
+                            intEvent[:trigger] = hEvent['trigger']
+                        else
+                            @MessagePath.issueWarning(40, responseObj, outContext)
+                        end
+
+                        if hEvent.has_key?('context')
+                            intEvent[:context] = hEvent['context']
+                        else
+                            @MessagePath.issueWarning(40, responseObj, outContext)
+                        end
+
+                        if hEvent.has_key?('sequence')
+                            intEvent[:sequence] = hEvent['sequence']
+                        else
+                            @MessagePath.issueWarning(40, responseObj, outContext,)
+                        end
+
+                        if hEvent.has_key?('time')
+                            intEvent[:time] = DateTime.unpack(hEvent['time'], responseObj, outContext)
+                        else
+                            @MessagePath.issueWarning(40, responseObj, outContext)
+                        end
+
+                        if hEvent.has_key?('expectedObjective')
+                            hEvent['expectedObjective'].each do |item|
+                                hReturn = Objective.unpack(item, responseObj, outContext)
+                                unless hReturn.nil?
+                                    intEvent[:expectedObjectives] << hReturn
+                                end
+                            end
+                        end
+
+                        if hEvent.has_key?('relatedPass')
+                            intEvent[:relatedPass] = Pass.unpack(hEvent['relatedPass'], responseObj, outContext)
+                        end
+
+                        if hEvent.has_key?('relatedSensor')
+                            hEvent['relatedSensor'].each do |item|
+                                hReturn = Instrument.unpack(item, responseObj, outContext)
+                                unless hReturn.nil?
+                                    intEvent[:relatedSensors] << hReturn
+                                end
+                            end
+                        end
+
+                        intEvent
+
+                    end
+                end
+
+            end
+        end
+    end
+end