module_source.rb in adiwg-mdtranslator-2.16.1

- old
+ new

@@ -1,9 +1,10 @@
 # unpack source
 # Reader - ADIwg JSON to internal data structure
 
 # History:
+#  Stan Smith 2019-09-22 add LE_Source elements
 #  Stan Smith 2018-06-25 refactored error and warning messaging
 #  Stan Smith 2016-10-17 refactored for mdJson 2.0
 #  Stan Smith 2015-07-14 refactored to remove global namespace constants
 #  Stan Smith 2015-06-22 replace global ($response) with passed in object (responseObj)
 #  Stan Smith 2014-12-15 refactored to handle namespacing readers and writers
@@ -13,10 +14,12 @@
 require_relative 'module_citation'
 require_relative 'module_processStep'
 require_relative 'module_spatialReference'
 require_relative 'module_scope'
 require_relative 'module_spatialResolution'
+require_relative 'module_identifier'
+require_relative 'module_nominalResolution'
 
 module ADIWG
    module Mdtranslator
       module Readers
          module MdJson
@@ -72,11 +75,11 @@
                   if hSource.has_key?('metadataCitation')
                      aCitation = hSource['metadataCitation']
                      aCitation.each do |item|
                         hCitation = Citation.unpack(item, responseObj, outContext)
                         unless hCitation.nil?
-                           intSource[:metadataCitation] << hCitation
+                           intSource[:metadataCitations] << hCitation
                         end
                      end
                   end
 
                   # source - spatial resolution
@@ -110,17 +113,39 @@
                            intSource[:sourceSteps] << hStep
                         end
                      end
                   end
 
-                  # source - scope {scope}
+                  # source - scope {scope} (required if)
                   if hSource.has_key?('scope')
                      hObject = hSource['scope']
                      unless hObject.empty?
                         hReturn = Scope.unpack(hObject, responseObj, outContext)
                         unless hReturn.nil?
                            intSource[:scope] = hReturn
                            haveRequired = true
+                        end
+                     end
+                  end
+
+                  # source - processed level {identifier}
+                  if hSource.has_key?('processedLevel')
+                     hObject = hSource['processedLevel']
+                     unless hObject.empty?
+                        hReturn = Identifier.unpack(hObject, responseObj, outContext)
+                        unless hReturn.nil?
+                           intSource[:processedLevel] = hReturn
+                        end
+                     end
+                  end
+
+                  # source - resolution {nominalResolution}
+                  if hSource.has_key?('resolution')
+                     hObject = hSource['resolution']
+                     unless hObject.empty?
+                        hReturn = NominalResolution.unpack(hObject, responseObj, outContext)
+                        unless hReturn.nil?
+                           intSource[:resolution] = hReturn
                         end
                      end
                   end
 
                   unless haveRequired