adiwg-mdtranslator 2.18.0rc3 → 2.18.0rc4

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_evaluationMethod.rb

@@ -0,0 +1,80 @@
+require_relative 'module_citation'
+
+module ADIWG
+  module Mdtranslator
+    module Readers
+      module MdJson
+
+        module EvaluationMethod
+          def self.unpack(hMethod, responseObj, inContext = nil)
+
+            intMetadataClass = InternalMetadata.new
+            intMethod = intMetadataClass.newEvaluationMethod
+
+            # type: nil,
+            if hMethod.has_key?('type')
+              intMethod[:type] = hMethod['type']
+            end
+
+            # dateTime: [],
+            if hMethod.has_key?('dateTime')
+               intMethod[:dateTime] = hMethod['dateTime']
+            end
+
+            # methodDescription: nil,
+            if hMethod.has_key?('methodDescription')
+             intMethod[:methodDescription] = hMethod['methodDescription']
+            end
+
+            # evaluationProcedure: {},
+            if hMethod.has_key?('evaluationProcedure')
+              intMethod[:evaluationProcedure] = Citation.unpack(hMethod['evaluationProcedure'], responseObj)
+            end
+
+            # referenceDocuments: [],
+            if hMethod.has_key?('referenceDocuments')
+
+              hMethod['referenceDocuments'].each do |item|
+                hReturn = Citation.unpack(item, responseObj)
+                unless hReturn.nil?
+                  intMethod[:referenceDocuments] << hReturn
+                end
+              end
+
+              intMethod[:referenceDocuments] = hMethod['referenceDocuments']
+            end
+
+            # evaluationMethodType: nil,
+            if hMethod.has_key?('evaluationMethodType')
+              intMethod[:evaluationMethodType] = hMethod['evaluationMethodType']
+            end
+
+            # deductiveSource: nil,
+            if hMethod.has_key?('deductiveSource')
+              intMethod[:deductiveSource] = hMethod['deductiveSource']
+            end
+
+            # samplingScheme: nil,
+            if hMethod.has_key?('samplingScheme')
+              intMethod[:samplingScheme] = hMethod['samplingScheme']
+            end
+
+            # lotDescription: nil,
+            if hMethod.has_key?('lotDescription')
+              intMethod[:lotDescription] = hMethod['lotDescription']
+            end
+
+            # samplingRatio: nil
+            if hMethod.has_key?('samplingRatio')
+              intMethod[:samplingRatio] = hMethod['samplingRatio']
+            end
+
+            return intMethod
+
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_metadata.rb

@@ -12,6 +12,7 @@ require_relative 'module_distribution'
 require_relative 'module_associatedResource'
 require_relative 'module_additionalDocumentation'
 require_relative 'module_funding'
+require_relative 'module_dataQuality'
 
 module ADIWG
    module Mdtranslator
@@ -117,6 +118,16 @@ module ADIWG
                      end
                   end
 
+                  if hMetadata.has_key?('dataQuality')
+                     aItems = hMetadata['dataQuality']
+                     aItems.each do |item|
+                        hReturn = DataQuality.unpack(item, responseObj)
+                        unless hReturn.nil?
+                           intMetadata[:dataQuality] << hReturn
+                        end
+                     end
+                  end
+
                   return intMetadata
 
                end

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_quantitativeResult.rb

@@ -0,0 +1,47 @@
+require_relative 'module_scope'
+
+module ADIWG
+  module Mdtranslator
+    module Readers
+      module MdJson
+
+        module QuantitativeResult
+          def self.unpack(hResult, responseObj, inContext = nil)
+            @MessagePath = ADIWG::Mdtranslator::Readers::MdJson::MdJson
+
+            if hResult.empty?
+              @MessagePath.issueWarning(80, responseObj, inContext)
+              return nil
+            end
+
+            intMetadataClass = InternalMetadata.new
+            intResult = intMetadataClass.newQuantitativeResult
+
+            if hResult.has_key?('dateTime')
+              intResult[:dateTime] = hResult['dateTime']
+            end
+
+            if hResult.has_key?('scope')
+              intResult[:scope] = Scope.unpack(hResult['scope'], responseObj)
+            end
+
+            if hResult.has_key?('value')
+              intResult[:value] = hResult['value']
+            end
+
+            if hResult.has_key?('valueUnits')
+              intResult[:valueUnits] = hResult['valueUnits']
+            end
+
+            if hResult.has_key?('valueRecordType')
+              intResult[:valueRecordType] = hResult['valueRecordType']
+            end
+
+            return intResult
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/adiwg/mdtranslator/version.rb

@@ -109,7 +109,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.18.0rc3"
+      VERSION = "2.18.0rc4"
    end
 end
 

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_distribution.rb

@@ -37,28 +37,6 @@ module ADIWG
                   # therefore, create a separate FGDC distribution record for each distributor
                   # and repeat the distribution information
 
-                  if hDistribution[:distributor].empty?
-                     @xml.tag!('distinfo') do
-                        # distribution 6.2 (resdesc) - resource description
-                        # <- distribution.description
-                        unless hDistribution[:description].nil?
-                           @xml.tag!('resdesc', hDistribution[:description])
-                        end
-                        if hDistribution[:description].nil? && @hResponseObj[:writerShowTags]
-                           @xml.tag!('resdesc')
-                        end
-
-                        # distribution 6.3 (distliab) - liability (required)
-                        # <- distribution.liabilityStatement
-                        unless hDistribution[:liabilityStatement].nil?
-                           @xml.tag!('distliab', hDistribution[:liabilityStatement])
-                        end
-                        if hDistribution[:liabilityStatement].nil?
-                           @NameSpace.issueWarning(111,'distliab')
-                        end
-                     end
-                  end
-
                   hDistribution[:distributor].each do |hDistributor|
 
                      outContext = nil
@@ -90,7 +68,7 @@ module ADIWG
                         unless hDistribution[:description].nil?
                            @xml.tag!('resdesc', hDistribution[:description])
                         end
-                        if hDistribution[:description].nil? && @hResponseObj[:writerShowTags]
+                        if hDistribution[:description].nil?
                            @xml.tag!('resdesc')
                         end
 
@@ -162,7 +140,7 @@ module ADIWG
                         unless techPre == ''
                            @xml.tag!('techpreq', techPre)
                         end
-                        if techPre == '' && @hResponseObj[:writerShowTags]
+                        if techPre == ''
                            @xml.tag!('techpreq')
                         end
 

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_entityDetail.rb

@@ -31,7 +31,7 @@ module ADIWG
                   outContext = 'entity code ' + outContext unless outContext.nil?
 
                   # entity detail 5.1.1 (enttype) - entity type
-                  @xml.tag!('enttyp') do
+                  @xml.tag!('enttype') do
 
                      # entity type 5.1.1.1 (enttypl) - entity type label (required)
                      # <- entity.entityCode

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_process.rb

@@ -57,7 +57,6 @@ module ADIWG
                      hTimePeriod = hStep[:timePeriod]
                      unless hTimePeriod.empty?
                         hEndDT = hTimePeriod[:endDateTime]
-                        hEndDT = hTimePeriod[:startDateTime] if hEndDT.nil? || hEndDT.empty?
                         unless hEndDT.empty?
                            procDate = AdiwgDateTimeFun.stringDateFromDateTime(hEndDT[:dateTime], hEndDT[:dateResolution])
                            procTime = AdiwgDateTimeFun.stringTimeFromDateTime(hEndDT[:dateTime], hEndDT[:dateResolution])

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_quality.rb

@@ -25,19 +25,79 @@ module ADIWG
                   # classes used
                   lineageClass = Lineage.new(@xml, @hResponseObj)
 
+                  hDataQuality = intObj.dig(:metadata, :dataQuality, 0)
+
                   # data quality 2.1 (attracc) - attribute accuracy (not implemented)
-                  if @hResponseObj[:writerShowTags]
+                  attribute_completeness_report = hDataQuality[:report].find do |report|
+                     report[:type] == 'DQ_NonQuantitativeAttributeCompleteness' &&
+                     !report.dig(:descriptiveResult, 0, :statement).nil?
+                  end
+
+                  if attribute_completeness_report
+                     @xml.tag!('attracc') do
+                        @xml.tag!('attraccr', attribute_completeness_report[:descriptiveResult][0][:statement])
+                     end
+                  elsif @hResponseObj[:writerShowTags]
                      @xml.tag!('attracc', 'Not Reported')
                   end
 
                   # data quality 2.2 (logic) - logical consistency (not implemented) (required)
-                  @xml.tag!('logic', 'Not Reported')
+                  logic_report = hDataQuality[:report].find do |report|
+                     report[:type] == 'DQ_ConceptualConsistency' &&
+                     !report.dig(:qualityMeasure, :description).nil?
+                  end
+
+                  if logic = logic_report&.dig(:qualityMeasure, :decription)
+                     @xml.tag!('logic', logic)
+                  else
+                     @xml.tag!('logic', 'Not Reported')
+                  end
 
                   # data quality 2.3 (complete) - completion report (not implemented) (required)
-                  @xml.tag!('complete', 'Not Reported')
+                  completeness_report = hDataQuality[:report].find do |report|
+                     report[:type] == 'DQ_CompletenessOmission' &&
+                     !report.dig(:descriptiveResult, 0, :statement).nil?
+                  end
+
+                  if complete = completeness_report&.dig(:descriptiveResult, 0, :statement)
+                     @xml.tag!('complete', complete)
+                  else
+                     @xml.tag!('complete', 'Not Reported')
+                  end
 
                   # data quality 2.4 (position) - positional accuracy (not implemented)
-                  if @hResponseObj[:writerShowTags]
+
+
+                  horizontal_positional_accuracy_report = hDataQuality[:report].find do |report|
+                     report[:type] == 'DQ_AbsoluteExternalPositionalAccuracy' &&
+                     report.dig(:qualityMeasure, :name) == 'Horizontal Positional Accuracy Report'
+                  end
+
+                  horizpar = horizontal_positional_accuracy_report&.dig(:evaluationMethod, :methodDescription)
+
+
+                  vertical_positional_accuracy_report = hDataQuality[:report].find do |report|
+                     report[:type] == 'DQ_AbsoluteExternalPositionalAccuracy' &&
+                     report.dig(:qualityMeasure, :name) == 'Vertical Positional Accuracy Report'
+                  end
+
+                  vertaccr = vertical_positional_accuracy_report&.dig(:evaluationMethod, :methodDescription)
+
+                  if horizpar || vertaccr
+                     @xml.tag!('posacc') do
+                        if horizpar
+                           @xml.tag!('horizpa') do
+                              @xml.tag!('horizpar', horizpar)
+                           end
+                        end
+
+                        if vertaccr
+                           @xml.tag!('vertacc') do
+                              @xml.tag!('vertaccr', vertaccr)
+                           end
+                        end
+                     end
+                  elsif @hResponseObj[:writerShowTags]
                      @xml.tag!('position', 'Not Reported')
                   end
 

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_spatialDomain.rb

@@ -135,10 +135,10 @@ module ADIWG
 
                                     # altitude bounding (altunit) - units of altitude
                                     unless hBBox[:unitsOfAltitude].nil?
-                                       @xml.tag!('altunits', hBBox[:unitsOfAltitude])
+                                       @xml.tag!('altunit', hBBox[:unitsOfAltitude])
                                     end
                                     if hBBox[:unitsOfAltitude].nil?  && @hResponseObj[:writerShowTags]
-                                       @xml.tag!('altunits')
+                                       @xml.tag!('altunit')
                                     end
 
                                  end

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_spatialOrganization.rb

@@ -27,7 +27,7 @@ module ADIWG
                   haveIndirect = false
                   hResourceInfo[:spatialReferenceSystems].each do |hSystem|
                      unless hSystem[:systemIdentifier].empty?
-                        unless hSystem[:systemIdentifier][:description].nil? || hSystem[:systemIdentifier][:description].empty?
+                        unless hSystem[:systemIdentifier][:description].empty?
                            @xml.tag!('indspref', hSystem[:systemIdentifier][:description])
                            haveIndirect = true
                            break

data/lib/adiwg/mdtranslator/writers/html/sections/html_body.rb

@@ -12,6 +12,7 @@
 require_relative 'html_contact'
 require_relative 'html_metadataInfo'
 require_relative 'html_resourceInfo'
+require_relative 'html_dataQuality'
 require_relative 'html_lineage'
 require_relative 'html_distribution'
 require_relative 'html_associatedResource'
@@ -38,6 +39,7 @@ module ADIWG
                      metaInfoClass = Html_MetadataInfo.new(@html)
                      contactClass = Html_Contact.new(@html)
                      resourceClass = Html_ResourceInfo.new(@html)
+                     dataQualityClass = Html_DataQuality.new(@html)
                      lineageClass = Html_Lineage.new(@html)
                      distributionClass = Html_Distribution.new(@html)
                      associatedClass = Html_AssociatedResource.new(@html)
@@ -51,6 +53,7 @@ module ADIWG
                      aContacts = intObj[:contacts]
                      hMetaInfo = intObj[:metadata][:metadataInfo]
                      hResourceInfo = intObj[:metadata][:resourceInfo]
+                     aDataQuality = intObj[:metadata][:dataQuality]
                      aLineage = intObj[:metadata][:lineageInfo]
                      aDistribution = intObj[:metadata][:distributorInfo]
                      aAssociated = intObj[:metadata][:associatedResources]
@@ -161,6 +164,17 @@ module ADIWG
                         end
                      end
 
+                     unless aDataQuality.nil? || aDataQuality.empty?
+                        @html.details do
+                           @html.summary('Data Quality', {'id' => 'body-dataQuality', 'class' => 'h2'})
+                           aDataQuality.each do |hDataQuality|
+                              @html.section(:class => 'block') do
+                                 dataQualityClass.writeHtml(hDataQuality)
+                              end
+                           end
+                        end
+                     end
+
                      # lineage section
                      unless aLineage.empty?
                         @html.details do

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

@@ -0,0 +1,47 @@
+require_relative 'html_citation'
+
+module ADIWG
+  module Mdtranslator
+    module Writers
+      module Html
+        class Html_DataQuality
+          def initialize(html)
+            @html = html
+          end
+
+          def writeHtml(hDataQuality)
+            citationClass = Html_Citation.new(@html)
+
+            unless hDataQuality[:standaloneQualityReport].nil? || 
+                   ( hDataQuality[:standaloneQualityReport][:abstract].nil? && 
+                     hDataQuality[:standaloneQualityReport][:reportReference].nil? )
+              report = hDataQuality[:standaloneQualityReport]
+
+              @html.section(class: 'block') do
+                @html.details do
+                  @html.summary('Standalone Quality Report', {'class' => 'h5'})
+                  unless report[:abstract].nil?
+                    @html.section(class: 'block') do
+                      @html.em('Abstract:')
+                      @html.text!(report[:abstract])
+                    end
+                  end
+
+                  unless report[:reportReference].nil?
+                    @html.details do
+                      @html.summary('Report Reference', {'class' => 'h5'})
+                      @html.section(class: 'block') do
+                        citationClass.writeHtml(report[:reportReference])
+                      end
+                    end
+                  end
+                end
+              end
+
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_dataQuality.rb

@@ -0,0 +1,64 @@
+require_relative 'class_dataQualityReport'
+require_relative 'class_citation'
+
+module ADIWG
+  module Mdtranslator
+    module Writers
+      module Iso19115_1
+
+        class DQ_DataQuality
+          def initialize(xml, hResponseObj)
+            @xml = xml
+            @hResponseObj = hResponseObj
+          end
+
+          def writeXML(hDataQuality)
+
+            reportClass = DataQualityReport.new(@xml, @hResponseObj)
+            citationClass = CI_Citation.new(@xml, @hResponseObj)
+
+            @xml.tag!('mdq:DQ_DataQuality') do
+
+              @xml.tag!('mdq:scope') do
+                @xml.tag!('mcc:MD_Scope') do
+                  @xml.tag!('mcc:level') do
+                    @xml.tag!('mcc:MD_ScopeCode', codeList: "http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MD_ScopeCode", codeListValue: "series")
+                  end
+                end
+              end
+
+              unless hDataQuality[:standaloneQualityReport].nil? || hDataQuality[:standaloneQualityReport].empty?
+
+                @xml.tag!('mdq:standaloneQualityReport') do
+                  @xml.tag!('mdq:DQ_StandaloneQualityReportInformation') do
+                    # reportReference
+
+                    @xml.tag!('mdq:reportReference') do
+                      citationClass.writeXML(hDataQuality[:standaloneQualityReport][:reportReference])
+                    end
+
+
+                    # abstract
+                    @xml.tag!('mdq:abstract') do
+                      @xml.tag!('gco:CharacterString', hDataQuality[:standaloneQualityReport][:abstract])
+                    end
+                  end
+                end
+
+              end
+
+              # reports
+              hDataQuality[:report].each do |hReport|
+                unless hReport.nil? || hReport.empty?
+                  reportClass.writeXML(hReport)
+                end
+                
+              end
+            end
+
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,95 @@
+module ADIWG
+  module Mdtranslator
+    module Writers
+      module Iso19115_1
+
+        class DataQualityReport
+          def initialize(xml, hResponseObj)
+            @xml = xml
+            @hResponseObj = hResponseObj
+          end
+
+          def writeXML(hReport)
+            # require 'pry'; binding.pry
+
+            @xml.tag!('mdq:report') do
+              @xml.tag!("mdq:#{hReport[:type]}") do
+
+                # conformanceResult []
+
+                # coverageResult []
+
+                # 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])
+                          end
+                        end
+                      end
+                    end
+                  end
+                end
+
+                # evaluationMethod {}
+                evaluationMethod = hReport[:evaluationMethod]
+                unless evaluationMethod.nil? || evaluationMethod.empty?
+                  @xml.tag!('mdq:evaluationMethod') do
+                    @xml.tag!('mdq:DQ_EvaluationMethod') do
+                      @xml.tag!('mdq:evaluationMethodDescription') do
+                        @xml.tag!('gco:CharacterString', evaluationMethod[:methodDescription]) 
+                      end
+                    end
+                  end
+                end
+
+                # 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)
+                          end
+                        end
+                      end
+
+                      unless qualityMeasure[:description].nil?
+                        @xml.tag!('mdq:measureDescription') do
+                          @xml.tag!('gco:CharacterString', qualityMeasure[:description])
+                        end
+                      end
+                    end
+                  end
+                end
+
+
+                # quantitativeResult []
+                unless hReport[:quantitativeResult].nil? || 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)
+                          end
+                        end
+                      end
+                    end
+                  end
+                end
+
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_individual.rb

@@ -62,16 +62,6 @@ module ADIWG
                            @xml.tag!('cit:contactInfo')
                         end
 
-                        # individual - position
-                        unless hContact[:positionName].nil?
-                           @xml.tag!('cit:positionName') do
-                              @xml.tag!('gco:CharacterString', hContact[:positionName])
-                           end
-                        end
-                        if hContact[:positionName].nil? && @hResponseObj[:writerShowTags]
-                           @xml.tag!('cit:positionName')
-                        end
-
                         # individual - party identifier
                         if hContact[:externalIdentifier] && hContact[:externalIdentifier].length > 0
                            hContact[:externalIdentifier].each do |identifier|
@@ -91,6 +81,16 @@ module ADIWG
                               end
                            end
                         end
+
+                        # individual - position
+                        unless hContact[:positionName].nil?
+                           @xml.tag!('cit:positionName') do
+                              @xml.tag!('gco:CharacterString', hContact[:positionName])
+                           end
+                        end
+                        if hContact[:positionName].nil? && @hResponseObj[:writerShowTags]
+                           @xml.tag!('cit:positionName')
+                        end
                         
                      end
                   end

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

@@ -18,6 +18,7 @@ require_relative 'class_onlineResource'
 require_relative 'class_coverageDescription'
 require_relative 'class_imageDescription'
 require_relative 'class_distribution'
+require_relative 'class_dataQuality'
 require_relative 'class_lineage'
 require_relative 'class_constraint'
 require_relative 'class_dataIdentification'
@@ -54,6 +55,7 @@ module ADIWG
                   coverageClass = MD_CoverageDescription.new(@xml, @hResponseObj)
                   imageClass = MD_ImageDescription.new(@xml, @hResponseObj)
                   distributionClass = MD_Distribution.new(@xml, @hResponseObj)
+                  dataQualityClass = DQ_DataQuality.new(@xml, @hResponseObj)
                   lineageClass = LI_Lineage.new(@xml, @hResponseObj)
                   constraintClass = Constraint.new(@xml, @hResponseObj)
                   maintenanceClass = MD_MaintenanceInformation.new(@xml, @hResponseObj)
@@ -66,6 +68,7 @@ module ADIWG
                   hMetaInfo = hMetadata[:metadataInfo]
                   hResInfo = hMetadata[:resourceInfo]
                   aDistributions = hMetadata[:distributorInfo]
+                  aDataQuality = hMetadata[:dataQuality]
                   aLineage = hMetadata[:lineageInfo]
                   aDictionaries = intObj[:dataDictionaries]
                   version = @hResponseObj[:translatorVersion]
@@ -342,6 +345,19 @@ module ADIWG
                         @xml.tag!('mdb:distributionInfo')
                      end
 
+                     # metadata information - data quality [] { DQ_DataQuality}
+                     aDataQuality.each do |hDataQuality|
+                        unless hDataQuality.empty?
+                           @xml.tag!('mdb:dataQualityInfo') do
+                              dataQualityClass.writeXML(hDataQuality)
+                           end
+                        end
+                     end
+                     if aDataQuality.empty? && @hResponseObj[:writeShowTags]
+                        @xml.tag('mdb:dataQualityInfo')
+                     end
+
+
                      # metadata information - resource lineage [] {LI_Lineage}
                      aLineage.each do |hLineage|
                         @xml.tag!('mdb:resourceLineage') do