adiwg-mdtranslator 2.18.2 → 2.19.0.pre.beta.7

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_referenceSystem.rb

@@ -1,6 +1,6 @@
 # ISO <<Class>> MD_ReferenceSystem
 # writer
-# 19115-1 output for XML
+# 19115-3 output for XML
 
 # History:
 # 	Stan Smith 2019-03-19 original script
@@ -12,14 +12,14 @@ require_relative 'class_identifier'
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class MD_ReferenceSystem
 
                def initialize(xml, hResponseObj)
                   @xml = xml
                   @hResponseObj = hResponseObj
-                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_1
+                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_3
                end
 
                def writeXML(hSystem, inContext = nil)

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_releasability.rb

@@ -1,5 +1,5 @@
 # ISO <<Class>> MD_Releasability
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 #   Stan Smith 2019-03-18 original script
@@ -10,7 +10,7 @@ require_relative 'class_codelist'
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class MD_Releasability
 

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_resolution.rb

@@ -1,5 +1,5 @@
 # ISO <<Class>> MD_Resolution
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 # 	Stan Smith 2019-03-21 original script
@@ -10,7 +10,7 @@ require_relative 'class_fraction'
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class MD_Resolution
 

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_responsibility.rb

@@ -1,10 +1,10 @@
 # ISO <<Class>> CI_Responsibility
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 # 	Stan Smith 2019-03-14 original script.
 
-require_relative '../iso19115_1_writer'
+require_relative '../iso19115_3_writer'
 require_relative 'class_codelist'
 require_relative 'class_extent'
 require_relative 'class_individual'
@@ -13,14 +13,14 @@ require_relative 'class_organization'
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class CI_Responsibility
 
                def initialize(xml, hResponseObj)
                   @xml = xml
                   @hResponseObj = hResponseObj
-                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_1
+                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_3
                end
 
                def writeXML(hResponsibility, inContext = nil)

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_sampleDimension.rb

@@ -1,24 +1,24 @@
 # ISO <<Class>> MD_SampleDimension attributes
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 # 	Stan Smith 2019-04-08 original script.
 
-require_relative '../iso19115_1_writer'
+require_relative '../iso19115_3_writer'
 require_relative 'class_unitsOfMeasure'
 require_relative 'class_rangeElementDescription'
 
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class MD_SampleDimension
 
                def initialize(xml, hResponseObj)
                   @xml = xml
                   @hResponseObj = hResponseObj
-                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_1
+                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_3
                end
 
                def writeXML(hAttribute, inContext = nil)

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_scope.rb

@@ -1,10 +1,10 @@
 # ISO <<Class>> MD_Scope
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 #  Stan Smith 2019-03-18 original script
 
-require_relative '../iso19115_1_writer'
+require_relative '../iso19115_3_writer'
 require_relative 'class_codelist'
 require_relative 'class_extent'
 require_relative 'class_scopeDescription'
@@ -12,14 +12,14 @@ require_relative 'class_scopeDescription'
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class MD_Scope
 
                def initialize(xml, responseObj)
                   @xml = xml
                   @hResponseObj = responseObj
-                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_1
+                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_3
                end
 
                def writeXML(hScope, inContext = nil)

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_scopeDescription.rb

@@ -1,5 +1,5 @@
 # ISO <<Class>> MD_ScopeDimension
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 #  Stan Smith 2019-03-16 original script
@@ -7,7 +7,7 @@
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class MD_ScopeDescription
 

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_securityConstraints.rb

@@ -1,24 +1,24 @@
 # ISO <<Class>> MD_SecurityConstraints
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 # 	Stan Smith 2019-03-18 original script.
 
-require_relative '../iso19115_1_writer'
+require_relative '../iso19115_3_writer'
 require_relative 'class_codelist'
 require_relative 'class_constraintCommon'
 
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class MD_SecurityConstraints
 
                def initialize(xml, hResponseObj)
                   @xml = xml
                   @hResponseObj = hResponseObj
-                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_1
+                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_3
                end
 
                def writeXML(hConstraint, inContext = nil)

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_series.rb

@@ -1,5 +1,5 @@
 # ISO <<Class>> CI_Series
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 #   Stan Smith 2019-03-15 original script
@@ -7,7 +7,7 @@
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class CI_Series
 

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_source.rb

@@ -1,5 +1,5 @@
 # ISO <<Abstract>> Source
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 # 	Stan Smith 2019-09-27 original script.
@@ -10,7 +10,7 @@ require_relative 'class_leSource'
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class Source
 

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_spatialRepresentation.rb

@@ -1,5 +1,5 @@
 # ISO <<Class>> CI_Series
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 #  Stan Smith 2019-04-16 original script
@@ -12,7 +12,7 @@ require_relative 'class_georeferenceable'
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class SpatialRepresentation
 

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_temporalExtent.rb

@@ -1,5 +1,5 @@
 # ISO <<Class>> EX_TemporalExtent
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 # 	Stan Smith 2019-03-19 original script
@@ -10,7 +10,7 @@ require_relative 'class_timePeriod'
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class EX_TemporalExtent
 

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_timeInstant.rb

@@ -1,5 +1,5 @@
 # ISO <<Class>> TimeInstant
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 # 	Stan Smith 2019-03-19 original script.
@@ -9,7 +9,7 @@ require_relative 'class_gmlIdentifier'
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class TimeInstant
 

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_timePeriod.rb

@@ -1,5 +1,5 @@
 # ISO <<Class>> TimePeriod
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 # 	Stan Smith 2019-03-19 original script.
@@ -9,7 +9,7 @@ require_relative 'class_gmlIdentifier'
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class TimePeriod
 

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_transferOptions.rb

@@ -1,5 +1,5 @@
 # ISO <<Class>> MD_DigitalTransferOptions
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 # 	Stan Smith 2019-04-10 original script
@@ -11,7 +11,7 @@ require_relative 'class_format'
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class MD_DigitalTransferOptions
 

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_unitsOfMeasure.rb

@@ -1,5 +1,5 @@
 # ISO <<Class>> UnitsOfMeasure
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 # 	Stan Smith 2019-04-08 copied from 19115_2 writer
@@ -12,7 +12,7 @@ require_relative 'class_definitionUnit'
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class UnitsOfMeasure
 

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_usage.rb

@@ -1,10 +1,10 @@
 # ISO <<Class>> MD_Usage
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 # 	Stan Smith 2019-03-25 original script.
 
-require_relative '../iso19115_1_writer'
+require_relative '../iso19115_3_writer'
 require_relative 'class_timeInstant'
 require_relative 'class_timePeriod'
 require_relative 'class_responsibility'
@@ -13,14 +13,14 @@ require_relative 'class_citation'
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class MD_Usage
 
                def initialize(xml, hResponseObj)
                   @xml = xml
                   @hResponseObj = hResponseObj
-                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_1
+                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_3
                end
 
                def writeXML(hUsage)

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_useConstraints.rb

@@ -1,5 +1,5 @@
 # ISO <<Class>> MD_Constraints (Use Constraint)
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 # 	Stan Smith 2019-03-18 original script
@@ -9,7 +9,7 @@ require_relative 'class_constraintCommon'
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class MD_Constraints
 

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_vectorRepresentation.rb

@@ -1,5 +1,5 @@
 # ISO <<Class>> MD_VectorSpatialRepresentation
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 # 	Stan Smith 2019-04-16 original script.
@@ -11,7 +11,7 @@ require_relative 'class_scope'
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class MD_VectorSpatialRepresentation
 

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/classes/class_verticalExtent.rb

@@ -1,23 +1,23 @@
 # ISO <<Class>> EX_VerticalExtent
-# 19115-1 writer output in XML
+# 19115-3 writer output in XML
 
 # History:
 # 	Stan Smith 2019-03-19 original script
 
-require_relative '../iso19115_1_writer'
+require_relative '../iso19115_3_writer'
 require_relative 'class_referenceSystem'
 
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             class EX_VerticalExtent
 
                def initialize(xml, hResponseObj)
                   @xml = xml
                   @hResponseObj = hResponseObj
-                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_1
+                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_3
                end
 
                def writeXML(hVertEle)

data/lib/adiwg/mdtranslator/writers/{iso19115_1/iso19115_1_writer.rb → iso19115_3/iso19115_3_writer.rb}

@@ -1,4 +1,4 @@
-# Writer - internal data structure to ISO 19115-1:2014
+# Writer - internal data structure to ISO 19115-3:2014
 
 # History:
 # 	Stan Smith 2019-03-12 original script
@@ -9,14 +9,14 @@
 # party - multiple contactInfo{}
 
 require 'builder'
-require 'adiwg/mdtranslator/writers/iso19115_1/version'
+require 'adiwg/mdtranslator/writers/iso19115_3/version'
 require 'adiwg/mdtranslator/internal/module_dateTimeFun'
 require_relative 'classes/class_mdMetadata'
 
 module ADIWG
    module Mdtranslator
       module Writers
-         module Iso19115_1
+         module Iso19115_3
 
             def self.startWriter(intObj, hResponseObj)
 
@@ -25,18 +25,18 @@ module ADIWG
                @hResponseObj = hResponseObj
 
                # load error message array
-               file = File.join(File.dirname(__FILE__), 'iso19115_1_writer_messages_eng') + '.yml'
+               file = File.join(File.dirname(__FILE__), 'iso19115_3_writer_messages_eng') + '.yml'
                hMessageList = YAML.load_file(file)
                @aMessagesList = hMessageList['messageList']
 
                # set the format of the output file based on the writer specified
                hResponseObj[:writerOutputFormat] = 'xml'
-               hResponseObj[:writerVersion] = ADIWG::Mdtranslator::Writers::Iso19115_1::VERSION
+               hResponseObj[:writerVersion] = ADIWG::Mdtranslator::Writers::Iso19115_3::VERSION
 
                # create new XML document
                @xml = Builder::XmlMarkup.new(indent: 3)
 
-               # start writing the ISO 19115-1 XML record
+               # start writing the ISO 19115-3 XML record
                metadataWriter = MD_Metadata.new(@xml, hResponseObj)
                metadata = metadataWriter.writeXML(intObj)
 
@@ -69,7 +69,7 @@ module ADIWG
                message = findMessage(messageId)
                unless message.nil?
                   message += ': CONTEXT is ' + context unless context.nil?
-                  @hResponseObj[:writerMessages] << 'ERROR: ISO-19115-1 writer: ' + message
+                  @hResponseObj[:writerMessages] << 'ERROR: ISO-19115-3 writer: ' + message
                   @hResponseObj[:writerPass] = false
                end
             end
@@ -83,10 +83,10 @@ module ADIWG
                         issueError(messageId, context)
                      else
                         @xml.tag!(tag, {'gco:nilReason' => 'missing'})
-                        @hResponseObj[:writerMessages] << 'WARNING: ISO-19115-1 writer: ' + message
+                        @hResponseObj[:writerMessages] << 'WARNING: ISO-19115-3 writer: ' + message
                      end
                   else
-                     @hResponseObj[:writerMessages] << 'WARNING: ISO-19115-1 writer: ' + message
+                     @hResponseObj[:writerMessages] << 'WARNING: ISO-19115-3 writer: ' + message
                   end
                end
             end
@@ -95,7 +95,7 @@ module ADIWG
                message = findMessage(messageId)
                unless message.nil?
                   message += ': CONTEXT is ' + context unless context.nil?
-                  @hResponseObj[:writerMessages] << 'NOTICE: ISO-19115-1 writer: ' + message
+                  @hResponseObj[:writerMessages] << 'NOTICE: ISO-19115-3 writer: ' + message
                end
             end
 

data/lib/adiwg/mdtranslator/writers/{iso19115_1/iso19115_1_writer_messages_eng.yml → iso19115_3/iso19115_3_writer_messages_eng.yml}

@@ -1,4 +1,4 @@
-# Writer - messages for ISO 19115-1:2014
+# Writer - messages for ISO 19115-3:2014
 
 # History:
 #  Stan Smith 20189-03-12 original script

data/lib/adiwg/mdtranslator/writers/{iso19115_1 → iso19115_3}/readme.md

@@ -1,9 +1,9 @@
 
-## iso19115_1
+## iso19115_3
 
-### Writer for ISO 19115-1:2014 Geographic Metadata
+### Writer for ISO 19115-3:2014 Geographic Metadata
 
-The mdTranslator iso19115_1 writer implements approximately 95% of 
+The mdTranslator iso19115_3 writer implements approximately 95% of 
 the for ISO 19115-3:2014 standard. Efforts were made to include all 
 elements of the ISO standard that support general data descriptions 
 to ensure generation of health and robust project and data metadata 

data/lib/adiwg/mdtranslator/writers/iso19115_3/version.rb

@@ -0,0 +1,12 @@
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Iso19115_3
+
+            # current version of ISO 19115-3 writer
+            VERSION = '3.0.0'
+
+         end
+      end
+   end
+end

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

@@ -28,8 +28,8 @@ module ADIWG
                      json.recipientId hAllocation[:recipientId]
                      json.responsibleParty @Namespace.json_map(hAllocation[:responsibleParties], ResponsibleParty)
                      json.matching hAllocation[:matching]
-                     json.onlineResource @Namespace.json_map(hAllocation[:onlineResources], OnlineResource)
                      json.comment hAllocation[:comment]
+                     json.onlineResource @Namespace.json_map(hAllocation[:onlineResources], OnlineResource)
                   end
 
                end # build

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

@@ -0,0 +1,30 @@
+require 'jbuilder'
+require_relative 'mdJson_scope'
+require_relative 'mdJson_spatialRepresentation'
+require_relative 'mdJson_format'
+require_relative 'mdJson_qualityResultFile'
+require_relative 'mdJson_coverageDescription'
+
+module ADIWG
+  module Mdtranslator
+    module Writers
+      module MdJson
+
+        module CoverageResult
+          def self.build(hCoverageResult)
+            Jbuilder.new do |json|
+                json.dateTime hCoverageResult[:dateTime]
+                json.scope Scope.build(hCoverageResult[:scope]) unless hCoverageResult[:scope].empty?
+                json.spatialRepresentationType hCoverageResult[:spatialRepresentationType]
+                json.spatialRepresentation SpatialRepresentation.build(hCoverageResult[:spatialRepresentation]) unless hCoverageResult[:spatialRepresentation].empty?
+                json.resultContentDescription CoverageDescription.build(hCoverageResult[:resultContentDescription]) unless hCoverageResult[:resultContentDescription].empty?
+                json.resourceFormat Format.build(hCoverageResult[:resourceFormat]) unless hCoverageResult[:resourceFormat].empty?
+                json.resultFile QualityResultFile.build(hCoverageResult[:resultFile]) unless hCoverageResult[:resultFile].empty?
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -3,6 +3,8 @@
 require 'jbuilder'
 require_relative 'mdJson_scope'
 require_relative 'mdJson_dataQualityReport'
+require_relative 'mdJson_citation'
+require_relative 'mdJson_standaloneQualityReport'
 
 module ADIWG
   module Mdtranslator
@@ -17,7 +19,7 @@ module ADIWG
             Jbuilder.new do |json|
               json.scope Scope.build(hDataQuality[:scope])
               json.systemIdentifier hDataQuality[:systemIdentifier]
-              json.standaloneQualityReport hDataQuality[:standaloneQualityReport]
+              json.standaloneQualityReport StandaloneQualityReport.build(hDataQuality[:standaloneReport]) unless hDataQuality[:standaloneReport].nil?
               json.report @Namespace.json_map(hDataQuality[:report], DataQualityReport)
             end
 

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

@@ -1,9 +1,10 @@
 require 'jbuilder'
-require_relative 'mdJson_conformanceResult'
-require_relative 'mdJson_descriptiveResult'
 require_relative 'mdJson_qualityMeasure'
-require_relative 'mdJson_quantitativeResult'
 require_relative 'mdJson_evaluationMethod'
+require_relative 'mdJson_quantitativeResult'
+require_relative 'mdJson_descriptiveResult'
+require_relative 'mdJson_conformanceResult'
+require_relative 'mdJson_coverageResult'
 
 module ADIWG
   module Mdtranslator
@@ -16,13 +17,14 @@ module ADIWG
 
           def self.build(hReport)
             Jbuilder.new do |json|
-              json.type hReport[:type]
-              json.conformanceResult @Namespace.json_map(hReport[:conformanceResult], ConformanceResult) unless hReport[:conformanceResult].nil? || hReport[:conformanceResult].empty? 
-              json.descriptiveResult @Namespace.json_map(hReport[:descriptiveResult], DescriptiveResult) unless hReport[:descriptiveResult].nil? || hReport[:descriptiveResult].empty? 
-              json.evaluationMethod EvaluationMethod.build(hReport[:evaluationMethod]) unless hReport[:evaluationMethod].nil?
-              json.qualityMeasure QualityMeasure.build(hReport[:qualityMeasure]) unless hReport[:qualityMeasure].nil?
-              json.quantitativeResult @Namespace.json_map(hReport[:quantitativeResult], QuantitativeResult) unless hReport[:quantitativeResult].nil? || hReport[:quantitativeResult].empty? 
-
+              json.type hReport[:type] unless hReport[:type].nil?
+              json.standaloneQualityReportDetails hReport[:standaloneQualityReportDetails] unless hReport[:standaloneQualityReportDetails].nil?
+              json.qualityMeasure QualityMeasure.build(hReport[:qualityMeasure]) unless hReport[:qualityMeasure].empty?
+              json.evaluationMethod EvaluationMethod.build(hReport[:evaluationMethod]) unless hReport[:evaluationMethod].empty? 
+              json.quantitativeResult @Namespace.json_map(hReport[:quantitativeResult], QuantitativeResult) unless hReport[:quantitativeResult].empty? 
+              json.descriptiveResult @Namespace.json_map(hReport[:descriptiveResult], DescriptiveResult) unless hReport[:descriptiveResult].empty? 
+              json.conformanceResult @Namespace.json_map(hReport[:conformanceResult], ConformanceResult) unless hReport[:conformanceResult].empty? 
+              json.coverageResult @Namespace.json_map(hReport[:coverageResult], CoverageResult) unless hReport[:coverageResult].empty?
             end
           end
 

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

@@ -9,9 +9,9 @@ module ADIWG
         module DescriptiveResult
           def self.build(hResult)
             Jbuilder.new do |json|
-              json.dateTime hResult[:dateTime]
-              json.scope Scope.build(hResult[:scope]) unless hResult[:scope].nil?
-              json.statement hResult[:statement]
+              json.dateTime hResult[:dateTime] unless hResult[:dateTime].nil?
+              json.scope Scope.build(hResult[:scope]) unless hResult[:scope].empty?
+              json.statement hResult[:statement] unless hResult[:statement].nil?
             end
           end
 

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

@@ -20,9 +20,9 @@ module ADIWG
                def self.build(hFunding)
 
                   Jbuilder.new do |json|
-                     json.description hFunding[:description]
-                     json.timePeriod TimePeriod.build(hFunding[:timePeriod]) unless hFunding[:timePeriod].empty?
                      json.allocation @Namespace.json_map(hFunding[:allocations], Allocation)
+                     json.timePeriod TimePeriod.build(hFunding[:timePeriod]) unless hFunding[:timePeriod].empty?
+                     json.description hFunding[:description]
                   end
 
                end # build