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

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

@@ -0,0 +1,29 @@
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Dcat_us
+            module Modified
+
+               def self.build(intObj)
+                  resourceInfo = intObj[:metadata][:resourceInfo]
+                  citation = resourceInfo[:citation]
+                  dates = citation[:dates]
+
+                  mostRecentDate = nil
+
+                  dates.each do |date|
+                     if date[:dateType] == "lastUpdated" || date[:dateType] == "lastRevised" || date[:dateType] == "revision"
+                        if mostRecentDate.nil? || date[:date] > mostRecentDate
+                           mostRecentDate = date[:date]
+                        end
+                     end
+                  end
+
+                  return mostRecentDate
+               end               
+
+            end
+         end
+      end
+   end
+end

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

@@ -0,0 +1,19 @@
+require 'jbuilder'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Dcat_us
+            module PrimaryITInvestmentUII
+
+               def self.build(intObj)
+                  primaryITInvestmentUII = intObj[:metadata][:metadataInfo][:metadataIdentifier][:identifier]
+                  
+                  primaryITInvestmentUII ? primaryITInvestmentUII : nil
+                end
+                
+            end
+         end
+      end
+   end
+end

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

@@ -0,0 +1,33 @@
+require 'jbuilder'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Dcat_us
+            module ProgramCode
+
+               def self.build(intObj)
+                
+                    responsibleParties = intObj[:metadata][:resourceInfo][:citation][:responsibleParties]
+                    contacts = []
+                    responsibleParties.each do |party|
+                        contactId = party[:parties][0][:contactId]
+                        contacts << Dcat_us.get_contact_by_id(contactId)
+                    end
+
+                    programContacts = contacts&.select { |contact| contact[:externalIdentifier].any? { |id| id[:namespace] == 'programCode'} }
+
+                    programsCodes = []
+                    programContacts.each do |contact|
+                        programCode = contact[:externalIdentifier].find { |id| id[:namespace] == 'programCode' }
+                        programsCodes << programCode[:identifier]
+                    end
+
+                    return programsCodes
+                end
+                
+            end
+         end
+      end
+   end
+end

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

@@ -0,0 +1,74 @@
+module ADIWG
+  module Mdtranslator
+    module Writers
+      module Dcat_us
+        module Publisher
+          def self.build(intObj)
+            contacts = intObj.dig(:contacts)
+            metadata = intObj.dig(:metadata)
+            responsible_parties = metadata&.dig(:resourceInfo, :citation, :responsibleParties)
+            resource_distributions = metadata&.dig(:distributorInfo)
+            
+            publisher = find_publisher(responsible_parties) || find_distributions_publisher(intObj)
+            
+            return if publisher.nil?
+            
+            name, org_name = extract_names(publisher, contacts)
+            
+            return if name.nil?
+            
+            build_json(name, org_name)
+          end
+          
+          private
+          
+          def self.find_publisher(responsible_parties)
+            responsible_parties&.detect do |party|
+              party[:roleName] == 'publisher' && party.dig(:parties)&.first&.dig(:contactType) == 'organization'
+            end
+          end
+
+          def self.find_distributions_publisher(intObj)
+            distributor_info = intObj.dig(:metadata, :distributorInfo) || []
+            distributor_info.each do |distribution|
+              distributors = distribution[:distributor] || []
+              distributors.each do |dist|
+                contact_type = dist.dig(:contact, :parties, 0, :contactType)
+                return dist[:contact] if contact_type == 'organization'
+              end
+            end
+            nil
+          end            
+          
+          def self.extract_names(publisher, contacts)
+            contact_id = publisher.dig(:parties)&.first&.dig(:contactId) || publisher[:contactId]
+            related_contact = contacts&.detect { |contact| contact[:contactId] == contact_id }
+            org_name = nil
+            if related_contact
+              member_of_org_ids = related_contact[:memberOfOrgs]
+              member_of_orgs = contacts.select { |contact| member_of_org_ids&.include?(contact[:contactId]) && contact[:isOrganization] }
+              org_name = member_of_orgs.first&.dig(:name)
+            end
+            name = publisher.dig(:parties)&.first&.dig(:contactName) || publisher[:contactName]
+            [name, org_name]
+          end
+          
+          def self.build_json(name, org_name)
+            Jbuilder.new do |json|
+              json.set!('@type', 'org:Organization')
+              json.set!('name', name)
+              
+              if org_name
+                json.subOrganizationOf do |json_sub|
+                  json_sub.set!('@type', 'org:Organization')
+                  json_sub.set!('name', org_name)
+                end
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+require 'jbuilder'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Dcat_us
+            module References
+
+               def self.build(intObj)
+                  metadata = intObj.dig(:metadata)
+                  associated_resources = metadata&.dig(:associatedResources)
+                  additional_documents = metadata&.dig(:additionalDocuments)
+                  uris = []
+                
+                  if associated_resources
+                    associated_resources.each do |associated|
+                      citation = associated.dig(:resourceCitation)
+                      online_resources = citation&.dig(:onlineResources)
+                      next unless online_resources
+                
+                      online_resources.each do |online|
+                        uri = online.dig(:olResURI)
+                        uris << uri if uri
+                      end
+                    end
+                  end
+                
+                  if additional_documents
+                    additional_documents.each do |additional|
+                      citations = additional&.dig(:citation) || []
+                      citations.each do |citation|
+                        online_resources = citation&.dig(:onlineResources)
+                        next unless online_resources
+                
+                        online_resources.each do |online|
+                          uri = online.dig(:olResURI)
+                          uris << uri if uri
+                        end
+                      end
+                    end
+                  end
+                
+                  uris.join(',')
+               end
+
+            end
+         end
+      end
+   end
+end

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

@@ -28,147 +28,77 @@ module ADIWG
                   hDataQuality = intObj.dig(:metadata, :dataQuality, 0)
 
                   if hDataQuality && hDataQuality[:report]
-                     # data quality 2.1 (attracc) - Attribute Accuracy
-                     attribute_accuracy_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'DQ_NonQuantitativeAttributeCorrectness' &&
+                     # data quality 2.1 (attracc) - attribute accuracy (not implemented)
+                     attribute_completeness_report = hDataQuality[:report].find do |report|
+                        report[:type] == 'NonQuantitativeAttributeCorrectness' &&
                         !report.dig(:descriptiveResult, 0, :statement).nil?
                      end
-                     attribute_accuracy_value = hDataQuality[:report].find do |report|
-                        report[:type] == 'DQ_QuantitativeAttributeAccuracy' &&
-                        !report.dig(:quantitativeResult, 0, :values).nil?
-                     end
-                     attribute_evaluation_method = hDataQuality[:report].find do |report|
-                        report[:type] == 'DQ_QuantitativeAttributeAccuracy' &&
-                        !report.dig(:evaluationMethod, :methodDescription).nil?
-                     end
-                     if attribute_accuracy_report || attribute_accuracy_value || attribute_evaluation_method
-                        # data quality 2.1 (attracc) - Attribute Accuracy
+
+                     if attribute_completeness_report
                         @xml.tag!('attracc') do
-                           if attribute_accuracy_report
-                              # data quality 2.1.1 (attraccr) - Attribute Accuracy Report
-                              @xml.tag!('attraccr', attribute_accuracy_report[:descriptiveResult][0][:statement])
-                           end
-                           if attribute_accuracy_value || attribute_evaluation_method
-                              # data quality 2.1.2 (qattracc) - Quantitative Attribute Accuracy Assessment
-                              @xml.tag!('qattracc') do
-                                 if attribute_accuracy_value
-                                    # data quality 2.1.2.1 (attraccv) - Attribute Accuracy Value
-                                    @xml.tag!('attraccv', attribute_accuracy_value[:quantitativeResult][0][:values][0])
-                                 end
-                                 if attribute_evaluation_method
-                                    # data quality 2.1.2.2 (attracce) - Attribute Accuracy Explanation
-                                    @xml.tag!('attracce', attribute_evaluation_method[:evaluationMethod][:methodDescription])
-                                 end
-                              end
-                           end
+                           @xml.tag!('attraccr', attribute_completeness_report[:descriptiveResult][0][:statement])
                         end
                      elsif @hResponseObj[:writerShowTags]
                         @xml.tag!('attracc', 'Not Reported')
                      end
 
-                     # data quality 2.2 (logic) - logical consistency (required)
+                     # data quality 2.2 (logic) - logical consistency (not implemented) (required)
                      logic_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'DQ_ConceptualConsistency' &&
-                        !report.dig(:descriptiveResult, 0, :statement).nil?
+                        report[:type] == 'ConceptualConsistency' &&
+                        !report.dig(:qualityMeasure, :description).nil?
                      end
-                     if logic = logic_report&.dig(:descriptiveResult, 0, :statement)
+
+                     if logic = logic_report&.dig(:qualityMeasure, :description)
                         @xml.tag!('logic', logic)
                      else
                         @xml.tag!('logic', 'Not Reported')
                      end
 
-                     # data quality 2.3 (complete) - completion report (required)
-                     omission_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'DQ_CompletenessOmission' &&
-                        !report.dig(:descriptiveResult, 0, :statement).nil?
-                     end
-                     omission = omission_report&.dig(:descriptiveResult, 0, :statement)
-                     commission_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'DQ_CompletenessCommission' &&
+                     # data quality 2.3 (complete) - completion report (not implemented) (required)
+                     completeness_report = hDataQuality[:report].find do |report|
+                        report[:type] == 'Omission' &&
                         !report.dig(:descriptiveResult, 0, :statement).nil?
                      end
-                     commission = commission_report&.dig(:descriptiveResult, 0, :statement)
-                     complete = ''
-                     if omission
-                        complete = omission
-                     end
-                     if commission
-                        if complete != ''
-                           complete = complete + ' ' + commission
-                        else
-                           complete = commission
-                        end
-                     end
-                     if complete != ''
+
+                     if complete = completeness_report&.dig(:descriptiveResult, 0, :statement)
                         @xml.tag!('complete', complete)
                      else
                         @xml.tag!('complete', 'Not Reported')
                      end
 
-                     # data quality 2.4 (position) - Positional Accuracy
+                     # data quality 2.4 (position) - positional accuracy
+
 
-                     # data quality 2.4.1 (horizpa) - Horizontal Positional Accuracy
                      horizontal_positional_accuracy_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'DQ_AbsoluteExternalPositionalAccuracy' &&
-                        report.dig(:descriptiveResult, 0, :name) == 'Horizontal Positional Accuracy Report' &&
-                        !report.dig(:descriptiveResult, 0, :statement).nil? 
+                        report[:type] == 'AbsoluteExternalPositionalAccuracy' &&
+                        report.dig(:qualityMeasure, :nameOfMeasure)&.any? { |name|
+                           name == 'Horizontal Positional Accuracy Report'
+                        }
                      end
-                     horizpar = horizontal_positional_accuracy_report&.dig(:descriptiveResult, 0, :statement)
-                     horizpav = horizontal_positional_accuracy_report&.dig(:quantitativeResult, 0, :values, 0)
-                     horizpae = horizontal_positional_accuracy_report&.dig(:descriptiveResult, 1, :statement)
 
-                     # data quality 2.4.2 (vertacc) - Vertical Positional Accuracy
+                     horizpar = horizontal_positional_accuracy_report&.dig(:evaluationMethod, :methodDescription)
+
+
                      vertical_positional_accuracy_report = hDataQuality[:report].find do |report|
-                        report[:type] == 'DQ_AbsoluteExternalPositionalAccuracy' &&
-                        report.dig(:descriptiveResult, 0, :name) == 'Vertical Positional Accuracy Report' &&
-                        !report.dig(:descriptiveResult, 0, :statement).nil?
+                        report[:type] == 'AbsoluteExternalPositionalAccuracy' &&
+                        report.dig(:qualityMeasure, :nameOfMeasure)&.any? { |name|
+                           name == 'Vertical Positional Accuracy Report'
+                        }
                      end
-                     vertaccr = vertical_positional_accuracy_report&.dig(:descriptiveResult, 0, :statement)
-                     vertaccv = vertical_positional_accuracy_report&.dig(:quantitativeResult, 0, :values, 0)
-                     vertacce = vertical_positional_accuracy_report&.dig(:descriptiveResult, 1, :statement)
+
+                     vertaccr = vertical_positional_accuracy_report&.dig(:evaluationMethod, :methodDescription)
 
                      if horizpar || vertaccr
-                        # data quality 2.4 (posacc) - Positional Accuracy
                         @xml.tag!('posacc') do
                            if horizpar
-                              # data quality 2.4.1 (horizpa) - Horizontal Positional Accuracy
                               @xml.tag!('horizpa') do
-                                 # data quality 2.4.1.1 (horizpar) - Horizontal Positional Accuracy Report
                                  @xml.tag!('horizpar', horizpar)
-                                 if horizpav || horizpae
-                                    # data quality 2.4.1.2 (qhorizpa) - Quantitative Horizontal Positional Accuracy
-                                    @xml.tag!('qhorizpa') do
-                                       if horizpav
-                                          # data quality 2.4.1.2.1 (horizpav) - Horizontal Positional Accuracy Value
-                                          @xml.tag!('horizpav', horizpav)
-                                       end
-                                       if horizpae
-                                          # data quality 2.4.1.2.2 (horizpae) - Horizontal Positional Accuracy Explanation
-                                          @xml.tag!('horizpae', horizpae)
-                                       end
-                                    end
-                                 end
                               end
                            end
 
                            if vertaccr
-                              # data quality 2.4.2 (vertacc) - Vertical Positional Accuracy
                               @xml.tag!('vertacc') do
-                                 # data quality 2.4.2.1 (vertaccr) - Vertical Positional Accuracy Report
                                  @xml.tag!('vertaccr', vertaccr)
-                                 if vertaccv || vertacce
-                                    # data quality 2.4.2.2 (qvertpa) - Quantitative Vertical Positional Accuracy
-                                    @xml.tag!('qvertpa') do
-                                       if vertaccv
-                                          # data quality 2.4.2.2.1 (vertaccv) - Vertical Positional Accuracy Value
-                                          @xml.tag!('vertaccv', vertaccv)
-                                       end
-                                       if vertacce
-                                          # data quality 2.4.2.2.2 (vertacce) - Vertical Positional Accuracy Explanation
-                                          @xml.tag!('vertacce', vertacce)
-                                       end
-                                    end
-                                 end
                               end
                            end
                         end

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

@@ -16,22 +16,6 @@ module ADIWG
             scopeClass = Html_Scope.new(@html)
             dataQualityReportClass = Html_DataQualityReport.new(@html)
 
-            # system identifier
-            unless hDataQuality[:systemIdentifier].nil?
-              systemIdentifier = hDataQuality[:systemIdentifier]
-              @html.section(:class => 'block') do
-                @html.details do
-                  @html.summary('System Identifier', {'class' => 'h4'})
-                    @html.em('UUID: ')
-                    @html.text!(systemIdentifier[:uid])
-                    @html.br
-                    @html.em('Label:')
-                    @html.text!(systemIdentifier[:label])
-                    @html.br
-                end
-              end
-            end
-
             # scope
             unless hDataQuality[:scope].empty?
               @html.section(:class => 'block') do
@@ -80,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?