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

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_metadata.rb

@@ -13,6 +13,7 @@ require_relative 'mdJson_associatedResource'
 require_relative 'mdJson_additionalDocumentation'
 require_relative 'mdJson_funding'
 require_relative 'mdJson_dataQuality'
+require_relative 'mdJson_acquisition'
 
 module ADIWG
    module Mdtranslator
@@ -34,6 +35,7 @@ module ADIWG
                      json.associatedResource @Namespace.json_map(hMetadata[:associatedResources], AssociatedResource)
                      json.additionalDocumentation @Namespace.json_map(hMetadata[:additionalDocuments], AdditionalDocument)
                      json.funding @Namespace.json_map(hMetadata[:funding], Funding)
+                     json.acquisition @Namespace.json_map(hMetadata[:acquisitions], Acquisition)
                   end
 
                end # build

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_objective.rb

@@ -0,0 +1,37 @@
+require 'jbuilder'
+require_relative 'mdJson_identifier'
+require_relative 'mdJson_extent'
+require_relative 'mdJson_event'
+require_relative 'mdJson_pass'
+require_relative 'mdJson_instrument'
+
+module ADIWG
+    module Mdtranslator
+        module Writers
+            module MdJson
+
+                module Objective
+
+                    @Namespace = ADIWG::Mdtranslator::Writers::MdJson
+
+                    def self.build(hObjective)
+
+                        Jbuilder.new do |json|
+                            json.objectiveId hObjective[:objectiveId]
+                            json.identifier @Namespace.json_map(hObjective[:identifiers], Identifier)
+                            json.priority hObjective[:priority] unless hObjective[:priority].nil?
+                            json.objectiveType hObjective[:objectiveTypes] unless hObjective[:objectiveTypes].empty?
+                            json.function hObjective[:functions] unless hObjective[:functions].empty?
+                            json.extent @Namespace.json_map(hObjective[:extents], Extent) unless hObjective[:extents].empty?
+                            json.objectiveOccurence @Namespace.json_map(hObjective[:occurrences], Event) unless hObjective[:occurrences].empty?
+                            json.pass @Namespace.json_map(hObjective[:passes], Pass) unless hObjective[:passes].empty?
+                            json.sensingInstrument @Namespace.json_map(hObjective[:sensingInstruments], Instrument) unless hObjective[:sensingInstruments].empty?
+                        end
+
+                    end
+                end # Objective
+
+            end
+        end
+    end
+end

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_onlineResource.rb

@@ -19,10 +19,10 @@ module ADIWG
                   Jbuilder.new do |json|
                      json.uri hOlRes[:olResURI]
                      json.name hOlRes[:olResName]
+                     json.protocol hOlRes[:olResProtocol]
                      json.description hOlRes[:olResDesc]
                      json.function hOlRes[:olResFunction]
                      json.applicationProfile hOlRes[:olResApplicationProfile]
-                     json.protocol hOlRes[:olResProtocol]
                      json.protocolRequest hOlRes[:olResProtocolRequest]
                   end
 

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_operation.rb

@@ -0,0 +1,34 @@
+require 'jbuilder'
+
+module ADIWG
+    module Mdtranslator
+        module Writers
+            module MdJson
+
+                module Operation
+
+                    @Namespace = ADIWG::Mdtranslator::Writers::MdJson
+
+                    def self.build(hOperation)
+
+                        Jbuilder.new do |json|
+                            json.operationId hOperation[:operationId]
+                            json.description hOperation[:description] unless hOperation[:description].nil?
+                            json.citation Citation.build(hOperation[:citation]) unless hOperation[:citation].empty?
+                            json.identifier Identifier.build(hOperation[:identifier])
+                            json.status hOperation[:status]
+                            json.operationType hOperation[:operationType] unless hOperation[:operationType].nil?
+                            json.objective @Namespace.json_map(hOperation[:objectives], Objective) unless hOperation[:objectives].empty?
+                            json.parentOperation Operation.build(hOperation[:parentOperation]) unless hOperation[:parentOperation].empty?
+                            json.childOperation @Namespace.json_map(hOperation[:childOperations], Operation) unless hOperation[:childOperations].empty?
+                            json.plan Plan.build(hOperation[:plan]) unless hOperation[:plan].empty?
+                            json.platform @Namespace.json_map(hOperation[:platforms], Platform) unless hOperation[:platforms].empty?
+                            json.significantEvent @Namespace.json_map(hOperation[:significantEvents], Event) unless hOperation[:significantEvents].empty?
+                        end
+
+                    end
+                end # Operation
+            end
+        end
+    end
+end

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_pass.rb

@@ -0,0 +1,30 @@
+require 'jbuilder'
+require_relative 'mdJson_identifier'
+require_relative 'mdJson_extent'
+require_relative 'mdJson_event'
+
+module ADIWG
+    module Mdtranslator
+        module Writers
+            module MdJson
+
+                module Pass
+
+                    @Namespace = ADIWG::Mdtranslator::Writers::MdJson
+
+                    def self.build(hPass)
+
+                        Jbuilder.new do |json|
+                            json.passId hPass[:passId]
+                            json.identifier Identifier.build(hPass[:identifier])
+                            json.extent Extent.build(hPass[:extent]) unless hPass[:extent].empty?
+                            json.relatedEvent @Namespace.json_map(hPass[:relatedEvents], Event) unless hPass[:relatedEvents].empty?
+                        end
+
+                    end
+                end # Pass
+
+            end
+        end
+    end
+end

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_plan.rb

@@ -0,0 +1,32 @@
+require 'jbuilder'
+require_relative 'mdJson_citation'
+require_relative 'mdJson_operation'
+require_relative 'mdJson_requirement'
+
+module ADIWG
+    module Mdtranslator
+        module Writers
+            module MdJson
+
+                module Plan
+
+                    @Namespace = ADIWG::Mdtranslator::Writers::MdJson
+
+                    def self.build(hPlan)
+
+                        Jbuilder.new do |json|
+                            json.planId hPlan[:planId]
+                            json.planType hPlan[:planType] unless hPlan[:planType].nil?
+                            json.status hPlan[:status]
+                            json.citation Citation.build(hPlan[:citation])
+                            json.planOperation @Namespace.json_map(hPlan[:operations], Operation)
+                            json.satisfiedRequirement @Namespace.json_map(hPlan[:satisfiedRequirements], Requirement)
+
+                        end
+
+                    end
+                end # Plan
+            end
+        end
+    end
+end

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_platform.rb

@@ -0,0 +1,35 @@
+require 'jbuilder'
+require_relative 'mdJson_citation'
+require_relative 'mdJson_identifier'
+require_relative 'mdJson_responsibleParty'
+require_relative 'mdJson_instrument'
+require_relative 'mdJson_instrumentationEventList'
+
+module ADIWG
+    module Mdtranslator
+        module Writers
+            module MdJson
+
+                module Platform
+
+                    @Namespace = ADIWG::Mdtranslator::Writers::MdJson
+
+                    def self.build(hPlatform)
+
+                        Jbuilder.new do |json|
+                            json.platformId hPlatform[:platformId]
+                            json.citation Citation.build(hPlatform[:citation]) unless hPlatform[:citation].empty?
+                            json.identifier Identifier.build(hPlatform[:identifier])
+                            json.description hPlatform[:description]
+                            json.sponsor @Namespace.json_map(hPlatform[:sponsors], ResponsibleParty) unless hPlatform[:sponsors].empty?
+                            json.instrument @Namespace.json_map(hPlatform[:instruments], Instrument)
+                            json.history @Namespace.json_map(hPlatform[:history], InstrumentationEventList) unless hPlatform[:history].empty?
+                        end
+
+                    end
+                end # Platform
+
+            end
+        end
+    end
+end

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_quantitativeResult.rb

@@ -9,11 +9,12 @@ module ADIWG
         module QuantitativeResult
           def self.build(hResult)
             Jbuilder.new do |json|
-              json.dateTime hResult[:dateTime]
-              json.scope Scope.build(hResult[:scope]) if hResult[:scope]
-              json.value hResult[:values]
-              json.valueUnits hResult[:valueUnits]
-              json.valueRecordType hResult[:valueRecordType]
+              json.dateTime hResult[:dateTime] unless hResult[:dateTime].nil?
+              json.scope Scope.build(hResult[:scope]) unless hResult[:scope].empty?
+              json.name hResult[:name] unless hResult[:name].nil?
+              json.value hResult[:values] unless hResult[:values].empty?
+              json.valueUnits hResult[:valueUnits] unless hResult[:valueUnits].nil?
+              json.valueRecordType hResult[:valueRecordType] unless hResult[:valueRecordType].nil?
             end
           end
         end

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_requestedDate.rb

@@ -0,0 +1,26 @@
+require 'jbuilder'
+require_relative 'mdJson_dateTime'
+
+module ADIWG
+    module Mdtranslator
+        module Writers
+            module MdJson
+
+                module RequestedDate
+
+                    @Namespace = ADIWG::Mdtranslator::Writers::MdJson
+
+                    def self.build(hRequestedDate)
+
+                        Jbuilder.new do |json|
+                            json.requestedDateOfCollection DateTime.build(hRequestedDate[:requestedDateOfCollection])
+                            json.latestAcceptableDate DateTime.build(hRequestedDate[:latestAcceptableDate])
+                        end
+
+                    end
+                end # Requested Date
+
+            end
+        end
+    end
+end

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_requirement.rb

@@ -0,0 +1,36 @@
+require 'jbuilder'
+require_relative 'mdJson_citation'
+require_relative 'mdJson_identifier'
+require_relative 'mdJson_responsibleParty'
+require_relative 'mdJson_requestedDate'
+require_relative 'mdJson_plan'
+
+module ADIWG
+    module Mdtranslator
+        module Writers
+            module MdJson
+
+                module Requirement
+
+                    @Namespace = ADIWG::Mdtranslator::Writers::MdJson
+
+                    def self.build(hRequirement)
+
+                        Jbuilder.new do |json|
+                            json.requirementId hRequirement[:requirementId]
+                            json.citation Citation.build(hRequirement[:citation])
+                            json.identifier Identifier.build(hRequirement[:identifier])
+                            json.requestor @Namespace.json_map(hRequirement[:requestors], ResponsibleParty)
+                            json.recipient @Namespace.json_map(hRequirement[:recipients], ResponsibleParty)
+                            json.priority hRequirement[:priority]
+                            json.requestedDate RequestedDate.build(hRequirement[:requestedDate])
+                            json.expiryDate hRequirement[:expiryDate]
+                            json.satisfiedPlan @Namespace.json_map(hRequirement[:satisfiedPlans], Plan)
+                        end
+
+                    end
+                end # Requirement
+            end
+        end
+    end
+end

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_resourceInfo.rb

@@ -42,8 +42,8 @@ module ADIWG
                      json.abstract hResInfo[:abstract]
                      json.shortAbstract hResInfo[:shortAbstract]
                      json.purpose hResInfo[:purpose]
-                     json.credit hResInfo[:credits] unless hResInfo[:credits].empty?
                      json.timePeriod TimePeriod.build(hResInfo[:timePeriod]) unless hResInfo[:timePeriod].empty?
+                     json.credit hResInfo[:credits] unless hResInfo[:credits].empty?
                      json.status hResInfo[:status] unless hResInfo[:status].empty?
                      json.pointOfContact @Namespace.json_map(hResInfo[:pointOfContacts], ResponsibleParty)
                      json.spatialReferenceSystem @Namespace.json_map(hResInfo[:spatialReferenceSystems], SpatialReference)

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_revision.rb

@@ -0,0 +1,28 @@
+require 'jbuilder'
+require_relative 'mdJson_responsibleParty'
+require_relative 'mdJson_dateTime'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module MdJson
+
+            module Revision
+
+               @Namespace = ADIWG::Mdtranslator::Writers::MdJson
+
+               def self.build(hRevision)
+                  
+                  Jbuilder.new do |json|
+                     json.description hRevision[:description]
+                     json.responsibleParty @Namespace.json_map(hRevision[:responsibleParties], ResponsibleParty)
+                     json.dateInfo @Namespace.json_map(hRevision[:dateInfo], DateTime)
+                  end
+
+               end
+            end # Revision
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_citation.rb

@@ -12,15 +12,15 @@ module ADIWG
 
             module Citation
 
-               # build from citation as follows ...
-               # names, [] {citation.responsibleParty[]}
-               # dates(type), [] {citation.dates[]}
-               # title, {citation.title}
-               # uri, [] {citation.onlineResource[]}
                def self.build(hCitation)
 
                   citation = ''
 
+                  if hCitation[:otherDetails].length > 0
+                     citation = hCitation[:otherDetails][0]
+                     return citation
+                  end
+
                   # names
                   aParties = []
                   hCitation[:responsibleParties].each do |hResponsibility|
@@ -45,32 +45,15 @@ module ADIWG
                         unless hContact[:name].nil?
                            sbRole = Codelists.codelist_adiwg2sb('role_adiwg2sb', hParty[:role])
                            sbRole = sbRole.nil? ? hParty[:role] : sbRole
-                           citation += hContact[:name] + '(' + sbRole + '), '
+                           if sbRole.downcase == 'author'
+                              citation += hContact[:name] + ', '
+                           end
                         end
                      end
                   end
 
-                  # dates
-                  hCitation[:dates].each do |hDate|
-                     dateStr = AdiwgDateTimeFun.stringDateFromDateObject(hDate)
-                     dateType = Codelists.codelist_adiwg2sb('date_adiwg2sb', hDate[:dateType])
-                     unless dateType.nil?
-                        citation += dateStr + '(' + dateType + '), '
-                     end
-                  end
-
                   # title
-                  citation += hCitation[:title] + ', '
-
-                  # uri
-                  hCitation[:onlineResources].each do |hOnline|
-                     citation += hOnline[:olResURI] + ', '
-                  end
-
-                  # clean off last comma
-                  if citation.length > 0
-                     citation = citation[0...-2]
-                  end
+                  citation += hCitation[:title]
 
                   citation
 

data/lib/adiwg/mdtranslator/writers/simple_html/sections/html_dataQuality.rb

@@ -62,7 +62,7 @@ module ADIWG
                   hDataQuality[:report].each do |report|
                     @html.div(:class =>'block') do
                       @html.div do
-                        @html.h5('Report', {'class' => 'h5'})
+                        @html.h5(report[:type], {'class' => 'h5'})
                         dataQualityReportClass.writeHtml(report)
                       end
                     end

data/lib/adiwg/mdtranslator_cli.rb

@@ -39,7 +39,7 @@ and to choose the level of validation for mdJson input files.
                  :enum => %w{mdJson sbJson fgdc}, :required => true
    method_option :writer, :aliases => '-w',
                  :desc => 'Writer to create your output metadata file, leave blank to validate input only',
-                 :enum => %w{fgdc html iso19110 iso19115_1 iso19115_2 iso19115_3 mdJson sbJson simple_html dcat_us}
+                 :enum => %w{fgdc html iso19110 iso19115_1 iso19115_2 iso19115_3 mdJson sbJson simple_html }
    method_option :validate, :aliases => '-v', :desc => 'Specify level of validation to be performed',
                  :enum => %w{none normal strict}, :default => 'normal'
    method_option :forceValid, :aliases => '-f', :desc => 'Insert tags for required elements missing from input',