adiwg-mdtranslator 2.18.4 → 2.19.0.pre.beta.8

data/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_dataQualityReport.rb

@@ -1,3 +1,14 @@
+require_relative '../iso19115_3_writer'
+require_relative 'class_format'
+require_relative 'class_qualityResultFile'
+require_relative 'class_date'
+require_relative 'class_scope'
+require_relative 'class_spatialRepresentation'
+require_relative 'class_coverageDescription'
+require_relative 'class_codelist'
+require_relative 'class_identifier'
+require_relative 'class_citation'
+
 module ADIWG
   module Mdtranslator
     module Writers
@@ -12,83 +23,246 @@ module ADIWG
           def writeXML(hReport)
             # require 'pry'; binding.pry
 
+            formatClass = MD_Format.new(@xml, @hResponseObj)
+            qualityResultFileClass = QualityResultFile.new(@xml, @hResponseObj)
+            dateClass = CI_Date.new(@xml, @hResponseObj)
+            scopeClass = MD_Scope.new(@xml, @hResponseObj)
+            spatialRepresentationClass = SpatialRepresentation.new(@xml, @hResponseObj)
+            coverageDescriptionClass = MD_CoverageDescription.new(@xml, @hResponseObj)
+            codeListClass = MD_Codelist.new(@xml, @hResponseObj)
+            identifierClass = MD_Identifier.new(@xml, @hResponseObj)
+            citationClass = CI_Citation.new(@xml, @hResponseObj)
+
             @xml.tag!('mdq:report') do
               @xml.tag!("mdq:#{hReport[:type]}") do
 
-                # conformanceResult []
-
-                # coverageResult []
+                # standaloneQualityReportDetails
+                unless hReport[:standaloneQualityReportDetails].nil?
+                  @xml.tag!('mdq:standaloneQualityReportDetails') do
+                    @xml.tag!('gco:CharacterString', hReport[:standaloneQualityReportDetails])
+                  end
+                end
 
-                # descriptiveResult []
-                unless hReport[:descriptiveResult].nil? || hReport[:descriptiveResult].empty?
-                  hReport[:descriptiveResult].each do |descriptiveResult|
-                    @xml.tag!('mdq:result') do
-                      @xml.tag!('mdq:DQ_DescriptiveResult') do
-                        unless descriptiveResult[:statement].nil? || descriptiveResult[:statement].empty?
-                          @xml.tag!('mdq:statement') do
-                            @xml.tag!('gco:CharacterString', descriptiveResult[:statement])
+                # qualityMeasure {}
+                qualityMeasure = hReport[:qualityMeasure]
+                unless qualityMeasure.empty?
+                  @xml.tag!('mdq:measure') do
+                    @xml.tag!('mdq:DQ_MeasureReference') do
+                      unless qualityMeasure[:identifier].empty?
+                        @xml.tag!('mdq:measureIdentification') do
+                          identifierClass.writeXML(qualityMeasure[:identifier])
+                        end
+                      end
+                      unless qualityMeasure[:nameOfMeasure].nil?
+                        qualityMeasure[:nameOfMeasure].each do |value|
+                          @xml.tag!('mdq:nameOfMeasure') do
+                            @xml.tag!('gco:CharacterString', value)
                           end
                         end
                       end
+                      unless qualityMeasure[:description].nil?
+                        @xml.tag!('mdq:measureDescription') do
+                          @xml.tag!('gco:CharacterString', qualityMeasure[:description])
+                        end
+                      end
                     end
                   end
-                end
+                end # qualityMeasure
 
                 # evaluationMethod {}
                 evaluationMethod = hReport[:evaluationMethod]
-                unless evaluationMethod.nil? || evaluationMethod.empty?
+                unless evaluationMethod.empty?
                   @xml.tag!('mdq:evaluationMethod') do
                     @xml.tag!('mdq:DQ_EvaluationMethod') do
-                      @xml.tag!('mdq:evaluationMethodDescription') do
-                        @xml.tag!('gco:CharacterString', evaluationMethod[:methodDescription]) 
+                      unless evaluationMethod[:dateTime].empty?
+                        evaluationMethod[:dateTime].each do |dateTime|
+                          dateTimeValue = DateTime.parse(dateTime).strftime('%Y-%m-%dT%H:%M:%S')
+                          @xml.tag!('mdq:dateTime') do
+                            @xml.tag!('gco:DateTime', dateTimeValue)
+                          end
+                        end
+                      end
+                      unless evaluationMethod[:methodDescription].nil?
+                        @xml.tag!('mdq:evaluationMethodDescription') do
+                          @xml.tag!('gco:CharacterString', evaluationMethod[:methodDescription]) 
+                        end
+                      end
+                      unless evaluationMethod[:evaluationProcedure].empty?
+                        @xml.tag!('mdq:evaluationProcedure') do
+                          citationClass.writeXML(evaluationMethod[:evaluationProcedure])
+                        end
                       end
+                      unless evaluationMethod[:referenceDocuments].empty?
+                        evaluationMethod[:referenceDocuments].each do |citation|
+                          @xml.tag!('mdq:referenceDoc') do
+                            citationClass.writeXML(citation)
+                          end
+                        end
+                      end
+                      #  TODO the following will not work until the iso_evaluationMethodType codelist is added to mdCodes
+                      # unless evaluationMethod[:evaluationMethodType].nil?
+                      #   @xml.tag!('mdq:evaluationMethodType') do
+                      #     codeListClass.writeXML('mcc', 'iso_evaluationMethodType', evaluationMethod[:evaluationMethodType])
+                      #   end
+                      # end
                     end
                   end
-                end
+                end # evaluationMethod
 
-                # qualityMeasure {}
-                qualityMeasure = hReport[:qualityMeasure]
-                unless qualityMeasure.nil? || qualityMeasure.empty?
-                  @xml.tag!('mdq:measure') do
-                    @xml.tag!('mdq:DQ_MeasureReference') do
-                      unless qualityMeasure[:name].nil?
-                        qualityMeasure[:name].each do |value|
-                          @xml.tag!('mdq:nameOfMeasure') do
-                            @xml.tag!('gco:CharacterString', value)
+                # conformanceResult []
+                unless hReport[:conformanceResult].empty?
+                  hReport[:conformanceResult].each do |conformanceResult|
+                    @xml.tag!('mdq:result') do
+                      @xml.tag!('mdq:DQ_ConformanceResult') do
+                        unless conformanceResult[:dateTime].nil?
+                          dateTimeValue = DateTime.parse(conformanceResult[:dateTime]).strftime('%Y-%m-%dT%H:%M:%S')
+                          @xml.tag!('mdq:dateTime') do
+                            @xml.tag!('gco:DateTime', dateTimeValue)
+                          end
+                        end
+                        unless conformanceResult[:scope].empty?
+                          @xml.tag!('mdq:resultScope') do
+                            scopeClass.writeXML(conformanceResult[:scope])
+                          end
+                        end
+                        unless conformanceResult[:specification].empty?
+                          @xml.tag!('mdq:specification') do
+                            citationClass.writeXML(conformanceResult[:specification])
+                          end
+                        end
+                        unless conformanceResult[:explanation].nil?
+                          @xml.tag!('mdq:explanation') do
+                            @xml.tag!('gco:CharacterString', conformanceResult[:explanation])
+                          end
+                        end
+                        unless conformanceResult[:pass].nil?
+                          @xml.tag!('mdq:pass') do
+                            @xml.tag!('gco:Boolean', conformanceResult[:pass])
                           end
                         end
                       end
+                    end
+                  end
+                end # conformanceResult
 
-                      unless qualityMeasure[:description].nil?
-                        @xml.tag!('mdq:measureDescription') do
-                          @xml.tag!('gco:CharacterString', qualityMeasure[:description])
+                # descriptiveResult []
+                unless hReport[:descriptiveResult].empty?
+                  hReport[:descriptiveResult].each do |descriptiveResult|
+                    @xml.tag!('mdq:result') do
+                      @xml.tag!('mdq:DQ_DescriptiveResult') do
+                        unless descriptiveResult[:dateTime].nil?
+                          dateTimeValue = DateTime.parse(descriptiveResult[:dateTime]).strftime('%Y-%m-%dT%H:%M:%S')
+                          @xml.tag!('mdq:dateTime') do
+                            @xml.tag!('gco:DateTime', dateTimeValue)
+                          end
+                        end
+                        unless descriptiveResult[:scope].empty?
+                          @xml.tag!('mdq:resultScope') do
+                            scopeClass.writeXML(descriptiveResult[:scope])
+                          end
+                        end
+                        unless descriptiveResult[:statement].nil?
+                          @xml.tag!('mdq:statement') do
+                            @xml.tag!('gco:CharacterString', descriptiveResult[:statement])
+                          end
                         end
                       end
                     end
                   end
-                end
-
+                end # descriptiveResult
 
                 # quantitativeResult []
-                unless hReport[:quantitativeResult].nil? || hReport[:quantitativeResult].empty?
+                unless hReport[:quantitativeResult].empty?
                   hReport[:quantitativeResult].each do |quantitativeResult|
                     @xml.tag!('mdq:result') do
                       @xml.tag!('mdq:DQ_QuantitativeResult') do
-                        quantitativeResult[:value].each do |value|
-                          @xml.tag!('mdq:value') do
-                            @xml.tag!('gco:Record', value)
+                        unless quantitativeResult[:dateTime].nil?
+                          dateTimeValue = DateTime.parse(quantitativeResult[:dateTime]).strftime('%Y-%m-%dT%H:%M:%S')
+                          @xml.tag!('mdq:dateTime') do
+                            @xml.tag!('gco:DateTime', dateTimeValue)
+                          end
+                        end
+                        unless quantitativeResult[:scope].empty?
+                          @xml.tag!('mdq:resultScope') do
+                            scopeClass.writeXML(quantitativeResult[:scope])
+                          end
+                        end
+                        unless quantitativeResult[:values].empty?
+                          quantitativeResult[:values].each do |value|
+                            @xml.tag!('mdq:value') do
+                              @xml.tag!('gco:Record', value)
+                            end
+                          end
+                        end
+                        unless quantitativeResult[:valueUnits].nil?
+                          @xml.tag!('mdq:valueUnit') do
+                            @xml.tag!('gml:UnitDefinition') do
+                              @xml.tag!('gml:identifier', {'codeSpace' => 'units'}, quantitativeResult[:valueUnits])
+                            end
+                          end
+                        end
+                        unless quantitativeResult[:valueRecordType].nil?
+                          @xml.tag!('mdq:valueType') do
+                            @xml.tag!('gco:RecordType', quantitativeResult[:valueRecordType])
                           end
                         end
                       end
                     end
                   end
-                end
+                end # quantitativeResult
 
-              end
-            end
-          end
+                # coverageResult []
+                unless hReport[:coverageResult].empty?
+                  hReport[:coverageResult].each do |coverageResult|
+                    @xml.tag!('mdq:result') do
+                      @xml.tag!('mdq:QE_CoverageResult') do
+                        unless coverageResult[:dateTime].nil?
+                          dateTimeValue = DateTime.parse(coverageResult[:dateTime]).strftime('%Y-%m-%dT%H:%M:%S')
+                          @xml.tag!('mdq:dateTime') do
+                            @xml.tag!('gco:DateTime', dateTimeValue)
+                          end
+                        end
+                        unless coverageResult[:scope].empty?
+                          @xml.tag!('mdq:resultScope') do
+                            scopeClass.writeXML(coverageResult[:scope])
+                          end
+                        end
+                        unless coverageResult[:spatialRepresentationType].nil?
+                          @xml.tag!('mdq:spatialRepresentationType') do
+                            codeListClass.writeXML('mcc', 'iso_spatialRepresentation', coverageResult[:spatialRepresentationType])
+                          end
+                        end
+                        unless coverageResult[:resultFile].empty?
+                          @xml.tag!('mdq:resultFile') do
+                            qualityResultFileClass.writeXML(coverageResult[:resultFile])
+                          end
+                        end
+                        unless coverageResult[:spatialRepresentation].empty?
+                          @xml.tag!('mdq:resultSpatialRepresentation') do
+                            spatialRepresentationClass.writeXML(coverageResult[:spatialRepresentation])
+                          end
+                        end
+                        unless coverageResult[:resultContentDescription].empty?
+                          @xml.tag!('mdq:resultContentDescription') do
+                            coverageDescriptionClass.writeXML(coverageResult[:resultContentDescription])
+                          end
+                        end
+                        unless coverageResult[:resourceFormat].empty?
+                          @xml.tag!('mdq:resultFormat') do
+                            formatClass.writeXML(coverageResult[:resourceFormat])
+                          end
+                        end
+                      end
+                    end
+                  end
+                end # coverageResult
+
+              end # mdq:<type>
+            end # mdq:report
+
+          end # writeXML
 
-        end
+        end # DataQualityReport class
       end
     end
   end

data/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_mdMetadata.rb

@@ -85,7 +85,7 @@ module ADIWG
                   # schema locations
                   # set to 'remoteSchema' before publishing
                   localSchema = 'C:\Users\StanSmith\Projects\ISO\19115\-3\mdt\1.0\mdt.xsd'
-                  remoteSchema = 'http://standards.iso.org/iso/19115/-3/mdt/2.0/mdt.xsd'
+                  remoteSchema = 'https://schemas.isotc211.org/19115/-3/mdt/2.0/mdt.xsd'
 
                   # MD_Metadata
                   @xml.tag!('mdb:MD_Metadata',

data/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_organization.rb

@@ -113,25 +113,7 @@ module ADIWG
                            @xml.tag!('cit:individual')
                         end
 
-                        # organization - party identifier
-                        if hContact[:externalIdentifier] && hContact[:externalIdentifier].length > 0
-                           hContact[:externalIdentifier].each do |identifier|
-                              @xml.tag!('cit:partyIdentifier') do
-                                 identifierClass.writeXML(identifier);
-                              end
-                           end
-                        else
-                           if hContact[:contactId] && 
-                              hContact[:contactId].is_a?(Hash)
-                              @xml.tag!('cit:partyIdentifier') do
-                                 identifierClass.writeXML(hContact[:contactId]);
-                              end
-                           elsif hContact[:contactId].is_a?(String)
-                              @xml.tag!('cit:partyIdentifier') do
-                                 identifierClass.writeXML({ identifier: hContact[:contactId] })
-                              end
-                           end
-                        end
+                        
 
                      end
                      if hContact.empty?

data/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_qualityResultFile.rb

@@ -0,0 +1,55 @@
+require_relative '../iso19115_3_writer'
+require_relative 'class_format'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Iso19115_3
+
+            class QualityResultFile
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_3
+               end
+
+               def writeXML(hResultFile, inContext = nil)
+
+                  # classes used
+                  formatClass = MD_Format.new(@xml, @hResponseObj)
+
+                  @xml.tag!('mdq:QualityResultFile') do
+
+                     unless hResultFile[:fileName].nil?
+                        @xml.tag!('mdq:fileName') do
+                           @xml.tag!('gcx:FileName', hResultFile[:fileName])
+                        end
+                     end
+
+                     unless hResultFile[:fileType].nil?
+                        @xml.tag!('mdq:fileType') do
+                           @xml.tag!('gcx:MimeFileType', {:type => hResultFile[:fileType]})
+                        end
+                     end
+
+                     unless hResultFile[:fileDescription].nil?
+                        @xml.tag!('mdq:fileDescription') do
+                            @xml.tag!('gco:CharacterString', hResultFile[:fileDescription])
+                        end
+                     end
+
+                     unless hResultFile[:fileFormat].empty?
+                        @xml.tag!('mdq:fileFormat') do
+                           formatClass.writeXML(hResultFile[:fileFormat], inContext)
+                        end
+                     end
+
+                  end 
+               end # writeXML
+            end 
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_rangeElementDescription.rb

@@ -17,23 +17,24 @@ module ADIWG
           end
 
           def writeXML(hAttribute, inContext = nil)
-
-            unless hAttribute[:name].nil?
-              @xml.tag!('mrc:name') do
-                @xml.tag!('gco:CharacterString', hAttribute[:name])
+            @xml.tag!('mrc:MI_RangeElementDescription') do
+              unless hAttribute[:name].nil?
+                @xml.tag!('mrc:name') do
+                  @xml.tag!('gco:CharacterString', hAttribute[:name])
+                end
               end
-            end
 
-            unless hAttribute[:definition].nil?
-              @xml.tag!('mrc:definition') do
-                @xml.tag!('gco:CharacterString', hAttribute[:definition])
+              unless hAttribute[:definition].nil?
+                @xml.tag!('mrc:definition') do
+                  @xml.tag!('gco:CharacterString', hAttribute[:definition])
+                end
               end
-            end
 
-            hAttribute[:rangeElements].each do |hRangeElement|
-              @xml.tag!('mrc:rangeElement') do
-                @xml.tag!('gco:Record') do
-                  @xml.tag!('gco:CharacterString', hRangeElement)
+              hAttribute[:rangeElement].each do |hRangeElement|
+                @xml.tag!('mrc:rangeElement') do
+                  @xml.tag!('gco:Record') do
+                    @xml.tag!('gco:CharacterString', hRangeElement)
+                  end
                 end
               end
             end

data/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_sampleDimension.rb

@@ -67,12 +67,6 @@ module ADIWG
                      @xml.tag!('mrc:scaleFactor')
                   end
 
-                  hAttribute[:rangeElementDescription].each do |red|
-                     @xml.tag!('mrc:rangeElementDescription') do
-                        rangeElementDescription.writeXML(red, inContext)
-                     end
-                  end
-
                   # sample dimension - offset {real}
                   unless hAttribute[:offset].nil?
                      @xml.tag!('mrc:offset') do
@@ -126,6 +120,12 @@ module ADIWG
                      @xml.tag!('mrc:bitsPerValue')
                   end
 
+                  hAttribute[:rangeElementDescription].each do |red|
+                     @xml.tag!('mrc:rangeElementDescription') do
+                        rangeElementDescription.writeXML(red, inContext)
+                     end
+                  end
+
                end # writeXML
             end # MD_SampleDescription
 

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

@@ -20,6 +20,8 @@ module ADIWG
 
             def self.startWriter(intObj, hResponseObj)
 
+               hResponseObj[:writerMissingIdCount] = '000'
+
                # make contact available to the instance
                @contacts = intObj[:contacts]
                @hResponseObj = hResponseObj

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

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

@@ -15,8 +15,8 @@ module ADIWG
                def self.build(hLegal)
 
                   Jbuilder.new do |json|
-                     json.useConstraint hLegal[:useCodes] unless hLegal[:useCodes].empty?
                      json.accessConstraint hLegal[:accessCodes] unless hLegal[:accessCodes].empty?
+                     json.useConstraint hLegal[:useCodes] unless hLegal[:useCodes].empty?
                      json.otherConstraint hLegal[:otherCons] unless hLegal[:otherCons].empty?
                   end
 

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

@@ -28,12 +28,12 @@ module ADIWG
                   Jbuilder.new do |json|
                      json.metadataInfo MetadataInfo.build(hMetadata[:metadataInfo])
                      json.resourceInfo ResourceInfo.build(hMetadata[:resourceInfo])
+                     json.dataQuality @Namespace.json_map(hMetadata[:dataQuality], DataQuality)
                      json.resourceLineage @Namespace.json_map(hMetadata[:lineageInfo], LineageInfo)
                      json.resourceDistribution @Namespace.json_map(hMetadata[:distributorInfo], Distribution)
                      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.dataQuality @Namespace.json_map(hMetadata[:dataQuality], DataQuality)
                   end
 
                end # build

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

@@ -1,4 +1,5 @@
 require 'jbuilder'
+require_relative 'mdJson_identifier'
 
 module ADIWG
   module Mdtranslator
@@ -8,9 +9,9 @@ module ADIWG
         module QualityMeasure
           def self.build(hQualityMeasure)
             Jbuilder.new do |json|
-              json.identifier hQualityMeasure[:identifier]
-              json.name hQualityMeasure[:name]
-              json.description hQualityMeasure[:description]
+              json.identifier Identifier.build(hQualityMeasure[:identifier]) unless hQualityMeasure[:identifier].empty?
+              json.name hQualityMeasure[:nameOfMeasure] unless hQualityMeasure[:nameOfMeasure].empty?
+              json.description hQualityMeasure[:description] unless hQualityMeasure[:description].nil?
             end
           end
         end