Merge branch 'releases/2-19-0' into feature/DCAT-US-v1

adiwg · May 8, 2024 · 20af844 · 20af844
2 parents 3f55fe2 + 76a82fa
commit 20af844
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 54 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    adiwg-mdtranslator (2.20.0.pre.beta.1)
-      adiwg-mdcodes (= 2.9.2)
-      adiwg-mdjson_schemas (= 2.9.1)
+    adiwg-mdtranslator (2.20.0.pre.beta.2)
+      adiwg-mdcodes (= 2.9.4.pre.beta.0)
+      adiwg-mdjson_schemas (= 2.9.3.pre.beta.0)
       builder (~> 3.2)
       coderay (~> 1.1)
       jbuilder (~> 2.5)
@@ -17,59 +17,69 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (5.2.8.1)
-      activesupport (= 5.2.8.1)
+    actionview (7.1.3.2)
+      activesupport (= 7.1.3.2)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.8.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activesupport (7.1.3.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.8.5)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    adiwg-mdcodes (2.9.2)
+    adiwg-mdcodes (2.9.4.pre.beta.0)
       json (~> 2.0)
-    adiwg-mdjson_schemas (2.9.1)
+    adiwg-mdjson_schemas (2.9.3.pre.beta.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     crass (1.0.6)
+    drb (2.2.1)
     erubi (1.12.0)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.11.5)
+    jbuilder (2.12.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    json (2.6.3)
+    json (2.7.2)
     json-schema (2.8.1)
       addressable (>= 2.4)
     kramdown (2.4.0)
       rexml
-    loofah (2.21.1)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     minitest (5.20.0)
-    nokogiri (1.15.5-arm64-darwin)
+    mutex_m (0.2.0)
+    nokogiri (1.15.6-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.5-x86_64-linux)
+    nokogiri (1.15.6-x86_64-linux)
       racc (~> 1.4)
-    public_suffix (4.0.7)
+    public_suffix (5.0.5)
     racc (1.7.3)
-    rails-dom-testing (2.1.1)
+    rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     rake (13.1.0)
-    rexml (3.2.5)
+    rexml (3.2.6)
     thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uuidtools (2.2.0)
 
 PLATFORMS

diff --git a/adiwg-mdtranslator.gemspec b/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.1"
-   spec.add_runtime_dependency "adiwg-mdcodes", "2.9.2"
+   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 "jbuilder", "~> 2.5"
    spec.add_runtime_dependency "kramdown", ">= 1.13", "< 3.0"
    spec.add_runtime_dependency "coderay", "~> 1.1"

diff --git a/lib/adiwg/mdtranslator/readers/fgdc/modules/module_dataQuality.rb b/lib/adiwg/mdtranslator/readers/fgdc/modules/module_dataQuality.rb
@@ -30,7 +30,7 @@ def self.unpack(xDataQual, hMetadata, hDataQuality, hResponseObj)
                   xAccuracy = xDataQual.xpath('./attracc')
                   accuracyReport = xAccuracy.xpath('./attraccr').text
                   report = intMetadataClass.newDataQualityReport
-                  report[:type] = 'NonQuantitativeAttributeAccuracy'
+                  report[:type] = 'NonQuantitativeAttributeCorrectness'
                   descriptiveResult = intMetadataClass.newDescriptiveResult
                   descriptiveResult[:statement] = accuracyReport
                   report[:descriptiveResult] << descriptiveResult
@@ -68,7 +68,7 @@ def self.unpack(xDataQual, hMetadata, hDataQuality, hResponseObj)
                   else
                      complete = xComplete.text
                      report = intMetadataClass.newDataQualityReport
-                     report[:type] = 'CompletenessOmission'
+                     report[:type] = 'Omission'
                      descriptiveResult = intMetadataClass.newDescriptiveResult
                      descriptiveResult[:statement] = complete
                      report[:descriptiveResult] << descriptiveResult
@@ -82,7 +82,7 @@ def self.unpack(xDataQual, hMetadata, hDataQuality, hResponseObj)
                      xHorizontal = xPositionalAccuracy.xpath('./horizpa')
                      unless xHorizontal.empty?
                         report = intMetadataClass.newDataQualityReport
-                        report[:type] = 'AbsoluteExternalPositionalAccuracy'
+                        report[:type] = 'AbsolutePositionalAccuracy'
                         unless xHorizontal.xpath('qhorizpa/horizpae').empty?
                            report[:qualityMeasure] = intMetadataClass.newQualityMeasure
                            report[:qualityMeasure][:description] = xHorizontal.xpath('qhorizpa/horizpae').text
@@ -105,7 +105,7 @@ def self.unpack(xDataQual, hMetadata, hDataQuality, hResponseObj)
                      xVertical = xPositionalAccuracy.xpath('./vertacc')
                      unless xVertical.empty?
                         report = intMetadataClass.newDataQualityReport
-                        report[:type] = 'AbsoluteExternalPositionalAccuracy'
+                        report[:type] = 'AbsolutePositionalAccuracy'
                         unless xVertical.xpath('qvertpa/vertacce').empty?
                            report[:qualityMeasure] = intMetadataClass.newQualityMeasure
                            report[:qualityMeasure][:description] = xVertical.xpath('qvertpa/vertacce').text

diff --git a/lib/adiwg/mdtranslator/readers/mdJson/modules/module_quantitativeResult.rb b/lib/adiwg/mdtranslator/readers/mdJson/modules/module_quantitativeResult.rb
@@ -26,7 +26,7 @@ def self.unpack(hResult, responseObj, inContext = nil)
             end
 
             if hResult.has_key?('value')
-              intResult[:value] = hResult['value']
+              intResult[:values] = hResult['value']
             end
 
             if hResult.has_key?('valueUnits')

diff --git a/lib/adiwg/mdtranslator/version.rb b/lib/adiwg/mdtranslator/version.rb
@@ -109,7 +109,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.20.0-beta.1"
+      VERSION = "2.20.0-beta.2"
    end
 end
 

diff --git a/lib/adiwg/mdtranslator/writers/fgdc/classes/class_dataQuality.rb b/lib/adiwg/mdtranslator/writers/fgdc/classes/class_dataQuality.rb
@@ -30,7 +30,7 @@ def writeXML(intObj)
                   if hDataQuality && hDataQuality[:report]
                      # data quality 2.1 (attracc) - attribute accuracy (not implemented)
                      attribute_completeness_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'NonQuantitativeAttributeCompleteness' &&
+                        report[:type] == 'NonQuantitativeAttributeCorrectness' &&
                         !report.dig(:descriptiveResult, 0, :statement).nil?
                      end
 
@@ -56,7 +56,7 @@ def writeXML(intObj)
 
                      # data quality 2.3 (complete) - completion report (not implemented) (required)
                      completeness_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'CompletenessOmission' &&
+                        report[:type] == 'Omission' &&
                         !report.dig(:descriptiveResult, 0, :statement).nil?
                      end
 
@@ -70,7 +70,7 @@ def writeXML(intObj)
 
 
                      horizontal_positional_accuracy_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'AbsoluteExternalPositionalAccuracy' &&
+                        report[:type] == 'AbsolutePositionalAccuracy' &&
                         report.dig(:qualityMeasure, :nameOfMeasure)&.any? { |name|
                            name == 'Horizontal Positional Accuracy Report'
                         }
@@ -80,7 +80,7 @@ def writeXML(intObj)
 
 
                      vertical_positional_accuracy_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'AbsoluteExternalPositionalAccuracy' &&
+                        report[:type] == 'AbsolutePositionalAccuracy' &&
                         report.dig(:qualityMeasure, :nameOfMeasure)&.any? { |name|
                            name == 'Vertical Positional Accuracy Report'
                         }

diff --git a/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_dataQualityReport.rb b/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_dataQualityReport.rb
@@ -34,7 +34,7 @@ def writeXML(hReport)
             citationClass = CI_Citation.new(@xml, @hResponseObj)
 
             @xml.tag!('mdq:report') do
-              @xml.tag!("mdq:#{hReport[:type]}") do
+              @xml.tag!("mdq:DQ_#{hReport[:type]}") do
 
                 # standaloneQualityReportDetails
                 unless hReport[:standaloneQualityReportDetails].nil?
@@ -99,12 +99,11 @@ def writeXML(hReport)
                           end
                         end
                       end
-                      #  TODO the following will not work until the iso_evaluationMethodType codelist is added to mdCodes
-                      # unless evaluationMethod[:evaluationMethodType].nil?
-                      #   @xml.tag!('mdq:evaluationMethodType') do
-                      #     codeListClass.writeXML('mcc', 'iso_evaluationMethodType', evaluationMethod[:evaluationMethodType])
-                      #   end
-                      # end
+                      unless evaluationMethod[:evaluationMethodType].nil?
+                        @xml.tag!('mdq:evaluationMethodType') do
+                          codeListClass.writeXML('mcc', 'iso_evaluationMethodType', evaluationMethod[:evaluationMethodType])
+                        end
+                      end
                     end
                   end
                 end # evaluationMethod

diff --git a/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_quantitativeResult.rb b/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_quantitativeResult.rb
@@ -11,7 +11,7 @@ def self.build(hResult)
             Jbuilder.new do |json|
               json.dateTime hResult[:dateTime]
               json.scope Scope.build(hResult[:scope]) if hResult[:scope]
-              json.value hResult[:value]
+              json.value hResult[:values]
               json.valueUnits hResult[:valueUnits]
               json.valueRecordType hResult[:valueRecordType]
             end

diff --git a/test/helpers/mdJson_hash_functions.rb b/test/helpers/mdJson_hash_functions.rb
@@ -72,7 +72,7 @@ def build_dataQuality
 
       hDataQuality[:report] = [
          {
-            type: 'AbsoluteExternalPositionalAccuracy',
+            type: 'AbsolutePositionalAccuracy',
             standaloneQualityReportDetails: "standalone quality report details 1",
             qualityMeasure: {
                identifier: {
@@ -85,7 +85,7 @@ def build_dataQuality
                description: 'description'
             },
             evaluationMethod: {
-               type: 'DQ_EvaluationMethod',
+               type: 'evaluationMethod',
                dateTime: ['2019-06-11T08:35:00', '2019-06-11T09:00:00'],
                methodDescription: 'evaluation method description',
                evaluationProcedure: { title: 'EP Title' },

diff --git a/test/writers/simple_html/testData/metadataGeo.json b/test/writers/simple_html/testData/metadataGeo.json
@@ -2957,7 +2957,7 @@
                   }
                 ],
                 "evaluationMethod": {
-                  "type": "DQ_EvaluationMethod",
+                  "type": "evaluationMethod",
                   "dateTime": ["2019-06-11T08:35:00"],
                   "methodDescription": "evaluation method description",
                   "evaluationProcedure": {