adiwg-mdtranslator 2.18.2 → 2.19.0.pre.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb462b0759a76f8884d8cefc07d1372da8a60c589a5cd49e57fce7d3f06f5c00
-  data.tar.gz: 99ab44ea39cede67c810cc998bcec11e447b8b438f552966ff77ea15e038c405
+  metadata.gz: f456de4448d18685a212969b02c6195b206d8e461372b317fce02e0066de15d6
+  data.tar.gz: 42027d3093840bbd6a3a896000950bef3145d3518d1a41a372e02fc199f25701
 SHA512:
-  metadata.gz: 310393021fe20a36d392a870b3b4edead47f956033db8dc8f7b556bef750338758bf5cfe15d0c06f7c8097fe9a6d2dfaf65469abbc5045517f3823bd48973362
-  data.tar.gz: 2ad0835b09716d5fbda52c67bb4421b5bd6a29b02845c8d5ef3d18a6b89704408a42d7a2c6d7b442e1f7b92b70c7222ccf24f0db533261a813ffdb0128165f48
+  metadata.gz: d7af3c590f3c28b7f49e6192000ee20c289ce0718e644029c04b0b21d8258422dcb3e1d28183ba945bd3dafcf8cd191a3cc33f086a4e4f06b888b21096fd9159
+  data.tar.gz: 482f497b01253e0a7376023afafa051b821ed9dec53346a4e5237ae8b40dbfab0d5a9944333b948af56490c4e2e3ed0ae35d39d2485e378a0d6c833e2fd3bade

data/.github/workflows/test.yml

@@ -0,0 +1,14 @@
+name: Tests
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1
+        with:
+          ruby-version: "3.1" # Not needed with a .ruby-version file
+      - run: bundle install
+      - run: bundle exec rake

data/.gitignore

@@ -4,7 +4,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
@@ -22,3 +21,5 @@ tmp
 mkmf.log
 /.idea
 /.rake_tasks~
+vendor/
+*.DS_Store

data/Gemfile.lock

@@ -0,0 +1,86 @@
+PATH
+  remote: .
+  specs:
+    adiwg-mdtranslator (2.19.0.pre.beta.7)
+      adiwg-mdcodes (= 2.9.2)
+      adiwg-mdjson_schemas (= 2.9.1)
+      builder (~> 3.2)
+      coderay (~> 1.1)
+      jbuilder (~> 2.5)
+      json (~> 2.0)
+      json-schema (~> 2.7)
+      kramdown (>= 1.13, < 3.0)
+      nokogiri (~> 1.15)
+      thor (~> 0.19)
+      uuidtools (~> 2.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionview (5.2.8.1)
+      activesupport (= 5.2.8.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activesupport (5.2.8.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
+    adiwg-mdcodes (2.9.2)
+      json (~> 2.0)
+    adiwg-mdjson_schemas (2.9.1)
+    builder (3.2.4)
+    coderay (1.1.3)
+    concurrent-ruby (1.2.2)
+    crass (1.0.6)
+    erubi (1.12.0)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    jbuilder (2.11.5)
+      actionview (>= 5.0.0)
+      activesupport (>= 5.0.0)
+    json (2.6.3)
+    json-schema (2.8.1)
+      addressable (>= 2.4)
+    kramdown (2.4.0)
+      rexml
+    loofah (2.21.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    minitest (5.20.0)
+    nokogiri (1.15.5-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.15.5-x86_64-linux)
+      racc (~> 1.4)
+    public_suffix (4.0.7)
+    racc (1.7.3)
+    rails-dom-testing (2.1.1)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
+    rake (13.1.0)
+    rexml (3.2.5)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.11)
+      thread_safe (~> 0.1)
+    uuidtools (2.2.0)
+
+PLATFORMS
+  arm64-darwin-22
+  x86_64-linux
+
+DEPENDENCIES
+  adiwg-mdtranslator!
+  bundler (~> 2)
+  minitest (~> 5)
+  rake (~> 13)
+
+BUNDLED WITH
+   2.4.21

data/Rakefile

@@ -19,8 +19,8 @@ Rake::TestTask.new do |t|
       'test/writers/fgdc/tc*.rb',
       'test/writers/html/tc*.rb',
       'test/writers/iso19110/tc*.rb',
-      'test/writers/iso19115-1/tc*.rb',
       'test/writers/iso19115-2/tc*.rb',
+      'test/writers/iso19115-3/tc*.rb',
       'test/writers/mdJson/tc*.rb',
       'test/writers/sbJson/tc*.rb',
       'test/translator/tc*.rb'

data/adiwg-mdtranslator.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
    spec.required_ruby_version = '>= 2.3'
 
    spec.add_development_dependency "bundler", "~> 2"
-   spec.add_development_dependency "rake", "~> 10"
+   spec.add_development_dependency "rake", "~> 13"
    spec.add_development_dependency "minitest", "~> 5"
 
    spec.add_runtime_dependency "json", "~> 2.0"
@@ -34,11 +34,11 @@ 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.8"
-   spec.add_runtime_dependency "adiwg-mdcodes", "~> 2.8"
+   spec.add_runtime_dependency "adiwg-mdjson_schemas", "2.9.1"
+   spec.add_runtime_dependency "adiwg-mdcodes", "2.9.2"
    spec.add_runtime_dependency "jbuilder", "~> 2.5"
-   spec.add_runtime_dependency "kramdown", "~> 1.13"
+   spec.add_runtime_dependency "kramdown", ">= 1.13", "< 3.0"
    spec.add_runtime_dependency "coderay", "~> 1.1"
-   spec.add_runtime_dependency "nokogiri", "~> 1.7"
+   spec.add_runtime_dependency "nokogiri", "~> 1.15"
 
-end
+end

data/lib/adiwg/mdtranslator/internal/internal_metadata_obj.rb

@@ -513,6 +513,14 @@ class InternalMetadata
       }
    end
 
+   def newRangeElementDescription
+      {
+         name: nil,
+         definition: nil,
+         rangeElement: []
+      }
+   end
+
    def newImageDescription
       {
          illuminationElevationAngle: nil,
@@ -650,13 +658,22 @@ class InternalMetadata
       }
    end
 
+   def newQualityResultFile
+      {
+         fileName: nil,
+         fileType: nil,
+         fileDescription: nil,
+         fileFormat: {}
+      }
+   end
+
    def newCoverageResult
       {
          dateTime: nil,
          scope: {},
-         spatialRepresentationType: {},
+         spatialRepresentationType: nil,
          spatialRepresentation: {},
-         resultContent: [],
+         resultContentDescription: {},
          resourceFormat: {},
          resultFile: {}
       }
@@ -705,23 +722,22 @@ class InternalMetadata
 
    def newDataQualityReport
       {
-         # standaloneQualityReportDetails: nil,
-         conformanceResult: [],
-         coverageResult: [],
-         # derivedElementReport: [],
-         descriptiveResult: [],
-         evaluationMethod: {},
+         type: nil,
+         standaloneQualityReportDetails: nil,
          qualityMeasure: {},
+         evaluationMethod: {},
          quantitativeResult: [],
-         # relatedElementReport: []
+         descriptiveResult: [],
+         conformanceResult: [],
+         coverageResult: [],
+         derivedElementReport: []
       }
    end
 
    def newStandaloneReport
       {
-         reportReference: {},
          abstract: nil,
-         elementReports: []
+         reportReference: {},
       }
    end
 

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

@@ -0,0 +1,149 @@
+# Reader - fgdc to internal data structure
+# unpack fgdc data quality
+
+# History:
+#  Stan Smith 2017-08-15 original script
+
+require 'nokogiri'
+require 'adiwg/mdtranslator/internal/internal_metadata_obj'
+require_relative 'module_lineage'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module Fgdc
+
+            module DataQuality
+
+               def self.unpack(xDataQual, hMetadata, hDataQuality, hResponseObj)
+                  intMetadataClass = InternalMetadata.new
+
+                  hDataQuality[:scope] = intMetadataClass.newScope
+                  hDataQuality[:scope][:scopeCode] = 'tabularDataset'
+
+                  hDataQuality[:systemIdentifier] = {
+                     uid: UUIDTools::UUID.random_create.to_s,
+                     label: "CSDGM Data Quality"
+                  }
+
+                  # data quality 2.1 (attracc) - attribute accuracy
+                  xAccuracy = xDataQual.xpath('./attracc')
+                  accuracyReport = xAccuracy.xpath('./attraccr').text
+                  report = intMetadataClass.newDataQualityReport
+                  report[:type] = 'NonQuantitativeAttributeAccuracy'
+                  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
+                  end
+
+                  # data quality 2.2 (logic) - logical consistency (required) (not implemented)
+                  xLogic = xDataQual.xpath('./logic')
+                  if xLogic.empty?
+                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: data quality logical consistency section is missing'
+                  else
+                     logic = xLogic.text
+                     report = intMetadataClass.newDataQualityReport
+                     report[:type] = 'ConceptualConsistency'
+                     report[:qualityMeasure] = intMetadataClass.newQualityMeasure
+                     report[:qualityMeasure][:description] = logic
+                     hDataQuality[:report] << report
+                  end
+
+                  # data quality 2.3 (complete) - completion report (required)
+                  xComplete = xDataQual.xpath('./complete')
+                  if xComplete.empty?
+                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: data quality completion report section is missing'
+                  else
+                     complete = xComplete.text
+                     report = intMetadataClass.newDataQualityReport
+                     report[:type] = 'CompletenessOmission'
+                     descriptiveResult = intMetadataClass.newDescriptiveResult
+                     descriptiveResult[:statement] = complete
+                     report[:descriptiveResult] << descriptiveResult
+                     hDataQuality[:report] << report
+                  end
+
+                  # data quality 2.4 (position) - positional accuracy
+                  xPositionalAccuracy = xDataQual.xpath('./posacc')
+                  unless xPositionalAccuracy.empty?
+                     # horizontal positional accuracy
+                     xHorizontal = xPositionalAccuracy.xpath('./horizpa')
+                     unless xHorizontal.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
+                        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
+                        end
+                        hDataQuality[:report] << report
+                     end
+                     # vertical positional accuracy
+                     xVertical = xPositionalAccuracy.xpath('./vertacc')
+                     unless xVertical.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
+                        end
+                        unless xVertical.xpath('qvertpa/vertaccv').empty?
+                           quantitativeResult = intMetadataClass.newQuantitativeResult
+                           value = xVertical.xpath('qvertpa/vertaccv').text
+                           quantitativeResult[:values] << value
+                           report[:quantitativeResult] << quantitativeResult
+                        end
+                        hDataQuality[:report] << report
+                     end
+                  end
+
+                  # data quality 2.5 (lineage) - lineage (required)
+                  xLineage = xDataQual.xpath('./lineage')
+                  unless xLineage.empty?
+                     hLineage = Lineage.unpack(xLineage, hResponseObj)
+                     unless hLineage.nil?
+                        hMetadata[:lineageInfo] << hLineage
+                     end
+                  end
+                  if xLineage.nil?
+                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: data quality lineage section is missing'
+                  end
+
+                  return hDataQuality
+               end
+
+            end
+
+         end
+      end
+   end
+end

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

@@ -10,7 +10,7 @@ require 'uuidtools'
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
 require_relative '../version'
 require_relative 'module_identification'
-require_relative 'module_quality'
+require_relative 'module_dataQuality'
 require_relative 'module_spatialOrganization'
 require_relative 'module_spatialReference'
 require_relative 'module_entityAttribute'
@@ -70,7 +70,7 @@ module ADIWG
                   # metadata (dataqual 2) - data quality
                   xDataQual = xMetadata.xpath('./dataqual')
                   unless xDataQual.empty?
-                     dataQuality = Quality.unpack(xDataQual, hMetadata, hDataQuality, hResponseObj)
+                     dataQuality = DataQuality.unpack(xDataQual, hMetadata, hDataQuality, hResponseObj)
                      hMetadata[:dataQuality] << dataQuality
                   end
 

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

@@ -8,7 +8,7 @@ module ADIWG
 
         module ConformanceResult
 
-          def self.unpack(hConformanceResult, responseObj, inContext = nil)
+          def self.unpack(hConformanceResult, responseObj)
 
             intMetadataClass = InternalMetadata.new
             intConformanceResult = intMetadataClass.newConformanceResult

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

@@ -1,5 +1,8 @@
 require_relative 'module_scope'
 require_relative 'module_spatialRepresentation'
+require_relative 'module_qualityResultFile'
+require_relative 'module_format'
+require_relative 'module_coverageDescription'
 
 module ADIWG
   module Mdtranslator
@@ -7,7 +10,7 @@ module ADIWG
       module MdJson
 
         module CoverageResult
-          def self.unpack(hResult, responseObj, inContext)
+          def self.unpack(hResult, responseObj)
 
             intMetadataClass = InternalMetadata.new
             intResult = intMetadataClass.newCoverageResult
@@ -25,7 +28,6 @@ module ADIWG
 
 
             # spatialRepresentationType
-            # https://github.com/ISO-TC211/XML/blob/master/standards.iso.org/iso/19115/resources/Codelists/gml/MD_SpatialRepresentationTypeCode.xml
             if hResult.has_key?('spatialRepresentationType')
               intResult[:spatialRepresentationType] = hResult['spatialRepresentationType']
             end
@@ -38,21 +40,20 @@ module ADIWG
 
 
             # resultContent
-            if hResult.has_key?('resultContent')
-              intResult[:resultContent] = hResult['resultContent']
+            if hResult.has_key?('resultContentDescription')
+              intResult[:resultContentDescription] = CoverageDescription.unpack(hResult['resultContentDescription'], responseObj)
             end
 
 
             # resourceFormat
             if hResult.has_key?('resourceFormat')
-              intResult[:resourceFormat] = hResult['resourceFormat']
+              intResult[:resourceFormat] = Format.unpack(hResult['resourceFormat'], responseObj)
             end
 
 
             # resultFile
-            resultFile
             if hResult.has_key?('resultFile')
-              intResult[:resultFile] = hResult['resultFile']
+              intResult[:resultFile] = QualiltyResultFile.unpack(hResult['resultFile'], responseObj)
             end
 
             return intResult

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

@@ -38,11 +38,11 @@ module ADIWG
             if hDataQuality.has_key?('standaloneQualityReport')
               hObject = hDataQuality['standaloneQualityReport']
               unless hObject.empty?
-                intDataQuality[:standaloneQualityReport] = {}
-                intDataQuality[:standaloneQualityReport][:abstract] = hObject["abstract"]
+                intDataQuality[:standaloneReport] = {}
+                intDataQuality[:standaloneReport][:abstract] = hObject["abstract"]
 
-                unless hObject["reportRefereence"].nil? || hObject["reportReference"].empty?
-                  intDataQuality[:standaloneQualityReport][:reportReference] = Citation.unpack(hObject["reportReference"], responseObj, inContext)
+                unless hObject["reportReference"].nil? || hObject["reportReference"].empty?
+                  intDataQuality[:standaloneReport][:reportReference] = Citation.unpack(hObject["reportReference"], responseObj, inContext)
                 end
               end
             end

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

@@ -4,6 +4,7 @@ require_relative 'module_coverageResult'
 require_relative 'module_descriptiveResult'
 require_relative 'module_quantitativeResult'
 require_relative 'module_evaluationMethod'
+require_relative 'module_qualityMeasure'
 
 module ADIWG
   module Mdtranslator
@@ -28,6 +29,10 @@ module ADIWG
 
             intReport[:type] = hReport["type"]
 
+            if hReport.has_key?('standaloneQualityReportDetails')
+              intReport[:standaloneQualityReportDetails] = hReport['standaloneQualityReportDetails']
+            end
+
             if hReport.has_key?('conformanceResult')
               hReport['conformanceResult'].each do |item|
                 hReturn = ConformanceResult.unpack(item, responseObj)
@@ -68,23 +73,10 @@ module ADIWG
             end
 
             if hReport.has_key?('qualityMeasure')
-              qualityMeasure = hReport['qualityMeasure']
-              identifier = qualityMeasure['identifier']
-
-              intReport[:qualityMeasure] = {}
-
-              if identifier
-                intReport[:qualityMeasure][:identifier] = {
-                  identifier: identifier['identifier'],
-                  namespace: identifier['namespace'],
-                  version: identifier['version'],
-                  description: identifier['description']
-                }
-              end
+              hReturn = QualityMeasure.unpack(hReport['qualityMeasure'], responseObj)
 
-              if qualityMeasure
-                intReport[:qualityMeasure][:name] = qualityMeasure['name']
-                intReport[:qualityMeasure][:description] = qualityMeasure['description']
+              unless hReturn.nil?
+                intReport[:qualityMeasure] = hReturn
               end
             end
 

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

@@ -6,7 +6,7 @@ module ADIWG
       module MdJson
 
         module EvaluationMethod
-          def self.unpack(hMethod, responseObj, inContext = nil)
+          def self.unpack(hMethod, responseObj)
 
             intMetadataClass = InternalMetadata.new
             intMethod = intMetadataClass.newEvaluationMethod

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

@@ -34,21 +34,21 @@ module ADIWG
 
                   haveLegal = false
 
-                  # legal constraint - use constraint []
-                  if hLegalCon.has_key?('useConstraint')
-                     hLegalCon['useConstraint'].each do |item|
+                  # legal constraint - access constraint []
+                  if hLegalCon.has_key?('accessConstraint')
+                     hLegalCon['accessConstraint'].each do |item|
                         unless item == ''
-                           intLegalCon[:useCodes] << item
+                           intLegalCon[:accessCodes] << item
                            haveLegal = true
                         end
                      end
                   end
 
-                  # legal constraint - access constraint []
-                  if hLegalCon.has_key?('accessConstraint')
-                     hLegalCon['accessConstraint'].each do |item|
+                  # legal constraint - use constraint []
+                  if hLegalCon.has_key?('useConstraint')
+                     hLegalCon['useConstraint'].each do |item|
                         unless item == ''
-                           intLegalCon[:accessCodes] << item
+                           intLegalCon[:useCodes] << item
                            haveLegal = true
                         end
                      end

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

@@ -0,0 +1,34 @@
+require_relative 'module_identifier'
+
+module ADIWG
+    module Mdtranslator
+        module Readers
+            module MdJson
+
+                module QualityMeasure
+                    def self.unpack(hQualityMeasure, responseObj)
+
+                        intMetadataClass = InternalMetadata.new
+                        intQualityMeasure = intMetadataClass.newQualityMeasure
+
+                        intQualityMeasure[:description] = hQualityMeasure['description']
+
+                        if hQualityMeasure.has_key?('name')
+                            intQualityMeasure[:nameOfMeasure] = hQualityMeasure['name']
+                        end
+
+                        if hQualityMeasure.has_key?('identifier')
+                            hReturn = Identifier.unpack(hQualityMeasure['identifier'], responseObj)
+                            unless hReturn.nil?
+                                intQualityMeasure[:identifier] = hReturn
+                            end
+                        end
+
+                        return intQualityMeasure
+
+                    end
+                end
+            end
+        end
+    end
+end