adiwg-mdtranslator 2.18.0rc3 → 2.18.0rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f08fafd68b7dea4229ec4fc18db6a148cc4e99785fb042b364636ec85c15f2e
-  data.tar.gz: 450d585d18e84c1867252046c065847c209d32a20d53612a7face363141f012a
+  metadata.gz: 70d18c65bc7552c3d3f4adf0a85a36deba2fb425d55327502d4a71700fbba0ef
+  data.tar.gz: 53c9ff21ea40c214891bff2642e41767299945a5dd2b59fe76bd48f6dbda4267
 SHA512:
-  metadata.gz: 91322e2506f598e2f6cfa26a0b11eda18b33bae4de10ca67c651e63dc7947373a4f09a261a47e86e8980cb324019da0853a3f83cab043986c594905f8a80c22e
-  data.tar.gz: 5851f314179dcee20d6e295c9ab5770199a2c7e59e450c5b6a7df4ba232b00d396df8c1798b8bb9232826820f5b6c73786fc3b802ec180874896a8f0c15f7e60
+  metadata.gz: f8442c94c4c98f9fd4d04c71231d61798181c1b17808cf36cab98df8b42d1b66bc382697e4997df998a973a133f096936305b0453cd204565fdab418bd1f3852
+  data.tar.gz: 40b261d56d5d38560cd74185648436143a95e1f5d723a45d6019aeb0e66b890d52bbbcbd5ee0e388319548f0773921816ae8fbe0989809e46cd763d5ca2366da

data/adiwg-mdtranslator.gemspec

@@ -34,7 +34,7 @@ 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.0.pre.beta2"
+   spec.add_runtime_dependency "adiwg-mdjson_schemas", "2.8.0.pre.beta6"
    spec.add_runtime_dependency "adiwg-mdcodes", "~> 2.8"
    spec.add_runtime_dependency "jbuilder", "~> 2.5"
    spec.add_runtime_dependency "kramdown", "~> 1.13"

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

@@ -142,7 +142,8 @@ class InternalMetadata
          distributorInfo: [],
          associatedResources: [],
          additionalDocuments: [],
-         funding: []
+         funding: [],
+         dataQuality: []
       }
    end
 
@@ -635,7 +636,7 @@ class InternalMetadata
       {
          scope: {},
          standaloneReport: {},
-         reports: []
+         report: []
       }
    end
 
@@ -649,6 +650,18 @@ class InternalMetadata
       }
    end
 
+   def newCoverageResult
+      {
+         dateTime: nil,
+         scope: {},
+         spatialRepresentationType: {},
+         spatialRepresentation: {},
+         resultContent: [],
+         resourceFormat: {},
+         resultFile: {}
+      }
+   end
+
    def newDescriptiveResult
       {
          dateTime: nil,
@@ -661,14 +674,14 @@ class InternalMetadata
       {
          type: nil,
          dateTime: [],
-         description: nil,
+         methodDescription: nil,
          evaluationProcedure: {},
          referenceDocuments: [],
          evaluationMethodType: nil,
-         deductiveSource: 'deductive source',
-         samplingScheme: 'sampling scheme',
-         lotDescription: 'lot description',
-         samplingRatio: 'sampling ratio'
+         deductiveSource: nil,
+         samplingScheme: nil,
+         lotDescription: nil,
+         samplingRatio: nil
       }
    end
 
@@ -690,18 +703,17 @@ class InternalMetadata
       }
    end
 
-   def newReport
+   def newDataQualityReport
       {
-         type: nil,
-         dateTime: [],
-         standaloneQualityReportDetails: nil,
-         qualityMeasure: {},
+         # standaloneQualityReportDetails: nil,
+         conformanceResult: [],
+         coverageResult: [],
+         # derivedElementReport: [],
+         descriptiveResult: [],
          evaluationMethod: {},
-         quantitativeResults: [],
-         descriptiveResults: [],
-         conformanceResults: [],
-         derivedElementReports: [],
-         relatedElementReports: []
+         qualityMeasure: {},
+         quantitativeResult: [],
+         # relatedElementReport: []
       }
    end
 

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

@@ -37,6 +37,7 @@ module ADIWG
                   # build basic mdTranslator internal object
                   hMetadata = intMetadataClass.newMetadata
                   hResourceInfo = intMetadataClass.newResourceInfo
+                  hDataQuality = intMetadataClass.newDataQuality
                   hMetadata[:resourceInfo] = hResourceInfo
                   intObj[:metadata] = hMetadata
 
@@ -69,7 +70,8 @@ module ADIWG
                   # metadata (dataqual 2) - data quality
                   xDataQual = xMetadata.xpath('./dataqual')
                   unless xDataQual.empty?
-                     Quality.unpack(xDataQual, hMetadata, hResponseObj)
+                     dataQuality = Quality.unpack(xDataQual, hMetadata, hDataQuality, hResponseObj)
+                     hMetadata[:dataQuality] << dataQuality
                   end
 
                   # metadata (spdoinfo 3) - spatial data organization

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

@@ -56,7 +56,7 @@ module ADIWG
                   end
 
                   # packing
-                  unless hProjection.nil? || hProjection.empty?
+                  unless hProjection.empty?
                      unless distanceUnits.nil?
                         hProjection[:falseEastingNorthingUnits] = distanceUnits
                      end

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

@@ -15,23 +15,138 @@ module ADIWG
 
             module Quality
 
-               def self.unpack(xDataQual, hMetadata, hResponseObj)
+               def self.unpack(xDataQual, hMetadata, hDataQuality, hResponseObj)
 
-                  # data quality 2.1 (attracc) - attribute accuracy (not implemented)
+                  # data quality 2.1 (attracc) - attribute accuracy
+                  xAccuracy = xDataQual.xpath('./attracc')
+                  accuracyReport = xAccuracy.xpath('./attraccr').text
+                  hDataQuality[:report] << {
+                     type: 'DQ_NonQuantitativeAttributeCompleteness',
+                     descriptiveResult: [ {statement: accuracyReport} ]
+                  }
+
+                  # data quality 2.1 (qattracc) - Quantitative Attribute Accuracy Assessment
+
+                  xQuantitativeAccuracy = xDataQual.xpath('./qattracc')
+                  unless xQuantitativeAccuracy.xpath('./attraccv').empty?
+                     hDataQuality[:report] << {
+                        type: 'DQ_QuantitativeAttributeAccuracy',
+                        quantitativeResult: [{
+                           value: xQuantitativeAccuracy.xpath('./attraccv').text
+                        }]
+                     }
+                  end
 
                   # data quality 2.2 (logic) - logical consistency (required) (not implemented)
                   xLogic = xDataQual.xpath('./logic')
-                  if xLogic.nil?
+                  if xLogic.empty?
                      hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: data quality logical consistency section is missing'
+                  else
+                     logic = xLogic.text
+                     hDataQuality[:report] << {
+                        type: 'DQ_ConceptualConsistency',
+                        qualityMeasure: {
+                           description: logic
+                        }
+                     }
                   end
 
-                  # data quality 2.3 (complete) - completion report (required) (not implemented)
+                  # data quality 2.3 (complete) - completion report (required)
                   xComplete = xDataQual.xpath('./complete')
-                  if xComplete.nil?
+                  if xComplete.empty?
                      hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: data quality completion report section is missing'
+                  else
+                     complete = xComplete.text
+                     hDataQuality[:report] << {
+                        type: 'DQ_CompletenessOmission',
+                        descriptiveResult: [{
+                           statement: complete
+                        }]
+                     }
                   end
 
-                  # data quality 2.4 (position) - positional accuracy (not implemented)
+                  # 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 = {}
+
+                        unless xHorizontal.xpath('horizpar').empty?
+                           report[:evaluationMethod] = {
+                              methodDescription: xHorizontal.xpath('horizpar').text
+                           }
+                        end
+
+                        unless xHorizontal.xpath('qhorizpa/horizpae').empty?
+                           report[:qualityMeasure] = {
+                              description: xHorizontal.xpath('qhorizpa/horizpae').text
+                           }
+                        end
+
+                        unless xHorizontal.xpath('qhorizpa/horizpav').empty?
+                           report[:quantitativeResult] = [{
+                              value: [ xHorizontal.xpath('qhorizpa/horizpav').text ]
+                           }]
+                        end
+
+                        unless report.empty?
+                           if report[:qualityMeasure].nil?
+                              report[:qualityMeasure] = {
+                                 name: ['Horizontal Positional Accuracy Report']
+                              }
+                           else
+                              report[:qualityMeasure][:name] = ['Horizontal Positional Accuracy Report']
+                           end
+
+                           report[:type] = 'DQ_AbsoluteExternalPositionalAccuracy'
+
+                           hDataQuality[:report] << report
+                        end
+                     end
+
+                     # vertical positional accuracy
+                     xVertical = xPositionalAccuracy.xpath('./vertacc')
+                     unless xVertical.empty?
+
+                        report = {}
+
+                        unless xVertical.xpath('vertaccr').empty?
+                           report[:evaluationMethod] = {
+                              methodDescription: xVertical.xpath('vertaccr').text
+                           }
+                        end
+
+                        unless xVertical.xpath('qvertpa/vertacce').empty?
+                           report[:qualityMeasure] = {
+                              description: xVertical.xpath('qvertpa/vertacce').text
+                           }
+                        end
+
+                        unless xVertical.xpath('qvertpa/vertaccv').empty?
+                           report[:quantitativeResult] = [{
+                              value: [ xVertical.xpath('qvertpa/vertaccv').text ]
+                           }]
+                        end
+
+                        unless report.empty?
+                           if report[:qualityMeasure].nil?
+                              report[:qualityMeasure] = {
+                                 name: ['Vertical Positional Accuracy Report']
+                              }
+                           else
+                              report[:qualityMeasure][:name] = ['Vertical Positional Accuracy Report']
+                           end
+
+                           report[:type] = 'DQ_AbsoluteExternalPositionalAccuracy'
+
+                           hDataQuality[:report] << report
+                        end
+                     end
+                  end
 
                   # data quality 2.5 (lineage) - lineage (required)
                   xLineage = xDataQual.xpath('./lineage')
@@ -47,7 +162,7 @@ module ADIWG
 
                   # data quality 2.6 (cloud) - cloud cover (not implemented)
 
-                  return hMetadata
+                  return hDataQuality
 
                end
 

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

@@ -120,7 +120,7 @@ module ADIWG
                         end
 
                         # bounding box bio (altunit) - altitude unit of measure
-                        hBbox[:unitsOfAltitude] = xAltitude.xpath('./altunits').text
+                        hBbox[:unitsOfAltitude] = xAltitude.xpath('./altunit').text
 
                      end
 

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

@@ -0,0 +1,49 @@
+require_relative 'module_scope'
+require_relative 'module_citation'
+
+module ADIWG
+  module Mdtranslator
+    module Readers
+      module MdJson
+
+        module ConformanceResult
+
+          def self.unpack(hConformanceResult, responseObj, inContext = nil)
+
+            intMetadataClass = InternalMetadata.new
+            intConformanceResult = intMetadataClass.newConformanceResult
+
+            # dateTime
+            if hConformanceResult.has_key?('dateTime')
+              intConformanceResult[:dateTime] = hConformanceResult['dateTime']
+            end
+
+            # scope
+            if hConformanceResult.has_key?('scope')
+              intConformanceResult[:scope] = Scope.unpack(hConformanceResult['scope'], responseObj)
+            end
+
+            #specification
+            if hConformanceResult.has_key?('specification')
+              intConformanceResult[:specification] = Citation.unpack(hConformanceResult['specification'], responseObj)
+            end
+
+            # explanation
+            if hConformanceResult.has_key?('explanation')
+              intConformanceResult[:explanation] = hConformanceResult['explanation']
+            end
+
+            # pass
+            if hConformanceResult.has_key?('pass')
+              intConformanceResult[:pass] = hConformanceResult['pass']
+            end
+
+            return intConformanceResult
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,66 @@
+require_relative 'module_scope'
+require_relative 'module_spatialRepresentation'
+
+module ADIWG
+  module Mdtranslator
+    module Readers
+      module MdJson
+
+        module CoverageResult
+          def self.unpack(hResult, responseObj, inContext)
+
+            intMetadataClass = InternalMetadata.new
+            intResult = intMetadataClass.newCoverageResult
+
+            # dateTime
+            if hResult.has_key?('dateTime')
+              intResult[:dateTime] = hResult['dateTime']
+            end
+
+
+            # scope
+            if hResult.has_key?('scope')
+              intResult[:scope] = Scope.unpack(hResult['scope'], responseObj)
+            end
+
+
+            # 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
+
+
+            # spatialRepresentation
+            if hResult.has_key?('spatialRepresentation')
+              intResult[:spatialRepresentation] = SpatialRepresentation.unpack(hResult['spatialRepresentation'], responseObj)
+            end
+
+
+            # resultContent
+            if hResult.has_key?('resultContent')
+              intResult[:resultContent] = hResult['resultContent']
+            end
+
+
+            # resourceFormat
+            if hResult.has_key?('resourceFormat')
+              intResult[:resourceFormat] = hResult['resourceFormat']
+            end
+
+
+            # resultFile
+            resultFile
+            if hResult.has_key?('resultFile')
+              intResult[:resultFile] = hResult['resultFile']
+            end
+
+            return intResult
+
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,69 @@
+# unpack dataQuality
+# Reader - ADIwg JSON to internal data structure
+
+require_relative 'module_scope'
+require_relative 'module_dataQualityReport'
+require_relative 'module_citation'
+
+module ADIWG
+  module Mdtranslator
+    module Readers
+      module MdJson
+
+        module DataQuality
+
+          def self.unpack(hDataQuality, responseObj, inContext = nil)
+            @MessagePath = ADIWG::Mdtranslator::Readers::MdJson::MdJson
+
+            if hDataQuality.empty?
+              @MessagePath.issueWarning(300, responseObj)
+              return nil
+            end
+
+            intMetadataClass = InternalMetadata.new
+            intDataQuality = intMetadataClass.newDataQuality
+
+            outContext = 'dataQuality'
+
+            if hDataQuality.has_key?('scope')
+              hObject = hDataQuality['scope']
+              unless hObject.empty?
+                hReturn = Scope.unpack(hObject, responseObj)
+                unless hReturn.nil?
+                  intDataQuality[:scope] = hReturn
+                end
+              end
+            end
+
+            if hDataQuality.has_key?('standaloneQualityReport')
+              hObject = hDataQuality['standaloneQualityReport']
+              unless hObject.empty?
+                intDataQuality[:standaloneQualityReport] = {}
+                intDataQuality[:standaloneQualityReport][:abstract] = hObject["abstract"]
+
+                unless hObject["reportRefereence"].nil? || hObject["reportReference"].empty?
+                  intDataQuality[:standaloneQualityReport][:reportReference] = Citation.unpack(hObject["reportReference"], responseObj, inContext)
+                end
+              end
+            end
+
+            if hDataQuality.has_key?('report')
+              hDataQuality['report'].each do |item|
+                report = DataQualityReport.unpack(item, responseObj, inContext)
+
+                unless report.nil?
+                  intDataQuality[:report] << report
+                end
+              end
+            end
+
+            return intDataQuality
+
+          end
+
+        end
+        
+      end
+    end
+  end
+end

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

@@ -0,0 +1,109 @@
+require_relative 'module_scope'
+require_relative 'module_conformanceResult'
+require_relative 'module_coverageResult'
+require_relative 'module_descriptiveResult'
+require_relative 'module_quantitativeResult'
+require_relative 'module_evaluationMethod'
+
+module ADIWG
+  module Mdtranslator
+    module Readers
+      module MdJson
+
+        module DataQualityReport
+
+          def self.unpack(hReport, responseObj, inContext = nil)
+            @MessagePath = ADIWG::Mdtranslator::Readers::MdJson::MdJson
+
+            outContext = 'Data Quality Report'
+            outContext = inContext + ' > ' + outContext unless inContext.nil?
+
+            if hReport.empty?
+              @MessagePath.issueWarning(730, responseObj, inContext)
+              return nil            
+            end
+
+            intMetadataClass = InternalMetadata.new
+            intReport = intMetadataClass.newDataQualityReport
+
+            intReport[:type] = hReport["type"]
+
+            if hReport.has_key?('conformanceResult')
+              hReport['conformanceResult'].each do |item|
+                hReturn = ConformanceResult.unpack(item, responseObj)
+
+                unless hReturn.nil?
+                  intReport[:conformanceResult] << hReturn
+                end
+              end
+            end
+
+            if hReport.has_key?('coverageResult')
+              hReport['coverageResult'].each do |item|
+                hReturn = CoverageResult.unpack(item, responseObj)
+
+                unless hReturn.nil?
+                  intReport[:coverageResult] << hReturn
+                end
+              end
+            end
+
+            if hReport.has_key?('descriptiveResult')
+              hReport['descriptiveResult'].each do |item|
+                hReturn = DescriptiveResult.unpack(item, responseObj)
+
+                unless hReturn.nil?
+                  intReport[:descriptiveResult] << hReturn
+
+                end
+              end
+            end
+
+            if hReport.has_key?('evaluationMethod')
+              hReturn = EvaluationMethod.unpack(hReport['evaluationMethod'], responseObj)
+
+              unless hReturn.nil?
+                intReport[:evaluationMethod] = hReturn
+              end
+            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
+
+              if qualityMeasure
+                intReport[:qualityMeasure][:name] = qualityMeasure['name']
+                intReport[:qualityMeasure][:description] = qualityMeasure['description']
+              end
+            end
+
+            if hReport.has_key?('quantitativeResult')
+              hReport['quantitativeResult'].each do |item|
+                hReturn = QuantitativeResult.unpack(item, responseObj)
+
+                unless hReturn.nil?
+                  intReport[:quantitativeResult] << hReturn
+                end
+              end
+            end
+
+
+            return intReport
+          end
+        end
+
+      end
+    end
+  end
+end

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

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

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

@@ -47,14 +47,6 @@ module ADIWG
                      end
                   end
 
-                  # there is a typo in mdEditor for liabilityStatement, handle this edge case
-                  # https://github.com/adiwg/mdEditor/blob/f94770686df07ef76aa111f8f9734b32bbad7f21/app/pods/components/object/md-distribution/template.hbs#L22
-                  if (intDistribution[:liabilityStatement].nil? || intDistribution.empty?) && hDistribution.has_key?('liablityStatement')
-                     unless hDistribution['liablityStatement'] == ''
-                        intDistribution[:liabilityStatement] = hDistribution['liablityStatement']
-                     end
-                  end
-
                   # distribution - distributor [distributor]
                   if hDistribution.has_key?('distributor')
                      aItems = hDistribution['distributor']