adiwg-mdtranslator 2.20.0.pre.beta.5 → 2.21.0.pre.beta.0

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

@@ -0,0 +1,37 @@
+require 'jbuilder'
+require_relative 'mdJson_identifier'
+require_relative 'mdJson_extent'
+require_relative 'mdJson_event'
+require_relative 'mdJson_pass'
+require_relative 'mdJson_instrument'
+
+module ADIWG
+    module Mdtranslator
+        module Writers
+            module MdJson
+
+                module Objective
+
+                    @Namespace = ADIWG::Mdtranslator::Writers::MdJson
+
+                    def self.build(hObjective)
+
+                        Jbuilder.new do |json|
+                            json.objectiveId hObjective[:objectiveId]
+                            json.identifier @Namespace.json_map(hObjective[:identifiers], Identifier)
+                            json.priority hObjective[:priority] unless hObjective[:priority].nil?
+                            json.objectiveType hObjective[:objectiveTypes] unless hObjective[:objectiveTypes].empty?
+                            json.function hObjective[:functions] unless hObjective[:functions].empty?
+                            json.extent @Namespace.json_map(hObjective[:extents], Extent) unless hObjective[:extents].empty?
+                            json.objectiveOccurence @Namespace.json_map(hObjective[:occurrences], Event) unless hObjective[:occurrences].empty?
+                            json.pass @Namespace.json_map(hObjective[:passes], Pass) unless hObjective[:passes].empty?
+                            json.sensingInstrument @Namespace.json_map(hObjective[:sensingInstruments], Instrument) unless hObjective[:sensingInstruments].empty?
+                        end
+
+                    end
+                end # Objective
+
+            end
+        end
+    end
+end

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

@@ -0,0 +1,34 @@
+require 'jbuilder'
+
+module ADIWG
+    module Mdtranslator
+        module Writers
+            module MdJson
+
+                module Operation
+
+                    @Namespace = ADIWG::Mdtranslator::Writers::MdJson
+
+                    def self.build(hOperation)
+
+                        Jbuilder.new do |json|
+                            json.operationId hOperation[:operationId]
+                            json.description hOperation[:description] unless hOperation[:description].nil?
+                            json.citation Citation.build(hOperation[:citation]) unless hOperation[:citation].empty?
+                            json.identifier Identifier.build(hOperation[:identifier])
+                            json.status hOperation[:status]
+                            json.operationType hOperation[:operationType] unless hOperation[:operationType].nil?
+                            json.objective @Namespace.json_map(hOperation[:objectives], Objective) unless hOperation[:objectives].empty?
+                            json.parentOperation Operation.build(hOperation[:parentOperation]) unless hOperation[:parentOperation].empty?
+                            json.childOperation @Namespace.json_map(hOperation[:childOperations], Operation) unless hOperation[:childOperations].empty?
+                            json.plan Plan.build(hOperation[:plan]) unless hOperation[:plan].empty?
+                            json.platform @Namespace.json_map(hOperation[:platforms], Platform) unless hOperation[:platforms].empty?
+                            json.significantEvent @Namespace.json_map(hOperation[:significantEvents], Event) unless hOperation[:significantEvents].empty?
+                        end
+
+                    end
+                end # Operation
+            end
+        end
+    end
+end

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

@@ -0,0 +1,30 @@
+require 'jbuilder'
+require_relative 'mdJson_identifier'
+require_relative 'mdJson_extent'
+require_relative 'mdJson_event'
+
+module ADIWG
+    module Mdtranslator
+        module Writers
+            module MdJson
+
+                module Pass
+
+                    @Namespace = ADIWG::Mdtranslator::Writers::MdJson
+
+                    def self.build(hPass)
+
+                        Jbuilder.new do |json|
+                            json.passId hPass[:passId]
+                            json.identifier Identifier.build(hPass[:identifier])
+                            json.extent Extent.build(hPass[:extent]) unless hPass[:extent].empty?
+                            json.relatedEvent @Namespace.json_map(hPass[:relatedEvents], Event) unless hPass[:relatedEvents].empty?
+                        end
+
+                    end
+                end # Pass
+
+            end
+        end
+    end
+end

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

@@ -0,0 +1,32 @@
+require 'jbuilder'
+require_relative 'mdJson_citation'
+require_relative 'mdJson_operation'
+require_relative 'mdJson_requirement'
+
+module ADIWG
+    module Mdtranslator
+        module Writers
+            module MdJson
+
+                module Plan
+
+                    @Namespace = ADIWG::Mdtranslator::Writers::MdJson
+
+                    def self.build(hPlan)
+
+                        Jbuilder.new do |json|
+                            json.planId hPlan[:planId]
+                            json.planType hPlan[:planType] unless hPlan[:planType].nil?
+                            json.status hPlan[:status]
+                            json.citation Citation.build(hPlan[:citation])
+                            json.planOperation @Namespace.json_map(hPlan[:operations], Operation)
+                            json.satisfiedRequirement @Namespace.json_map(hPlan[:satisfiedRequirements], Requirement)
+
+                        end
+
+                    end
+                end # Plan
+            end
+        end
+    end
+end

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

@@ -0,0 +1,35 @@
+require 'jbuilder'
+require_relative 'mdJson_citation'
+require_relative 'mdJson_identifier'
+require_relative 'mdJson_responsibleParty'
+require_relative 'mdJson_instrument'
+require_relative 'mdJson_instrumentationEventList'
+
+module ADIWG
+    module Mdtranslator
+        module Writers
+            module MdJson
+
+                module Platform
+
+                    @Namespace = ADIWG::Mdtranslator::Writers::MdJson
+
+                    def self.build(hPlatform)
+
+                        Jbuilder.new do |json|
+                            json.platformId hPlatform[:platformId]
+                            json.citation Citation.build(hPlatform[:citation]) unless hPlatform[:citation].empty?
+                            json.identifier Identifier.build(hPlatform[:identifier])
+                            json.description hPlatform[:description]
+                            json.sponsor @Namespace.json_map(hPlatform[:sponsors], ResponsibleParty) unless hPlatform[:sponsors].empty?
+                            json.instrument @Namespace.json_map(hPlatform[:instruments], Instrument)
+                            json.history @Namespace.json_map(hPlatform[:history], InstrumentationEventList) unless hPlatform[:history].empty?
+                        end
+
+                    end
+                end # Platform
+
+            end
+        end
+    end
+end

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

@@ -0,0 +1,26 @@
+require 'jbuilder'
+require_relative 'mdJson_dateTime'
+
+module ADIWG
+    module Mdtranslator
+        module Writers
+            module MdJson
+
+                module RequestedDate
+
+                    @Namespace = ADIWG::Mdtranslator::Writers::MdJson
+
+                    def self.build(hRequestedDate)
+
+                        Jbuilder.new do |json|
+                            json.requestedDateOfCollection DateTime.build(hRequestedDate[:requestedDateOfCollection])
+                            json.latestAcceptableDate DateTime.build(hRequestedDate[:latestAcceptableDate])
+                        end
+
+                    end
+                end # Requested Date
+
+            end
+        end
+    end
+end

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

@@ -0,0 +1,36 @@
+require 'jbuilder'
+require_relative 'mdJson_citation'
+require_relative 'mdJson_identifier'
+require_relative 'mdJson_responsibleParty'
+require_relative 'mdJson_requestedDate'
+require_relative 'mdJson_plan'
+
+module ADIWG
+    module Mdtranslator
+        module Writers
+            module MdJson
+
+                module Requirement
+
+                    @Namespace = ADIWG::Mdtranslator::Writers::MdJson
+
+                    def self.build(hRequirement)
+
+                        Jbuilder.new do |json|
+                            json.requirementId hRequirement[:requirementId]
+                            json.citation Citation.build(hRequirement[:citation])
+                            json.identifier Identifier.build(hRequirement[:identifier])
+                            json.requestor @Namespace.json_map(hRequirement[:requestors], ResponsibleParty)
+                            json.recipient @Namespace.json_map(hRequirement[:recipients], ResponsibleParty)
+                            json.priority hRequirement[:priority]
+                            json.requestedDate RequestedDate.build(hRequirement[:requestedDate])
+                            json.expiryDate hRequirement[:expiryDate]
+                            json.satisfiedPlan @Namespace.json_map(hRequirement[:satisfiedPlans], Plan)
+                        end
+
+                    end
+                end # Requirement
+            end
+        end
+    end
+end

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

@@ -0,0 +1,28 @@
+require 'jbuilder'
+require_relative 'mdJson_responsibleParty'
+require_relative 'mdJson_dateTime'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module MdJson
+
+            module Revision
+
+               @Namespace = ADIWG::Mdtranslator::Writers::MdJson
+
+               def self.build(hRevision)
+                  
+                  Jbuilder.new do |json|
+                     json.description hRevision[:description]
+                     json.responsibleParty @Namespace.json_map(hRevision[:responsibleParties], ResponsibleParty)
+                     json.dateInfo @Namespace.json_map(hRevision[:dateInfo], DateTime)
+                  end
+
+               end
+            end # Revision
+
+         end
+      end
+   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 dcat_us}
+                 :enum => %w{fgdc html iso19110 iso19115_1 iso19115_2 iso19115_3 mdJson sbJson simple_html }
    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.20.0.pre.beta.5
+  version: 2.21.0.pre.beta.0
 platform: ruby
 authors:
 - Stan Smith
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.5
+        version: 2.10.0.pre.beta.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.5
+        version: 2.10.0.pre.beta.5
 - !ruby/object:Gem::Dependency
   name: adiwg-mdcodes
   requirement: !ruby/object:Gem::Requirement
@@ -232,7 +232,6 @@ files:
 - ".jsbeautifyrc"
 - ".travis.yml"
 - CHANGELOG.md
-- DCAT-US.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -336,6 +335,7 @@ files:
 - lib/adiwg/mdtranslator/readers/mdJson/mdJson_reader.rb
 - lib/adiwg/mdtranslator/readers/mdJson/mdJson_reader_messages_eng.yml
 - lib/adiwg/mdtranslator/readers/mdJson/mdJson_validator.rb
+- lib/adiwg/mdtranslator/readers/mdJson/modules/module_acquisition.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_additionalDocumentation.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_address.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_algorithm.rb
@@ -369,7 +369,9 @@ files:
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_entityAttribute.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_entityForeignKey.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_entityIndex.rb
+- lib/adiwg/mdtranslator/readers/mdJson/modules/module_environment.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_evaluationMethod.rb
+- lib/adiwg/mdtranslator/readers/mdJson/modules/module_event.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_extent.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_featureCollection.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_format.rb
@@ -389,6 +391,9 @@ files:
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_gridRepresentation.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_identifier.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_imageDescription.rb
+- lib/adiwg/mdtranslator/readers/mdJson/modules/module_instrument.rb
+- lib/adiwg/mdtranslator/readers/mdJson/modules/module_instrumentationEvent.rb
+- lib/adiwg/mdtranslator/readers/mdJson/modules/module_instrumentationEventList.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_keyword.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_keywordObject.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_legalConstraint.rb
@@ -403,11 +408,16 @@ files:
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_metadataInfo.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_metadataRepository.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_nominalResolution.rb
+- lib/adiwg/mdtranslator/readers/mdJson/modules/module_objective.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_obliqueLinePoint.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_onlineResource.rb
+- lib/adiwg/mdtranslator/readers/mdJson/modules/module_operation.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_orderProcess.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_party.rb
+- lib/adiwg/mdtranslator/readers/mdJson/modules/module_pass.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_phone.rb
+- lib/adiwg/mdtranslator/readers/mdJson/modules/module_plan.rb
+- lib/adiwg/mdtranslator/readers/mdJson/modules/module_platform.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_processReport.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_processStep.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_processing.rb
@@ -418,10 +428,13 @@ files:
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_rangeElementDescription.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_referenceSystemParameters.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_releasability.rb
+- lib/adiwg/mdtranslator/readers/mdJson/modules/module_requestedDate.rb
+- lib/adiwg/mdtranslator/readers/mdJson/modules/module_requirement.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_resourceInfo.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_resourceType.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_resourceUsage.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_responsibleParty.rb
+- lib/adiwg/mdtranslator/readers/mdJson/modules/module_revision.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_schema.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_scope.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_scopeDescription.rb
@@ -475,38 +488,6 @@ 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
@@ -567,6 +548,7 @@ files:
 - lib/adiwg/mdtranslator/writers/fgdc/version.rb
 - lib/adiwg/mdtranslator/writers/html/html_writer.rb
 - lib/adiwg/mdtranslator/writers/html/readme.md
+- lib/adiwg/mdtranslator/writers/html/sections/html_acquisition.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_additionalDocumentation.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_algorithm.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_allocation.rb
@@ -600,6 +582,8 @@ files:
 - lib/adiwg/mdtranslator/writers/html/sections/html_entityAttribute.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_entityForeignKey.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_entityIndex.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_environment.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_event.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_extent.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_feature.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_featureCollection.rb
@@ -621,6 +605,9 @@ files:
 - lib/adiwg/mdtranslator/writers/html/sections/html_identifier.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_imageInfo.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_inlineCss.css
+- lib/adiwg/mdtranslator/writers/html/sections/html_instrument.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_instrumentationEvent.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_instrumentationEventList.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_keyword.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_legalConstraint.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_lineage.rb
@@ -631,9 +618,14 @@ files:
 - lib/adiwg/mdtranslator/writers/html/sections/html_metadataInfo.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_metadataRepository.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_nominalResolution.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_objective.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_obliqueLinePoint.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_onlineResource.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_operation.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_orderProcess.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_pass.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_plan.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_platform.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_processReport.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_processStep.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_processing.rb
@@ -641,11 +633,14 @@ files:
 - lib/adiwg/mdtranslator/writers/html/sections/html_rangeElementDescription.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_referenceSystemParameters.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_releasability.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_requestedDate.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_requirement.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_resourceFormat.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_resourceInfo.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_resourceType.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_responsibility.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_resultFile.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_revision.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_scope.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_scopeDescription.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_securityConstraint.rb
@@ -900,6 +895,7 @@ files:
 - lib/adiwg/mdtranslator/writers/iso19115_3/version.rb
 - lib/adiwg/mdtranslator/writers/mdJson/mdJson_writer.rb
 - lib/adiwg/mdtranslator/writers/mdJson/readme.md
+- lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_acquisition.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_additionalDocumentation.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_address.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_algorithm.rb
@@ -934,7 +930,9 @@ files:
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_entityAttribute.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_entityForeignKey.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_entityIndex.rb
+- lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_environment.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_evaluationMethod.rb
+- lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_event.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_extent.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_format.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_funding.rb
@@ -949,6 +947,9 @@ files:
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_identifier.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_imageDescription.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_imageInfo.rb
+- lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_instrument.rb
+- lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_instrumentationEvent.rb
+- lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_instrumentationEventList.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_keyword.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_keywordObject.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_legalConstraint.rb
@@ -962,11 +963,16 @@ files:
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_metadata.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_metadataInfo.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_nominalResolution.rb
+- lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_objective.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_obliqueLinePoint.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_onlineResource.rb
+- lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_operation.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_orderProcess.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_party.rb
+- lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_pass.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_phone.rb
+- lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_plan.rb
+- lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_platform.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_processReport.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_processStep.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_processing.rb
@@ -976,9 +982,12 @@ files:
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_quantitativeResult.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_releasability.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_repository.rb
+- lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_requestedDate.rb
+- lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_requirement.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_resourceInfo.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_resourceType.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_responsibleParty.rb
+- lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_revision.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_scope.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_scopeDescription.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_securityConstraint.rb

data/DCAT-US.md

@@ -1,67 +0,0 @@
-# DCAT-US - mdTranslator proposed mappings
-## Quick references
-  - DCAT-US [element definitions](https://resources.data.gov/resources/dcat-us/)
-  - DCAT-US v1.1 [catalog.json schema](https://resources.data.gov/schemas/dcat-us/v1.1/schema/catalog.json)
-  - DCAT-US v1.1 [dataset.json schema](https://resources.data.gov/schemas/dcat-us/v1.1/schema/dataset.json)
-  - DCAT-US v1.1 [JSON-LD catalog.json schema](https://resources.data.gov/schemas/dcat-us/v1.1/schema/catalog.jsonld)
-  - [Element crosswalks](https://resources.data.gov/resources/podm-field-mapping/#field-mappings) to other standards
-
-## DCAT-US - mdTranslator
-
-### Always (always required)
-
-| Field Name | DCAT Name | Condition | mdJson Source |
-| --- | --- | --- | --- |
-| Title | title | exists | citation.title |
-| Description | description | exists | resourceInfo.abstract |
-| Tags | keyword | exists | [resourceInfo.keyword.keyword[0, n] *flatten*] |
-| Last Update | modified | if resourceInfo.citation.date[any].dateType = "lastUpdated" or "lastRevised" or "revision" | resourceInfo.citation.date[most recent] |
-| Publisher | publisher{name} | if citation.responsibleParty.[any].role = "publisher" |  contactId -> contact.name where isOrganization IS TRUE |
-| | | if exists resourceDistribution.distributor.contact | [first contact] contactId -> contact.name where isOrganization IS TRUE |
-| Publisher Parent Organization | publisher{subOrganizationOf} | if citation.responsibleParty[any].role = "publisher" and exists contactId -> memberOfOrganization[0] and isOrganization is true | contactId -> contact.name |
-| | | if exists resourceDistribution.distributor.contact and exists contactId -> memberOfOrganization[0] and isOrganization IS TRUE | contactId -> contact.name |
-| Contact Name | contactPoint{fn} | exists | resourceInfo.pointOfContact.parties[0].contactId -> contact.name |
-| Contact Email | contactPoint{email} | exists | resourceInfo.pointOfContact.parties[0].contactId -> contact.eMailList[0] |
-| Unique Identifier | identifier | if resourceInfo.citation.identifier.namespace = "DOI" | resourceInfo.citation.onlineResource.uri |
-| | | if "DOI" within resourceInfo.citation.onlineResource.uri | resourceInfo.citation.onlineResource.uri |
-| Public Access Level | accessLevel | [*extend codelist MD_RestrictionCode to include "public",  "restricted  public", "non-public"*] <br> if resourceInfo.constraints.legal[any] one of {"public", "restricted public", "non-public"} | resourceInfo.constraints.legal[first]. Also resourceInfo.constraint.security.classification [[MD_ClassificationCode](https://mdtools.adiwg.org/#codes-page?c=iso_classification)] |
-| Bureau Code | bureauCode | | [*extend role codelist to include "bureau", extend namespace codelist to include "bureauCode"*] <br> for each resourceInfo.citation.responsibleParty[any] role = "bureau" <br>contactId -> contact.identifier [*identifier must conform to https://resources.data.gov/schemas/dcat-us/v1.1/omb_bureau_codes.csv*] |
-| Program Code | programCode | | [*add new element of program resourceInfo.programCode, add new codelist of programCode*] <br> resourceInfo.program[0,n] |
-
-### If-Applicable (required if it exists)
-
-| Field Name | DCAT Name | Condition | mdJson Source |
-| --- | --- | --- | --- |
-| Distribution | distribution | if exists resourceDistribution[any] and if exists resourceDistribution.distributor[any].transferOption[any].onlineOption[any].uri <br> for each resourceDistribution[0, n] where exists resourceDistribution.distributor.transferOption.onlineOption.uri then <br> {description, accessURL, downloadURL, mediaType, title} |
-| - Description | distribution.description | exists | resourceDistribution.description |
-| - AccessURL | distribution.accessURL | if citation.onlineResources[first occurence].uri [path ends in ".html"] [*required if applicable*] | resourceDistribution.distributor.transferOption.onlineOption.uri |
-| - DownloadURL | dcat.distribution.downloadURL | if citation.onlineResources[first occurence].uri [path does not end in ".html"] [*required if applicable*] |resourceDistribution.distributor.transferOption.onlineOption.uri |
-| - MediaType | distribution.mediaType | [*add codelist of "dataFormat"*] <br> transferOption.distributionFormat.formatSpecification.title [dataFormat] [*dataFormat should conform to: https://www.iana.org/assignments/media-types/media-types.xhtml*] |
-| - Title | distribution.title | exists | resourceDistribution.distributor.transferOption.onlineOption.name |
-| License | license | [*add resourceInfo.constraint.reference to mdEditor*] <br> if exists resourceInfo.constraint.reference[0] | resourceInfo.constraint.reference[0] <br> |
-| | | else | https://creativecommons.org/publicdomain/zero/1.0/ <br> [*allows author to identify a license to use, or default to CC0 if none provided, CC0 would cover international usage as opposed to publicdomain*] <br> [*others: http://www.usa.gov/publicdomain/label/1.0/, http://opendatacommons.org/licenses/pddl/1.0*] |
-| Rights | rights | if constraint.accessLevel in {"restricted public", "non-public"} | resourceInfo.constraint.releasibility.statement + " " + each constraint.releasibility.dessiminationConstraint[0, n] |
-| Endpoint | *removed* | *ignored* | *ignored* |
-| Spatial | spatial | if exists resourceInfo.extents[0].geographicExtents[0].boundingBox | boundingBox.eastLongitude + "," + boundingBox.southLatitude + "," + boundingBox.westLongitude + "," + boundingBox.northLatitude [*decimal degrees*] |
-| | | else | if exists resourceInfo.extents[0].geographicExtents[0].geographicElement[0].type = "point" then <br> geographicElement[0].coordinate[1] + "," + geographicElement[0].coordinate[0] [*lat, long decimal degrees*] |
-| Temporal | temporal | if exists resourceInfo.extent[0].temporalExtent[0] then <br> if exists tempororalExtent[0].timePeriod.startDate and exists temporaralExtent[0].timePeriod.endDate | timePeriod[0].startDate + "/" + timePeriod.endDate |
-| | | if exists  tempororalExtent[0].timePeriod.startDate and not exists temporaralExtent[0].timePeriod.endDate | tempororalExtent[0].timePeriod.startDate |
-| | | if not exists temporalExtent[0].timePeriod.startDate and exists temporaralExtent[0].timePeriod.endDate | tempororalExtent[0].timePeriod.endDate <br> [*may need revisiting relative to decision on date only formatting*] |
-
-### No (not required)
-
-| Field Name | DCAT Name | Condition | mdJson Source |
-| --- | --- | --- | --- |
-| Release Date | issued | if resourceInfo.citation.date[any].dateType = "publication" or "distributed" | resourceInfo.citation.date[earliest] |
-| Frequency | accrualPeriodicity | | [*ISO codelist MD_maintenanceFrequency can be used and several codes intersect with accrualPeriod codelist they are partially corresponding. A column of ISO8601 code equivalents could be added to MD_maintenanceFrequency to provide the coding expected https://resources.data.gov/schemas/dcat-us/v1.1/iso8601_guidance/#accrualperiodicity, community valuation should be determined*]  |
-| Language | language | | [*language codelist could be used but needs to be bound with country corresponding to the RFC 5646 format https://datatracker.ietf.org/doc/html/rfc5646, such as "en-US", community valuation should be determined* |
-| Data Quality | dataQuality | | [*this is a boolean to indicate whether data "conforms" to agency standards, value seems negligble*] |
-| Category | theme | where resourceInfo.keyword[any].thesaurus.title = "ISO Topic Category" | [resourceInfo.keyword.keyword[0, n] *flatten*]  |
-| Related Documents | references | | associatedResource[all].resourceCitation.onlineResource[all].uri + additionalDocumentation[all].citation[all].onlineResource[all].uri [*comma separated*]|
-| Homepage URL | landingPage | [*Add code "landingPage" to CI_OnlineFunctionCode*] <br> if resourceInfo.citation.onlineResource[any].function = "landingPage" | resourceInfo.citation.onlineResource.uri |
-| Collection | isPartOf | for each associatedResource[0, n].initiativeType = "collection" and associatedResource.associationType = "collectiveTitle" | associatedResource.resourceCitation[0].uri |
-| System of Records | systemOfRecords | [*Add code "sorn" to DS_InitiativeTypeCode*] <br> for each associatedResource[0, n].initiativeType = "sorn"   | associatedResource.resourceCitation[0].uri |
-| Primary IT Investment | primaryITInvestmentUII | | [*Links data to an IT investment identifier relative to Exhibit 53 docs, community valuation should be determined*] |
-| Data Dictionary | describedBy | if dataDictionary.dictionaryIncludedWithResource IS NOT TRUE and citation.onlineResource[0].uri exists | dataDictionary.citation.onlineResource[0].uri |
-| Data Dictionary Type | describedByType | | [*For simplicity, leave blank implying html page, community decision needed whether to support other format types using mime type and in the form of "application/pdf"*]|
-| Data Standard | conformsTo | | [*Currently not able to identify the schema standard the data conforms to, though this has been proposed. Should this be built and there is community decision to support it, then it can be mapped*] |