adiwg-mdtranslator 2.19.0.pre.beta.19 → 2.20.0.pre.beta.3

data/lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_rights.rb

@@ -0,0 +1,32 @@
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Dcat_us
+            module Rights
+
+               def self.build(intObj, accessLevel)
+                  resourceInfo = intObj.dig(:metadata, :resourceInfo)
+                  constraints = resourceInfo&.dig(:constraints)
+                
+                  if accessLevel && ["restricted public", "non-public"].include?(accessLevel)
+                    constraints&.each do |constraint|
+                      if constraint[:type] == "use"
+                        statement = constraint.dig(:releasability, :statement)
+                        disseminationConstraints = constraint.dig(:releasability, :disseminationConstraint)
+                
+                        if statement && disseminationConstraints
+                          combinedConstraints = disseminationConstraints.join(" ")
+                          return "#{statement} #{combinedConstraints}".strip
+                        end
+                      end
+                    end
+                  end
+                
+                  nil
+               end                
+
+            end
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_spatial.rb

@@ -0,0 +1,32 @@
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Dcat_us
+            module Spatial
+
+               def self.build(intObj)
+                  resourceInfo = intObj.dig(:metadata, :resourceInfo)
+                  extent = resourceInfo&.dig(:extents, 0)
+                  geographicExtent = extent&.dig(:geographicExtents, 0)
+                  boundingBox = geographicExtent&.dig(:boundingBox)
+
+                  if boundingBox
+                    return [
+                      boundingBox[:eastLongitude],
+                      boundingBox[:southLatitude],
+                      boundingBox[:westLongitude],
+                      boundingBox[:northLatitude]
+                    ].join(',')
+                  elsif geographicExtent&.dig(:geographicElement, 0, :type) == 'point'
+                    point = geographicExtent.dig(:geographicElement, 0, :coordinate)
+                    return "#{point[1]},#{point[0]}" if point&.length == 2
+                  end
+
+                  nil
+               end           
+
+            end
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_system_of_records.rb

@@ -0,0 +1,28 @@
+require 'jbuilder'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Dcat_us
+            module SystemOfRecords
+
+               def self.build(intObj)
+                  associatedResources = intObj.dig(:metadata, :associatedResources)
+                  
+                  return nil if associatedResources.nil?
+                
+                  associatedResources.each do |resource|
+                    if resource[:initiativeType] == 'sorn'
+                      onlineResources = resource.dig(:resourceCitation, :onlineResources)
+                      return onlineResources.first[:olResURI] if onlineResources&.first&.has_key?(:olResURI)
+                    end
+                  end
+                  
+                  return nil
+               end
+
+            end
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_temporal.rb

@@ -0,0 +1,40 @@
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Dcat_us
+            module Temporal
+
+               def self.build(intObj)
+                  resourceInfo = intObj.dig(:metadata, :resourceInfo)
+                  extent = resourceInfo&.dig(:extents, 0)
+                  temporalExtents = extent&.dig(:temporalExtents)
+                
+                  if temporalExtents
+                    temporalExtents.each do |temporalExtent|
+                      timePeriod = temporalExtent&.dig(:timePeriod)
+                      next unless timePeriod
+                
+                      startDateHash = timePeriod[:startDateTime]
+                      endDateHash = timePeriod[:endDateTime]
+                      
+                      startDate = startDateHash&.dig(:dateTime)
+                      endDate = endDateHash&.dig(:dateTime)
+                
+                      if startDate && endDate
+                        return "#{startDate}/#{endDate}"
+                      elsif startDate
+                        return startDate
+                      elsif endDate
+                        return endDate
+                      end
+                    end
+                  end
+                
+                  nil
+               end
+
+            end
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_theme.rb

@@ -0,0 +1,28 @@
+require 'jbuilder'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Dcat_us
+            module Theme
+
+               def self.build(intObj)
+                  resourceInfo = intObj[:metadata][:resourceInfo]
+                  keywords_str = []
+                
+                  resourceInfo[:keywords].each do |keyword_group|
+                    if keyword_group[:thesaurus][:title] == "ISO Topic Categories"
+                      keyword_group[:keywords].each do |keyword_obj|
+                        keywords_str << keyword_obj[:keyword]
+                      end
+                    end
+                  end
+                
+                  return keywords_str.join(" ")
+               end                
+
+            end
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/writers/dcat_us/version.rb

@@ -0,0 +1,14 @@
+# dcat_us version history
+#  Johnathan Aspinwall 2023-06-22 created for mdJson/mdTranslator 2.0
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Dcat_us
+
+            VERSION = '1.0.0'
+
+         end
+      end
+   end
+end

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

@@ -56,7 +56,7 @@ module ADIWG
 
                      # 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 @@ module ADIWG
 
 
                      horizontal_positional_accuracy_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'AbsolutePositionalAccuracy' &&
+                        report[:type] == 'AbsoluteExternalPositionalAccuracy' &&
                         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] == 'AbsolutePositionalAccuracy' &&
+                        report[:type] == 'AbsoluteExternalPositionalAccuracy' &&
                         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[:type], {'class' => 'h5'})
+                        @html.summary('Report', {'class' => 'h5'})
                         dataQualityReportClass.writeHtml(report)
                       end
                     end

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

@@ -185,13 +185,6 @@ 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?
@@ -249,13 +242,6 @@ 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: ')
@@ -331,13 +317,6 @@ 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?
@@ -373,13 +352,6 @@ 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/mdJson/sections/mdJson_conformanceResult.rb

@@ -10,12 +10,11 @@ module ADIWG
         module ConformanceResult
           def self.build(hConformanceResult)
             Jbuilder.new do |json|
-              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?
+              json.dateTime hConformanceResult[:dateTime]
+              json.scope Scope.build(hConformanceResult[:scope])
+              json.specification Citation.build(hConformanceResult[:specification])
+              json.explanation hConformanceResult[:explanation]
+              json.pass hConformanceResult[:pass]
             end
           end
         end

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

@@ -15,7 +15,6 @@ 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,7 +11,6 @@ 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,12 +9,11 @@ module ADIWG
         module QuantitativeResult
           def self.build(hResult)
             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.value hResult[:values] unless hResult[:values].empty?
-              json.valueUnits hResult[:valueUnits] unless hResult[:valueUnits].nil?
-              json.valueRecordType hResult[:valueRecordType] unless hResult[:valueRecordType].nil?
+              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]
             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.timePeriod TimePeriod.build(hResInfo[:timePeriod]) unless hResInfo[:timePeriod].empty?
                      json.credit hResInfo[:credits] unless hResInfo[:credits].empty?
+                     json.timePeriod TimePeriod.build(hResInfo[:timePeriod]) unless hResInfo[:timePeriod].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[:type], {'class' => 'h5'})
+                        @html.h5('Report', {'class' => 'h5'})
                         dataQualityReportClass.writeHtml(report)
                       end
                     end

data/lib/adiwg/mdtranslator_cli.rb

@@ -39,7 +39,7 @@ and to choose the level of validation for mdJson input files.
                  :enum => %w{mdJson sbJson fgdc}, :required => true
    method_option :writer, :aliases => '-w',
                  :desc => 'Writer to create your output metadata file, leave blank to validate input only',
-                 :enum => %w{fgdc html iso19110 iso19115_1 iso19115_2 iso19115_3 mdJson sbJson simple_html }
+                 :enum => %w{fgdc html iso19110 iso19115_1 iso19115_2 iso19115_3 mdJson sbJson simple_html dcat_us}
    method_option :validate, :aliases => '-v', :desc => 'Specify level of validation to be performed',
                  :enum => %w{none normal strict}, :default => 'normal'
    method_option :forceValid, :aliases => '-f', :desc => 'Insert tags for required elements missing from input',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.19.0.pre.beta.19
+  version: 2.20.0.pre.beta.3
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-14 00:00:00.000000000 Z
+date: 2024-05-09 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.3
+        version: 2.9.3.pre.beta.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.3.pre.beta.3
+        version: 2.9.3.pre.beta.0
 - !ruby/object:Gem::Dependency
   name: adiwg-mdcodes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.4.pre.beta.4
+        version: 2.9.4.pre.beta.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.4.pre.beta.4
+        version: 2.9.4.pre.beta.0
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -232,6 +232,7 @@ files:
 - ".jsbeautifyrc"
 - ".travis.yml"
 - CHANGELOG.md
+- DCAT-US.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -474,6 +475,38 @@ files:
 - lib/adiwg/mdtranslator/readers/sbJson/sbJson_reader.rb
 - lib/adiwg/mdtranslator/readers/sbJson/version.rb
 - lib/adiwg/mdtranslator/version.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/dcat_us_writer.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/readme.md
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_access_level.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_access_url.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_accrualPeriodicity.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_bureau_code.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_contact_point.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_dcat_us.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_described_by.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_described_by_type.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_description.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_distribution.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_download_url.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_identifier.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_is_part_of.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_issued.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_keyword.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_landing_page.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_language.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_license.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_media_type.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_modified.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_primaryITInvestmentUII.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_program_code.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_publisher.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_references.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_rights.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_spatial.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_system_of_records.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_temporal.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/sections/dcat_us_theme.rb
+- lib/adiwg/mdtranslator/writers/dcat_us/version.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_address.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_attribute.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_browse.rb