Feature/acquisition (v2.21.0)

Gemfile.lock

@@ -1,17 +1,16 @@
 PATH
   remote: .
   specs:
-    adiwg-mdtranslator (2.20.0.pre.beta.5)
-      adiwg-mdcodes (= 2.10.0)
-      adiwg-mdjson_schemas (= 2.9.5)
+    adiwg-mdtranslator (2.21.0.pre.beta.1)
+      adiwg-mdcodes (= 2.10.1)
+      adiwg-mdjson_schemas (= 2.10.1)
       builder (~> 3.2)
       coderay (~> 1.1)
       jbuilder (~> 2.5)
       json (~> 2.0)
       json-schema (~> 2.7)
       kramdown (>= 1.13, < 3.0)
       nokogiri (~> 1.15)
-      nokogiri (~> 1.15)
       thor (~> 0.19)
       uuidtools (~> 2.1)
 
@@ -36,10 +35,9 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    adiwg-mdcodes (2.10.0)
-    adiwg-mdcodes (2.10.0)
+    adiwg-mdcodes (2.10.1)
       json (~> 2.0)
-    adiwg-mdjson_schemas (2.9.5)
+    adiwg-mdjson_schemas (2.10.1)
     base64 (0.2.0)
     bigdecimal (3.1.8)
     builder (3.2.4)

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.5"
-   spec.add_runtime_dependency "adiwg-mdcodes", "2.10.0"
+   spec.add_runtime_dependency "adiwg-mdjson_schemas", "2.10.1"
+   spec.add_runtime_dependency "adiwg-mdcodes", "2.10.1"
    spec.add_runtime_dependency "jbuilder", "~> 2.5"
    spec.add_runtime_dependency "kramdown", ">= 1.13", "< 3.0"
    spec.add_runtime_dependency "coderay", "~> 1.1"

lib/adiwg/mdtranslator/internal/internal_metadata_obj.rb

@@ -143,7 +143,8 @@ def newMetadata
          associatedResources: [],
          additionalDocuments: [],
          funding: [],
-         dataQuality: []
+         dataQuality: [],
+         acquisitions: []
       }
    end
 
@@ -158,6 +159,7 @@ def newSchema
    # acquisition ----------------------------
    def newAcquisition
       {
+         scope: {},
          plans: [],
          requirements: [],
          objectives: [],
@@ -175,19 +177,23 @@ def newEnvironment
          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 @@ def newInstrument
          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 @@ def newPlan
    def newOperation
       {
          operationId: nil,
+         description: nil,
          citation: {},
          identifier: {},
          status: nil,
          operationType: nil,
          objectives: [],
-         parentOperations: nil,
+         parentOperation: {},
          childOperations: [],
-         plan: nil,
+         plan: {},
          platforms: [],
          significantEvents: []
       }
@@ -267,14 +296,23 @@ def newRequirement
       }
    end
 
+   def newRevision
+      {
+         description: nil,
+         responsibleParty: {},
+         dateInfo: []
+      }
+   end
+
    def newPlatform
       {
          platformId: nil,
          citation: {},
          identifier: {},
          description: nil,
          sponsors: [],
-         instruments: []
+         instruments: [],
+         history: []
       }
    end
 

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
+

lib/adiwg/mdtranslator/readers/mdJson/modules/module_dataDictionary.rb

@@ -38,6 +38,14 @@ def self.unpack(hDictionary, responseObj)
                   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']

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