adiwg-mdtranslator 2.20.0.pre.beta.3 → 2.20.0.pre.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec23318ef18dc9729c5aaa6c608b55c856234d8e31a893b6c011f02494f75718
-  data.tar.gz: d28e618a12660f940c9fbc4d3ea380c1109cdc2c7756a32872c2f2e84b4e2c64
+  metadata.gz: d2ba5668ad4fe2f02ab4d3037af3a9086da9a45f782fb8934399bbdd76136532
+  data.tar.gz: 86c08b50c1b15abe74e32afd7dc6f5b59397204858fb928463fca97939575c4c
 SHA512:
-  metadata.gz: 6c81ced313a48931ef23b337d408f512932836b81368c535eb197dc0950795b8510deea40f5a130b4372b3110f1d9020fb943d7537de8e80184dc88b25fe8994
-  data.tar.gz: 0566ba79a6004232a532bd7eda527bb60a90191ea0a0ba47baf38764efa014341074a31418cdc798f82a2fe5a5860f13d9f8a3e9dce8d170389edea39392a47d
+  metadata.gz: d1f3e42c661cefcfe6dbe7d455b2242c63e231ae94f3b6aef6e1f62cbdd1d3be01d030b5bd14a01f1671bd9cfda59f70fcb97ee23d202eca733383df538d1c13
+  data.tar.gz: b5629533fe4da69411c9bfc36c5cda159b8dee6686785109e86afc38c3dd3324cc84555675741658ac1d47aa99e1e5ef6c24739bcfeb20b8ee5c67a595408dca

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    adiwg-mdtranslator (2.20.0.pre.beta.3)
-      adiwg-mdcodes (= 2.9.4.pre.beta.0)
-      adiwg-mdjson_schemas (= 2.9.3.pre.beta.0)
+    adiwg-mdtranslator (2.20.0.pre.beta.6)
+      adiwg-mdcodes (= 2.10.1)
+      adiwg-mdjson_schemas (= 2.10.1)
       builder (~> 3.2)
       coderay (~> 1.1)
       jbuilder (~> 2.5)
@@ -17,13 +17,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionview (7.1.3.3)
+      activesupport (= 7.1.3.3)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (7.1.3.2)
+    activesupport (7.1.3.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -35,9 +35,9 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    adiwg-mdcodes (2.9.4.pre.beta.0)
+    adiwg-mdcodes (2.10.1)
       json (~> 2.0)
-    adiwg-mdjson_schemas (2.9.3.pre.beta.0)
+    adiwg-mdjson_schemas (2.10.1)
     base64 (0.2.0)
     bigdecimal (3.1.8)
     builder (3.2.4)
@@ -67,7 +67,7 @@ GEM
     nokogiri (1.15.6-x86_64-linux)
       racc (~> 1.4)
     public_suffix (5.0.5)
-    racc (1.7.3)
+    racc (1.8.0)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -76,7 +76,9 @@ GEM
       loofah (~> 2.21)
       nokogiri (~> 1.14)
     rake (13.1.0)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
+    strscan (3.1.0)
     thor (0.20.3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)

data/adiwg-mdtranslator.gemspec

@@ -34,8 +34,8 @@ Gem::Specification.new do |spec|
    spec.add_runtime_dependency "thor", "~> 0.19"
    spec.add_runtime_dependency "uuidtools", "~> 2.1"
    spec.add_runtime_dependency "json-schema", "~> 2.7"
-   spec.add_runtime_dependency "adiwg-mdjson_schemas", "2.9.3.pre.beta.0"
-   spec.add_runtime_dependency "adiwg-mdcodes", "2.9.4.pre.beta.0"
+   spec.add_runtime_dependency "adiwg-mdjson_schemas", "2.10.1"
+   spec.add_runtime_dependency "adiwg-mdcodes", "2.10.1"
    spec.add_runtime_dependency "jbuilder", "~> 2.5"
    spec.add_runtime_dependency "kramdown", ">= 1.13", "< 3.0"
    spec.add_runtime_dependency "coderay", "~> 1.1"

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_dataQuality.rb

@@ -28,24 +28,41 @@ module ADIWG
 
                   # data quality 2.1 (attracc) - attribute accuracy
                   xAccuracy = xDataQual.xpath('./attracc')
-                  accuracyReport = xAccuracy.xpath('./attraccr').text
-                  report = intMetadataClass.newDataQualityReport
-                  report[:type] = 'NonQuantitativeAttributeCorrectness'
-                  descriptiveResult = intMetadataClass.newDescriptiveResult
-                  descriptiveResult[:statement] = accuracyReport
-                  report[:descriptiveResult] << descriptiveResult
-                  hDataQuality[:report] << report
-
-                  # data quality 2.1 (qattracc) - Quantitative Attribute Accuracy Assessment
-                  xQuantitativeAccuracy = xDataQual.xpath('./qattracc')
-                  unless xQuantitativeAccuracy.xpath('./attraccv').empty?
-                     value = xQuantitativeAccuracy.xpath('./attraccv').text
-                     report = intMetadataClass.newDataQualityReport
-                     report[:type] = 'QuantitativeAttributeAccuracy'
-                     quantitativeResult = intMetadataClass.newQuantitativeResult
-                     quantitativeResult[:values] << value
-                     report[:quantitativeResult] << quantitativeResult
-                     hDataQuality[:report] << report
+                  unless xAccuracy.empty?
+                     # data quality 2.1.1 (attraccr) - Attribute Accuracy Report
+                     xAccuracyReport = xAccuracy.xpath('./attraccr')
+                     unless xAccuracyReport.empty?
+                        report = intMetadataClass.newDataQualityReport
+                        report[:type] = 'DQ_NonQuantitativeAttributeCorrectness'
+                        descriptiveResult = intMetadataClass.newDescriptiveResult
+                        descriptiveResult[:name] = 'Attribute Accuracy Report'
+                        descriptiveResult[:statement] = xAccuracyReport.text
+                        report[:descriptiveResult] << descriptiveResult
+                        hDataQuality[:report] << report
+                     end
+                     # data quality 2.1.2 (qattracc) - Quantitative Attribute Accuracy Assessment
+                     xQuantitativeAccuracy = xAccuracy.xpath('./qattracc')
+                     unless xQuantitativeAccuracy.empty?
+                        report = intMetadataClass.newDataQualityReport
+                        report[:type] = 'DQ_QuantitativeAttributeAccuracy'
+                        # data quality 2.1.2.1 (attraccv) - Attribute Accuracy Value
+                        xQuantitativeAccuracyValue = xQuantitativeAccuracy.xpath('./attraccv')
+                        unless xQuantitativeAccuracyValue.empty?
+                           quantitativeResult = intMetadataClass.newQuantitativeResult
+                           quantitativeResult[:name] = 'Attribute Accuracy Value'
+                           quantitativeResult[:values] << xQuantitativeAccuracyValue.text
+                           report[:quantitativeResult] << quantitativeResult
+                        end
+                        # data quality 2.1.2.2 (attracce) - Attribute Accuracy Explanation
+                        xEvaluationMethod = xQuantitativeAccuracy.xpath('./attracce')
+                        unless xEvaluationMethod.empty?
+                           evaluationMethod = intMetadataClass.newEvaluationMethod
+                           evaluationMethod[:name] = 'Attribute Accuracy Explanation'
+                           evaluationMethod[:methodDescription] = xEvaluationMethod.text
+                           report[:evaluationMethod] << evaluationMethod
+                        end
+                        hDataQuality[:report] << report unless report[:quantitativeResult].empty? && report[:evaluationMethod].empty?
+                     end
                   end
 
                   # data quality 2.2 (logic) - logical consistency (required) (not implemented)
@@ -55,9 +72,11 @@ module ADIWG
                   else
                      logic = xLogic.text
                      report = intMetadataClass.newDataQualityReport
-                     report[:type] = 'ConceptualConsistency'
-                     report[:qualityMeasure] = intMetadataClass.newQualityMeasure
-                     report[:qualityMeasure][:description] = logic
+                     report[:type] = 'DQ_ConceptualConsistency'
+                     descriptiveResult = intMetadataClass.newDescriptiveResult
+                     descriptiveResult[:name] = 'Logical Consistency Report'
+                     descriptiveResult[:statement] = logic
+                     report[:descriptiveResult] << descriptiveResult
                      hDataQuality[:report] << report
                   end
 
@@ -68,59 +87,74 @@ module ADIWG
                   else
                      complete = xComplete.text
                      report = intMetadataClass.newDataQualityReport
-                     report[:type] = 'Omission'
+                     report[:type] = 'DQ_CompletenessOmission'
                      descriptiveResult = intMetadataClass.newDescriptiveResult
+                     descriptiveResult[:name] = 'Completeness Report'
                      descriptiveResult[:statement] = complete
                      report[:descriptiveResult] << descriptiveResult
                      hDataQuality[:report] << report
                   end
 
-                  # data quality 2.4 (position) - positional accuracy
+                  # data quality 2.4 (posacc) - Positional Accuracy
                   xPositionalAccuracy = xDataQual.xpath('./posacc')
                   unless xPositionalAccuracy.empty?
-                     # horizontal positional accuracy
-                     xHorizontal = xPositionalAccuracy.xpath('./horizpa')
-                     unless xHorizontal.empty?
+                     # data quality 2.4.1 (horizpa) - Horizontal Positional Accuracy
+                     xHorizontalAccuracy = xPositionalAccuracy.xpath('./horizpa')
+                     unless xHorizontalAccuracy.empty?
                         report = intMetadataClass.newDataQualityReport
-                        report[:type] = 'AbsoluteExternalPositionalAccuracy'
-                        unless xHorizontal.xpath('qhorizpa/horizpae').empty?
-                           report[:qualityMeasure] = intMetadataClass.newQualityMeasure
-                           report[:qualityMeasure][:description] = xHorizontal.xpath('qhorizpa/horizpae').text
-                           name = 'Horizontal Positional Accuracy Report'
-                           report[:qualityMeasure][:nameOfMeasure] << name
+                        report[:type] = 'DQ_AbsoluteExternalPositionalAccuracy'
+                        # Combine Horizontal Positional Accuracy Report and Explanation
+                        descriptive_result_text = ''
+                        xHorizontalAccuracyReport = xHorizontalAccuracy.xpath('./horizpar')
+                        unless xHorizontalAccuracyReport.empty?
+                           descriptive_result_text += xHorizontalAccuracyReport.text
                         end
-                        unless xHorizontal.xpath('horizpar').empty?
-                           report[:evaluationMethod] = intMetadataClass.newEvaluationMethod
-                           report[:evaluationMethod][:methodDescription] = xHorizontal.xpath('horizpar').text
+                        xQuantitativeHorizontalAccuracy = xHorizontalAccuracy.xpath('./qhorizpa')
+                        unless xQuantitativeHorizontalAccuracy.empty?
+                           xHorizontalAccuracyValue = xQuantitativeHorizontalAccuracy.xpath('horizpav')
+                           unless xHorizontalAccuracyValue.empty?
+                              descriptive_result_text += " Value: #{xHorizontalAccuracyValue.text}"
+                           end
+                           xHorizontalAccuracyExplanation = xQuantitativeHorizontalAccuracy.xpath('horizpae')
+                           unless xHorizontalAccuracyExplanation.empty?
+                              descriptive_result_text += " Explanation: #{xHorizontalAccuracyExplanation.text}"
+                           end
                         end
-                        unless xHorizontal.xpath('qhorizpa/horizpav').empty?
-                           quantitativeResult = intMetadataClass.newQuantitativeResult
-                           value = xHorizontal.xpath('qhorizpa/horizpav').text
-                           quantitativeResult[:values] << value
-                           report[:quantitativeResult] << quantitativeResult
+                        unless descriptive_result_text.empty?
+                           descriptiveResult = intMetadataClass.newDescriptiveResult
+                           descriptiveResult[:name] = 'Horizontal Positional Accuracy Report'
+                           descriptiveResult[:statement] = descriptive_result_text
+                           report[:descriptiveResult] << descriptiveResult
                         end
                         hDataQuality[:report] << report
                      end
-                     # vertical positional accuracy
-                     xVertical = xPositionalAccuracy.xpath('./vertacc')
-                     unless xVertical.empty?
+                     # data quality 2.4.2 (vertacc) - Vertical Positional Accuracy
+                     xVerticalAccuracy = xPositionalAccuracy.xpath('./vertacc')
+                     unless xVerticalAccuracy.empty?
                         report = intMetadataClass.newDataQualityReport
-                        report[:type] = 'AbsoluteExternalPositionalAccuracy'
-                        unless xVertical.xpath('qvertpa/vertacce').empty?
-                           report[:qualityMeasure] = intMetadataClass.newQualityMeasure
-                           report[:qualityMeasure][:description] = xVertical.xpath('qvertpa/vertacce').text
-                           name = 'Vertical Positional Accuracy Report'
-                           report[:qualityMeasure][:nameOfMeasure] << name
+                        report[:type] = 'DQ_AbsoluteExternalPositionalAccuracy'
+                        # Combine Vertical Positional Accuracy Report and Explanation
+                        descriptive_result_text = ''
+                        xVerticalAccuracyReport = xVerticalAccuracy.xpath('./vertaccr')
+                        unless xVerticalAccuracyReport.empty?
+                           descriptive_result_text += xVerticalAccuracyReport.text
                         end
-                        unless xVertical.xpath('vertaccr').empty?
-                           report[:evaluationMethod] = intMetadataClass.newEvaluationMethod
-                           report[:evaluationMethod][:methodDescription] = xVertical.xpath('vertaccr').text
+                        xVerticalAccuracyAssessment = xVerticalAccuracy.xpath('./qvertpa')
+                        unless xVerticalAccuracyAssessment.empty?
+                           xVerticalAccuracyValue = xVerticalAccuracyAssessment.xpath('vertaccv')
+                           unless xVerticalAccuracyValue.empty?
+                              descriptive_result_text += " Value: #{xVerticalAccuracyValue.text}"
+                           end
+                           xVerticalAccuracyExplanation = xVerticalAccuracyAssessment.xpath('vertacce')
+                           unless xVerticalAccuracyExplanation.empty?
+                              descriptive_result_text += " Explanation: #{xVerticalAccuracyExplanation.text}"
+                           end
                         end
-                        unless xVertical.xpath('qvertpa/vertaccv').empty?
-                           quantitativeResult = intMetadataClass.newQuantitativeResult
-                           value = xVertical.xpath('qvertpa/vertaccv').text
-                           quantitativeResult[:values] << value
-                           report[:quantitativeResult] << quantitativeResult
+                        unless descriptive_result_text.empty?
+                           descriptiveResult = intMetadataClass.newDescriptiveResult
+                           descriptiveResult[:name] = 'Vertical Positional Accuracy Report'
+                           descriptiveResult[:statement] = descriptive_result_text
+                           report[:descriptiveResult] << descriptiveResult
                         end
                         hDataQuality[:report] << report
                      end
@@ -146,4 +180,4 @@ module ADIWG
          end
       end
    end
-end
+end

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

@@ -23,6 +23,11 @@ module ADIWG
               intConformanceResult[:scope] = Scope.unpack(hConformanceResult['scope'], responseObj)
             end
 
+            # name
+            if hConformanceResult.has_key?('name')
+              intConformanceResult[:name] = hConformanceResult['name']
+            end
+
             #specification
             if hConformanceResult.has_key?('specification')
               intConformanceResult[:specification] = Citation.unpack(hConformanceResult['specification'], responseObj)

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

@@ -26,6 +26,10 @@ module ADIWG
               intResult[:scope] = Scope.unpack(hResult['scope'], responseObj)
             end
 
+            # name
+            if hResult.has_key?('name')
+              intResult[:name] = hResult['name']
+            end
 
             # spatialRepresentationType
             if hResult.has_key?('spatialRepresentationType')

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

@@ -38,6 +38,14 @@ module ADIWG
                   intMetadataClass = InternalMetadata.new
                   intDictionary = intMetadataClass.newDataDictionary
 
+                  # dictionary - id 
+                  if hDictionary.has_key?('dictionaryId')
+                     s = hDictionary['dictionaryId']
+                     if s != ''
+                        intDictionary[:dictionaryId] = s
+                     end
+                  end
+
                   # dictionary - description
                   if hDictionary.has_key?('description')
                      s = hDictionary['description']

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

@@ -35,6 +35,13 @@ module ADIWG
               end
             end
 
+            if hDataQuality.has_key?('systemIdentifier')
+              systemIdentifier = hDataQuality['systemIdentifier']
+              intDataQuality[:systemIdentifier] = {}
+              intDataQuality[:systemIdentifier][:uid] = systemIdentifier['uid']
+              intDataQuality[:systemIdentifier][:label] = systemIdentifier['label']
+            end
+
             if hDataQuality.has_key?('standaloneQualityReport')
               hObject = hDataQuality['standaloneQualityReport']
               unless hObject.empty?

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

@@ -25,6 +25,10 @@ module ADIWG
               intResult[:scope] = Scope.unpack(hResult['scope'], responseObj)
             end
 
+            if hResult.has_key?('name')
+              intResult[:name] = hResult['name']
+            end
+
             if hResult.has_key?('statement')
               intResult[:statement] = hResult['statement']
             end

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

@@ -25,6 +25,10 @@ module ADIWG
               intResult[:scope] = Scope.unpack(hResult['scope'], responseObj)
             end
 
+            if hResult.has_key?('name')
+              intResult[:name] = hResult['name']
+            end
+
             if hResult.has_key?('value')
               intResult[:values] = hResult['value']
             end

data/lib/adiwg/mdtranslator/version.rb

@@ -109,7 +109,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.20.0-beta.3"
+      VERSION = "2.20.0-beta.7"
    end
 end
 

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

@@ -8,124 +8,142 @@
 require_relative 'class_lineage'
 
 module ADIWG
-   module Mdtranslator
-      module Writers
-         module Fgdc
-
-            class DataQuality
-
-               def initialize(xml, hResponseObj)
-                  @xml = xml
-                  @hResponseObj = hResponseObj
-                  @NameSpace = ADIWG::Mdtranslator::Writers::Fgdc
-               end
-
-               def writeXML(intObj)
-
-                  # classes used
-                  lineageClass = Lineage.new(@xml, @hResponseObj)
-
-                  hDataQuality = intObj.dig(:metadata, :dataQuality, 0)
-
-                  if hDataQuality && hDataQuality[:report]
-                     # data quality 2.1 (attracc) - attribute accuracy (not implemented)
-                     attribute_completeness_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'NonQuantitativeAttributeCorrectness' &&
-                        !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)
-                     logic_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'ConceptualConsistency' &&
-                        !report.dig(:qualityMeasure, :description).nil?
-                     end
-
-                     if logic = logic_report&.dig(:qualityMeasure, :description)
-                        @xml.tag!('logic', logic)
-                     else
-                        @xml.tag!('logic', 'Not Reported')
-                     end
-
-                     # data quality 2.3 (complete) - completion report (not implemented) (required)
-                     completeness_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'Omission' &&
-                        !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
-
-
-                     horizontal_positional_accuracy_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'AbsoluteExternalPositionalAccuracy' &&
-                        report.dig(:qualityMeasure, :nameOfMeasure)&.any? { |name|
-                           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] == 'AbsoluteExternalPositionalAccuracy' &&
-                        report.dig(:qualityMeasure, :nameOfMeasure)&.any? { |name|
-                           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
+  module Mdtranslator
+    module Writers
+      module Fgdc
+
+        class DataQuality
+
+          def initialize(xml, hResponseObj)
+            @xml = xml
+            @hResponseObj = hResponseObj
+            @NameSpace = ADIWG::Mdtranslator::Writers::Fgdc
+          end
+
+          def writeXML(intObj)
+
+            # classes used
+            lineageClass = Lineage.new(@xml, @hResponseObj)
+
+            hDataQuality = intObj.dig(:metadata, :dataQuality, 0)
+
+            if hDataQuality && hDataQuality[:report]
+              # data quality 2.1 (attracc) - Attribute Accuracy
+              attribute_accuracy_report_text = hDataQuality[:report].select do |report|
+                [
+                  'DQ_NonQuantitativeAttributeCorrectness',
+                  'DQ_ThematicClassificationCorrectness'
+                ].include?(report[:type]) && !report.dig(:descriptiveResult, 0, :statement).nil?
+              end.map { |report| report.dig(:descriptiveResult, 0, :statement) }.compact.join(' ')
+
+              quantitative_attribute_accuracy = hDataQuality[:report].find { |report| report[:type] == 'DQ_QuantitativeAttributeAccuracy' }
+              attribute_accuracy_value = quantitative_attribute_accuracy.dig(:quantitativeResult, 0, :values, 0) if quantitative_attribute_accuracy
+              attribute_evaluation_method = quantitative_attribute_accuracy.dig(:evaluationMethod, :methodDescription) if quantitative_attribute_accuracy
+
+              if attribute_accuracy_report_text != '' || attribute_accuracy_value || attribute_evaluation_method
+                @xml.tag!('attracc') do
+                  @xml.tag!('attraccr', attribute_accuracy_report_text) unless attribute_accuracy_report_text.empty?
+                  if attribute_accuracy_value || attribute_evaluation_method
+                    @xml.tag!('qattracc') do
+                      @xml.tag!('attraccv', attribute_accuracy_value) if attribute_accuracy_value
+                      @xml.tag!('attracce', attribute_evaluation_method) if attribute_evaluation_method
+                    end
                   end
-
-                  # data quality 2.5 (lineage) - lineage (required)
-                  unless intObj[:metadata][:lineageInfo].empty?
-                     @xml.tag!('lineage') do
-                        lineageClass.writeXML(intObj[:metadata][:lineageInfo])
-                     end
-                  end
-                  if intObj[:metadata][:lineageInfo].empty?
-                     @NameSpace.issueWarning(350, nil, 'data quality section')
+                end
+              elsif @hResponseObj[:writerShowTags]
+                @xml.tag!('attracc', 'Not Reported')
+              end
+
+              # data quality 2.2 (logic) - logical consistency (required)
+              logic_reports = hDataQuality[:report].select do |report|
+                [
+                  'DQ_ConceptualConsistency',
+                  'DQ_DomainConsistency',
+                  'DQ_FormatConsistency',
+                  'DQ_TopologicalConsistency'
+                ].include?(report[:type]) && !report.dig(:descriptiveResult, 0, :statement).nil?
+              end
+
+              logic = logic_reports.map { |report| report.dig(:descriptiveResult, 0, :statement) }.compact.join(' ')
+
+              if logic != ''
+                @xml.tag!('logic', logic)
+              else
+                @xml.tag!('logic', 'Not Reported')
+              end
+
+              # data quality 2.3 (complete) - completion report (required)
+              omission = hDataQuality[:report].find { |report| report[:type] == 'DQ_CompletenessOmission' }&.dig(:descriptiveResult, 0, :statement)
+              commission = hDataQuality[:report].find { |report| report[:type] == 'DQ_CompletenessCommission' }&.dig(:descriptiveResult, 0, :statement)
+              complete = [omission, commission].compact.join(' ')
+              if complete != ''
+                @xml.tag!('complete', complete)
+              else
+                @xml.tag!('complete', 'Not Reported')
+              end
+
+              # data quality 2.4 (posacc) - Positional Accuracy
+              reports = hDataQuality[:report].select do |report|
+                [
+                  'DQ_AbsoluteExternalPositionalAccuracy',
+                  'DQ_RelativeInternalPositionalAccuracy',
+                  'DQ_GriddedDataPositionalAccuracy'
+                ].include?(report[:type]) && !report.dig(:descriptiveResult, 0, :statement).nil?
+              end
+
+              horizpar = ''
+              vertaccr = ''
+
+              reports.each do |report|
+                descriptive_result = report.dig(:descriptiveResult, 0)
+                next unless descriptive_result
+
+                if descriptive_result[:name] == 'Vertical Positional Accuracy Report'
+                  vertaccr = descriptive_result[:statement]
+                else
+                  horizpar = descriptive_result[:statement]
+                end
+              end
+
+              if !horizpar.empty? || !vertaccr.empty?
+                @xml.tag!('posacc') do
+                  if !horizpar.empty?
+                    @xml.tag!('horizpa') do
+                      @xml.tag!('horizpar', horizpar)
+                    end
                   end
 
-                  # data quality 2.6 (cloud) - cloud cover (not implemented)
-                  if @hResponseObj[:writerShowTags]
-                     @xml.tag!('cloud', 'Not Reported')
+                  if !vertaccr.empty?
+                    @xml.tag!('vertacc') do
+                      @xml.tag!('vertaccr', vertaccr)
+                    end
                   end
+                end
+              elsif @hResponseObj[:writerShowTags]
+                @xml.tag!('position', 'Not Reported')
+              end
+
+              # data quality 2.5 (lineage) - lineage (required)
+              unless intObj[:metadata][:lineageInfo].empty?
+                @xml.tag!('lineage') do
+                  lineageClass.writeXML(intObj[:metadata][:lineageInfo])
+                end
+              end
+              if intObj[:metadata][:lineageInfo].empty?
+                @NameSpace.issueWarning(350, nil, 'data quality section')
+              end
+
+              # data quality 2.6 (cloud) - cloud cover (not implemented)
+              if @hResponseObj[:writerShowTags]
+                @xml.tag!('cloud', 'Not Reported')
+              end
+
+            end # writeXML
+          end # DataQuality
+
+        end # Quality
 
-               end # writeXML
-            end # Quality
-
-         end
       end
-   end
-end
+    end
+  end
+end

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

@@ -127,7 +127,7 @@ module ADIWG
 
                                     # altitude bounding (altmax) - maximum altitude (required)
                                     unless hBBox[:maximumAltitude].nil?
-                                       @xml.tag!('altmax', hBBox[:minimumAltitude])
+                                       @xml.tag!('altmax', hBBox[:maximumAltitude])
                                     end
                                     if hBBox[:maximumAltitude].nil?
                                        @NameSpace.issueWarning(372, 'altmax')