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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec23318ef18dc9729c5aaa6c608b55c856234d8e31a893b6c011f02494f75718
-  data.tar.gz: d28e618a12660f940c9fbc4d3ea380c1109cdc2c7756a32872c2f2e84b4e2c64
+  metadata.gz: d8d8a5f731fb5ada7138ee650206ed3a6f81d36ffcbbb52fece5f13befb9bcce
+  data.tar.gz: a2023846f039cdfe3dde6f851f13ad463afd36644e9a5a460c2d6416e644c450
 SHA512:
-  metadata.gz: 6c81ced313a48931ef23b337d408f512932836b81368c535eb197dc0950795b8510deea40f5a130b4372b3110f1d9020fb943d7537de8e80184dc88b25fe8994
-  data.tar.gz: 0566ba79a6004232a532bd7eda527bb60a90191ea0a0ba47baf38764efa014341074a31418cdc798f82a2fe5a5860f13d9f8a3e9dce8d170389edea39392a47d
+  metadata.gz: d297c28d28dc4f19840b476ba86fb6e89b36d106019a20f7ceedd58b9f36f27e8006eb8c49dcc0de935b060557e25466f7d3deeef8f3de6d05bc7ea981f189d0
+  data.tar.gz: 8093a1f20c10929bb69aa9635a6b7f1e2532300f8db5f6761e025651fde5a0ea1ca9b89d8e2111eb8d5da1b98db995f6ca66e50e49fbbfc95ec3d6cfd72027e5

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.0)
+      adiwg-mdcodes (= 2.10.0)
+      adiwg-mdjson_schemas (= 2.9.5)
       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.0)
       json (~> 2.0)
-    adiwg-mdjson_schemas (2.9.3.pre.beta.0)
+    adiwg-mdjson_schemas (2.9.5)
     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.9.5"
+   spec.add_runtime_dependency "adiwg-mdcodes", "2.10.0"
    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,39 @@ 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?
+                           report[:evaluationMethod] = intMetadataClass.newEvaluationMethod
+                           report[:evaluationMethod][:methodDescription] = xEvaluationMethod.text
+                        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 +70,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 +85,86 @@ 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'
+                        # data quality 2.4.1.1 (horizpar) - Horizontal Positional Accuracy Report
+                        xHorizontalAccuracyReport = xHorizontalAccuracy.xpath('./horizpar')
+                        unless xHorizontalAccuracyReport.empty?
+                           descriptiveResult = intMetadataClass.newDescriptiveResult
+                           descriptiveResult[:name] = 'Horizontal Positional Accuracy Report'
+                           descriptiveResult[:statement] = xHorizontalAccuracyReport.text
+                           report[:descriptiveResult] << descriptiveResult
                         end
-                        unless xHorizontal.xpath('horizpar').empty?
-                           report[:evaluationMethod] = intMetadataClass.newEvaluationMethod
-                           report[:evaluationMethod][:methodDescription] = xHorizontal.xpath('horizpar').text
-                        end
-                        unless xHorizontal.xpath('qhorizpa/horizpav').empty?
-                           quantitativeResult = intMetadataClass.newQuantitativeResult
-                           value = xHorizontal.xpath('qhorizpa/horizpav').text
-                           quantitativeResult[:values] << value
-                           report[:quantitativeResult] << quantitativeResult
+                        # data quality 2.4.1.2 (qhorizpa) - Quantitative Horizontal Positional Accuracy Assessment
+                        xQuantitativeHorizontalAccuracy = xHorizontalAccuracy.xpath('./qhorizpa')
+                        unless xQuantitativeHorizontalAccuracy.empty?
+                           # data quality 2.4.1.2.1 (horizpav) - Horizontal Positional Accuracy Value
+                           xHorizontalAccuracyValue = xQuantitativeHorizontalAccuracy.xpath('horizpav')
+                           unless xHorizontalAccuracyValue.empty?
+                              quantitativeResult = intMetadataClass.newQuantitativeResult
+                              value = xHorizontalAccuracyValue.text
+                              quantitativeResult[:name] = 'Horizontal Positional Accuracy Value'
+                              quantitativeResult[:values] << value
+                              report[:quantitativeResult] << quantitativeResult
+                           end
+                           # data quality 2.4.1.2.2 (horizpae) - Horizontal Positional Accuracy Explanation
+                           xHorizontalAccuracyExplanation = xQuantitativeHorizontalAccuracy.xpath('horizpae')
+                           unless xHorizontalAccuracyExplanation.empty?
+                              descriptiveResult = intMetadataClass.newDescriptiveResult
+                              descriptiveResult[:name] = 'Horizontal Positional Accuracy Explanation'
+                              descriptiveResult[:statement] = xHorizontalAccuracyExplanation.text
+                              report[:descriptiveResult] << descriptiveResult
+                           end
                         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
-                        end
-                        unless xVertical.xpath('vertaccr').empty?
-                           report[:evaluationMethod] = intMetadataClass.newEvaluationMethod
-                           report[:evaluationMethod][:methodDescription] = xVertical.xpath('vertaccr').text
+                        report[:type] = 'DQ_AbsoluteExternalPositionalAccuracy'
+                        # data quality 2.4.2.1 (vertaccr) - Vertical Positional Accuracy Report
+                        xVerticalAccuracyReport = xVerticalAccuracy.xpath('./vertaccr')
+                        unless xVerticalAccuracyReport.empty?
+                           descriptiveResult = intMetadataClass.newDescriptiveResult
+                           descriptiveResult[:name] = 'Vertical Positional Accuracy Report'
+                           descriptiveResult[:statement] = xVerticalAccuracyReport.text
+                           report[:descriptiveResult] << descriptiveResult
                         end
-                        unless xVertical.xpath('qvertpa/vertaccv').empty?
-                           quantitativeResult = intMetadataClass.newQuantitativeResult
-                           value = xVertical.xpath('qvertpa/vertaccv').text
-                           quantitativeResult[:values] << value
-                           report[:quantitativeResult] << quantitativeResult
+                        # data quality 2.4.2.2 (qvertpa) - Quantitative Vertical Positional Accuracy Assessment
+                        xVerticalAccuracyAssessment = xVerticalAccuracy.xpath('./qvertpa')
+                        unless xVerticalAccuracyAssessment.empty?
+                           # data quality 2.4.2.2.1 (vertaccv) - Vertical Positional Accuracy Value
+                           xVerticalAccuracyValue = xVerticalAccuracyAssessment.xpath('vertaccv')
+                           unless xVerticalAccuracyValue.empty?
+                              quantitativeResult = intMetadataClass.newQuantitativeResult
+                              value = xVerticalAccuracyValue.text
+                              quantitativeResult[:name] = 'Vertical Positional Accuracy Value'
+                              quantitativeResult[:values] << value
+                              report[:quantitativeResult] << quantitativeResult
+                           end
+                           # data quality 2.4.2.2.2 (vertacce) - Vertical Positional Accuracy Explanation
+                           xVerticalAccuracyExplanation = xVerticalAccuracyAssessment.xpath('vertacce')
+                           unless xVerticalAccuracyExplanation.empty?
+                              descriptiveResult = intMetadataClass.newDescriptiveResult
+                              descriptiveResult[:name] = 'Vertical Positional Accuracy Explanation'
+                              descriptiveResult[:statement] = xVerticalAccuracyExplanation.text
+                              report[:descriptiveResult] << descriptiveResult
+                           end
                         end
                         hDataQuality[:report] << report
                      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_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.5"
    end
 end
 

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

@@ -28,77 +28,147 @@ module ADIWG
                   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' &&
+                     # data quality 2.1 (attracc) - Attribute Accuracy
+                     attribute_accuracy_report = hDataQuality[:report].find do |report|
+                        report[:type] == 'DQ_NonQuantitativeAttributeCorrectness' &&
                         !report.dig(:descriptiveResult, 0, :statement).nil?
                      end
-
-                     if attribute_completeness_report
+                     attribute_accuracy_value = hDataQuality[:report].find do |report|
+                        report[:type] == 'DQ_QuantitativeAttributeAccuracy' &&
+                        !report.dig(:quantitativeResult, 0, :values).nil?
+                     end
+                     attribute_evaluation_method = hDataQuality[:report].find do |report|
+                        report[:type] == 'DQ_QuantitativeAttributeAccuracy' &&
+                        !report.dig(:evaluationMethod, :methodDescription).nil?
+                     end
+                     if attribute_accuracy_report || attribute_accuracy_value || attribute_evaluation_method
+                        # data quality 2.1 (attracc) - Attribute Accuracy
                         @xml.tag!('attracc') do
-                           @xml.tag!('attraccr', attribute_completeness_report[:descriptiveResult][0][:statement])
+                           if attribute_accuracy_report
+                              # data quality 2.1.1 (attraccr) - Attribute Accuracy Report
+                              @xml.tag!('attraccr', attribute_accuracy_report[:descriptiveResult][0][:statement])
+                           end
+                           if attribute_accuracy_value || attribute_evaluation_method
+                              # data quality 2.1.2 (qattracc) - Quantitative Attribute Accuracy Assessment
+                              @xml.tag!('qattracc') do
+                                 if attribute_accuracy_value
+                                    # data quality 2.1.2.1 (attraccv) - Attribute Accuracy Value
+                                    @xml.tag!('attraccv', attribute_accuracy_value[:quantitativeResult][0][:values][0])
+                                 end
+                                 if attribute_evaluation_method
+                                    # data quality 2.1.2.2 (attracce) - Attribute Accuracy Explanation
+                                    @xml.tag!('attracce', attribute_evaluation_method[:evaluationMethod][:methodDescription])
+                                 end
+                              end
+                           end
                         end
                      elsif @hResponseObj[:writerShowTags]
                         @xml.tag!('attracc', 'Not Reported')
                      end
 
-                     # data quality 2.2 (logic) - logical consistency (not implemented) (required)
+                     # data quality 2.2 (logic) - logical consistency (required)
                      logic_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'ConceptualConsistency' &&
-                        !report.dig(:qualityMeasure, :description).nil?
+                        report[:type] == 'DQ_ConceptualConsistency' &&
+                        !report.dig(:descriptiveResult, 0, :statement).nil?
                      end
-
-                     if logic = logic_report&.dig(:qualityMeasure, :description)
+                     if logic = logic_report&.dig(:descriptiveResult, 0, :statement)
                         @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' &&
+                     # data quality 2.3 (complete) - completion report (required)
+                     omission_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)
+                     omission = omission_report&.dig(:descriptiveResult, 0, :statement)
+                     commission_report = hDataQuality[:report].find do |report|
+                        report[:type] == 'DQ_CompletenessCommission' &&
+                        !report.dig(:descriptiveResult, 0, :statement).nil?
+                     end
+                     commission = commission_report&.dig(:descriptiveResult, 0, :statement)
+                     complete = ''
+                     if omission
+                        complete = omission
+                     end
+                     if commission
+                        if complete != ''
+                           complete = complete + ' ' + commission
+                        else
+                           complete = commission
+                        end
+                     end
+                     if complete != ''
                         @xml.tag!('complete', complete)
                      else
                         @xml.tag!('complete', 'Not Reported')
                      end
 
-                     # data quality 2.4 (position) - positional accuracy
-
+                     # data quality 2.4 (position) - Positional Accuracy
 
+                     # data quality 2.4.1 (horizpa) - Horizontal 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'
-                        }
+                        report[:type] == 'DQ_AbsoluteExternalPositionalAccuracy' &&
+                        report.dig(:descriptiveResult, 0, :name) == 'Horizontal Positional Accuracy Report' &&
+                        !report.dig(:descriptiveResult, 0, :statement).nil? 
                      end
+                     horizpar = horizontal_positional_accuracy_report&.dig(:descriptiveResult, 0, :statement)
+                     horizpav = horizontal_positional_accuracy_report&.dig(:quantitativeResult, 0, :values, 0)
+                     horizpae = horizontal_positional_accuracy_report&.dig(:descriptiveResult, 1, :statement)
 
-                     horizpar = horizontal_positional_accuracy_report&.dig(:evaluationMethod, :methodDescription)
-
-
+                     # data quality 2.4.2 (vertacc) - Vertical Positional Accuracy
                      vertical_positional_accuracy_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'AbsoluteExternalPositionalAccuracy' &&
-                        report.dig(:qualityMeasure, :nameOfMeasure)&.any? { |name|
-                           name == 'Vertical Positional Accuracy Report'
-                        }
+                        report[:type] == 'DQ_AbsoluteExternalPositionalAccuracy' &&
+                        report.dig(:descriptiveResult, 0, :name) == 'Vertical Positional Accuracy Report' &&
+                        !report.dig(:descriptiveResult, 0, :statement).nil?
                      end
-
-                     vertaccr = vertical_positional_accuracy_report&.dig(:evaluationMethod, :methodDescription)
+                     vertaccr = vertical_positional_accuracy_report&.dig(:descriptiveResult, 0, :statement)
+                     vertaccv = vertical_positional_accuracy_report&.dig(:quantitativeResult, 0, :values, 0)
+                     vertacce = vertical_positional_accuracy_report&.dig(:descriptiveResult, 1, :statement)
 
                      if horizpar || vertaccr
+                        # data quality 2.4 (posacc) - Positional Accuracy
                         @xml.tag!('posacc') do
                            if horizpar
+                              # data quality 2.4.1 (horizpa) - Horizontal Positional Accuracy
                               @xml.tag!('horizpa') do
+                                 # data quality 2.4.1.1 (horizpar) - Horizontal Positional Accuracy Report
                                  @xml.tag!('horizpar', horizpar)
+                                 if horizpav || horizpae
+                                    # data quality 2.4.1.2 (qhorizpa) - Quantitative Horizontal Positional Accuracy
+                                    @xml.tag!('qhorizpa') do
+                                       if horizpav
+                                          # data quality 2.4.1.2.1 (horizpav) - Horizontal Positional Accuracy Value
+                                          @xml.tag!('horizpav', horizpav)
+                                       end
+                                       if horizpae
+                                          # data quality 2.4.1.2.2 (horizpae) - Horizontal Positional Accuracy Explanation
+                                          @xml.tag!('horizpae', horizpae)
+                                       end
+                                    end
+                                 end
                               end
                            end
 
                            if vertaccr
+                              # data quality 2.4.2 (vertacc) - Vertical Positional Accuracy
                               @xml.tag!('vertacc') do
+                                 # data quality 2.4.2.1 (vertaccr) - Vertical Positional Accuracy Report
                                  @xml.tag!('vertaccr', vertaccr)
+                                 if vertaccv || vertacce
+                                    # data quality 2.4.2.2 (qvertpa) - Quantitative Vertical Positional Accuracy
+                                    @xml.tag!('qvertpa') do
+                                       if vertaccv
+                                          # data quality 2.4.2.2.1 (vertaccv) - Vertical Positional Accuracy Value
+                                          @xml.tag!('vertaccv', vertaccv)
+                                       end
+                                       if vertacce
+                                          # data quality 2.4.2.2.2 (vertacce) - Vertical Positional Accuracy Explanation
+                                          @xml.tag!('vertacce', vertacce)
+                                       end
+                                    end
+                                 end
                               end
                            end
                         end

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

@@ -16,6 +16,22 @@ module ADIWG
             scopeClass = Html_Scope.new(@html)
             dataQualityReportClass = Html_DataQualityReport.new(@html)
 
+            # system identifier
+            unless hDataQuality[:systemIdentifier].nil?
+              systemIdentifier = hDataQuality[:systemIdentifier]
+              @html.section(:class => 'block') do
+                @html.details do
+                  @html.summary('System Identifier', {'class' => 'h4'})
+                    @html.em('UUID: ')
+                    @html.text!(systemIdentifier[:uid])
+                    @html.br
+                    @html.em('Label:')
+                    @html.text!(systemIdentifier[:label])
+                    @html.br
+                end
+              end
+            end
+
             # scope
             unless hDataQuality[:scope].empty?
               @html.section(:class => 'block') do
@@ -64,7 +80,7 @@ module ADIWG
                   hDataQuality[:report].each do |report|
                     @html.section(:class => 'block') do
                       @html.details do
-                        @html.summary('Report', {'class' => 'h5'})
+                        @html.summary(report[:type], {'class' => 'h5'})
                         dataQualityReportClass.writeHtml(report)
                       end
                     end

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

@@ -185,6 +185,13 @@ module ADIWG
                       end
                     end
                   end
+
+                  # Name
+                  unless result[:name].nil?
+                    @html.em('Name: ')
+                    @html.text!(result[:name])
+                    @html.br
+                  end
             
                   # Specification (citation)
                   unless result[:specification].empty?
@@ -242,6 +249,13 @@ module ADIWG
                     end
                   end
             
+                  # Name
+                  unless result[:name].nil?
+                    @html.em('Name: ')
+                    @html.text!(result[:name])
+                    @html.br
+                  end
+            
                   # SpatialRepresentationType
                   unless result[:spatialRepresentationType].nil?
                     @html.em('Spatial Representation Type: ')
@@ -317,6 +331,13 @@ module ADIWG
                       end
                     end
                   end
+
+                  # Name
+                  unless result[:name].nil?
+                    @html.em('Name: ')
+                    @html.text!(result[:name])
+                    @html.br
+                  end
             
                   # Statement
                   unless result[:statement].nil?
@@ -352,6 +373,13 @@ module ADIWG
                       end
                     end
                   end
+
+                  # Name
+                  unless result[:name].nil?
+                    @html.em('Name: ')
+                    @html.text!(result[:name])
+                    @html.br
+                  end
             
                   # Value
                   unless result[:values].empty?

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

@@ -277,6 +277,33 @@ module ADIWG
 
                      # data identification - resource constraints [] {MD_Constraints}
                      aConstraint = hResource[:constraints]
+                     legalConstraint = aConstraint.find { |hCon| hCon[:type] == 'legal' }
+                     # handle distribution liability statements - add to legal constraint -> other constraints
+                     aDistInfo = hMetadata[:distributorInfo]
+                     liabilityStatements = []
+                     aDistInfo.each do |hDistribution|
+                        unless hDistribution.empty?
+                           unless hDistribution[:liabilityStatement].nil?
+                              liabilityStatements << hDistribution[:liabilityStatement]
+                           end
+                        end
+                     end
+                     if liabilityStatements.any?
+                        # Create a new legal constraint if it doesn't exist
+                        unless legalConstraint
+                           legalConstraint = {
+                              type: 'legal',
+                              legalConstraint: {
+                                 otherCons: []
+                              }
+                           }
+                           aConstraint << legalConstraint
+                        end
+                        liabilityStatements.each do |liabilityStatement|
+                           legalConstraint[:legalConstraint][:otherCons] << liabilityStatement
+                        end
+                     end
+
                      aConstraint.each do |hCon|
                         @xml.tag!('mri:resourceConstraints') do
                            constraintClass.writeXML(hCon, 'resource information')
@@ -286,6 +313,8 @@ module ADIWG
                         @xml.tag!('mri:resourceConstraints')
                      end
 
+                     # data identification - resource constraints {}  from distribution liability statement
+
                      # data identification - associated resource [] {MD_AssociatedResource}
                      aAssocRes.each do |hAssocRes|
                         @xml.tag!('mri:associatedResource') do

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

@@ -34,7 +34,7 @@ module ADIWG
             citationClass = CI_Citation.new(@xml, @hResponseObj)
 
             @xml.tag!('mdq:report') do
-              @xml.tag!("mdq:DQ_#{hReport[:type]}") do
+              @xml.tag!("mdq:#{hReport[:type]}") do
 
                 # standaloneQualityReportDetails
                 unless hReport[:standaloneQualityReportDetails].nil?

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

@@ -24,7 +24,16 @@ module ADIWG
                   # date - date (required)
                   unless date.nil?
                      case dateRes
-                        when 'Y', 'YM', 'YMD', 'YMDh', 'YMDhm', 'YMDhms'
+                        when 'Y'
+                           dateStr = AdiwgDateTimeFun.stringDateFromDateTime(date, 'Y')
+                           @xml.tag!('gco:Date', dateStr)
+                        when 'YM'
+                           dateStr = AdiwgDateTimeFun.stringDateFromDateTime(date, 'YM')
+                           @xml.tag!('gco:Date', dateStr)
+                        when 'YMD'
+                           dateStr = AdiwgDateTimeFun.stringDateFromDateTime(date, 'YMD')
+                           @xml.tag!('gco:Date', dateStr)
+                        when 'YMDh', 'YMDhm', 'YMDhms'
                            dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(date, 'YMDhms')
                            @xml.tag!('gco:DateTime', dateStr)
                         when 'YMDhZ', 'YMDhmZ', 'YMDhmsZ'

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

@@ -10,11 +10,12 @@ module ADIWG
         module ConformanceResult
           def self.build(hConformanceResult)
             Jbuilder.new do |json|
-              json.dateTime hConformanceResult[:dateTime]
-              json.scope Scope.build(hConformanceResult[:scope])
-              json.specification Citation.build(hConformanceResult[:specification])
-              json.explanation hConformanceResult[:explanation]
-              json.pass hConformanceResult[:pass]
+              json.dateTime hConformanceResult[:dateTime] unless hConformanceResult[:dateTime].nil?
+              json.scope Scope.build(hConformanceResult[:scope]) unless hConformanceResult[:scope].empty?
+              json.name hConformanceResult[:name] unless hConformanceResult[:name].nil?
+              json.specification Citation.build(hConformanceResult[:specification]) unless hConformanceResult[:specification].empty?
+              json.explanation hConformanceResult[:explanation] unless hConformanceResult[:explanation].nil?
+              json.pass hConformanceResult[:pass] unless hConformanceResult[:pass].nil?
             end
           end
         end

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

@@ -15,6 +15,7 @@ module ADIWG
             Jbuilder.new do |json|
                 json.dateTime hCoverageResult[:dateTime]
                 json.scope Scope.build(hCoverageResult[:scope]) unless hCoverageResult[:scope].empty?
+                json.name hCoverageResult[:name] unless hCoverageResult[:name].nil?
                 json.spatialRepresentationType hCoverageResult[:spatialRepresentationType]
                 json.spatialRepresentation SpatialRepresentation.build(hCoverageResult[:spatialRepresentation]) unless hCoverageResult[:spatialRepresentation].empty?
                 json.resultContentDescription CoverageDescription.build(hCoverageResult[:resultContentDescription]) unless hCoverageResult[:resultContentDescription].empty?

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

@@ -11,6 +11,7 @@ module ADIWG
             Jbuilder.new do |json|
               json.dateTime hResult[:dateTime] unless hResult[:dateTime].nil?
               json.scope Scope.build(hResult[:scope]) unless hResult[:scope].empty?
+              json.name hResult[:name] unless hResult[:name].nil?
               json.statement hResult[:statement] unless hResult[:statement].nil?
             end
           end

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

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

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

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

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

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

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

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

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.20.0.pre.beta.3
+  version: 2.20.0.pre.beta.5
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-09 00:00:00.000000000 Z
+date: 2024-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,28 +129,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.3.pre.beta.0
+        version: 2.9.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.3.pre.beta.0
+        version: 2.9.5
 - !ruby/object:Gem::Dependency
   name: adiwg-mdcodes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.4.pre.beta.0
+        version: 2.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.4.pre.beta.0
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement