adiwg-mdtranslator 2.19.0.pre.beta.16 → 2.19.0.pre.beta.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 229ed2e77e2aeee4d1e56c525fb5a24c5ff1015d3480ca28192636e754e8e85d
-  data.tar.gz: e4cfe8581390e2645b3f3992e0d4e6ff2baa4ed20fdcb1ea915fec46eaa31e5e
+  metadata.gz: 3a543b2c79ce4911105d80a36ba2a70643013a92a26777179a27bf0f455fb0a4
+  data.tar.gz: b3938073b03abaa3326878d5c7f5844ed9edd38be6ccaa72ab5e4460f30f5a1f
 SHA512:
-  metadata.gz: 94f4a51d95a9ad648eadd51ca300f90073494fe30bfa61546e1303dcdc59b930e61ed92ae68ecc2462b439215959692a3e4c77b26078c072e3f1e7e1b9f342a5
-  data.tar.gz: cccccf2d1f4271d7e2d46ed06eb74090390edceacd71c3add2ffbdafcba5f13e8064827563c5716ba495e9c075de9ad3404ab18bd12533af6a28c9ab2b4ea6d2
+  metadata.gz: 8a372b0e9151a3ed264c99490b87244904847e15422d3fb23f4fdc3f0e819d53a6c7766ae368715d19aba4d37dcfc5973cbd3a6adf95b872033a8eb77c409d15
+  data.tar.gz: 0a56d35e82c6fdf8ece4c4c9ca5ba36ff0d0e910bae5df01b33469111e79da36a7ebe66cdc190688827ef94a20e7011f3404f38afded8350bf317cba29ff6635

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    adiwg-mdtranslator (2.19.0.pre.beta.16)
-      adiwg-mdcodes (= 2.9.4.pre.beta.0)
-      adiwg-mdjson_schemas (= 2.9.3.pre.beta.0)
+    adiwg-mdtranslator (2.19.0.pre.beta.19)
+      adiwg-mdcodes (= 2.9.4.pre.beta.4)
+      adiwg-mdjson_schemas (= 2.9.3.pre.beta.3)
       builder (~> 3.2)
       coderay (~> 1.1)
       jbuilder (~> 2.5)
@@ -30,9 +30,9 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
-    adiwg-mdcodes (2.9.4.pre.beta.0)
+    adiwg-mdcodes (2.9.4.pre.beta.4)
       json (~> 2.0)
-    adiwg-mdjson_schemas (2.9.3.pre.beta.0)
+    adiwg-mdjson_schemas (2.9.3.pre.beta.3)
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.2.2)

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.3.pre.beta.3"
+   spec.add_runtime_dependency "adiwg-mdcodes", "2.9.4.pre.beta.4"
    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

@@ -82,7 +82,7 @@ module ADIWG
                      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 @@ module ADIWG
                      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

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_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.19.0-beta.16"
+      VERSION = "2.19.0-beta.19"
    end
 end
 

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

@@ -70,7 +70,7 @@ module ADIWG
 
 
                      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 @@ module ADIWG
 
 
                      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'
                         }

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

@@ -64,7 +64,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/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/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.19.0.pre.beta.16
+  version: 2.19.0.pre.beta.19
 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-14 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.3.pre.beta.3
   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.3.pre.beta.3
 - !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.9.4.pre.beta.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.4.pre.beta.0
+        version: 2.9.4.pre.beta.4
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement