adiwg-mdtranslator 2.13.0 → 2.13.1

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

@@ -34,16 +34,16 @@ module ADIWG
                      # mdJson - metadata (required)
                      json.metadata Metadata.build(intObj[:metadata])
 
-                     # mdJson - dataDictionaries []
-                     unless intObj[:dataDictionaries].empty?
-                        json.dataDictionary intObj[:dataDictionaries].map { |obj| Dictionary.build(obj).attributes! }
-                     end
-
                      # mdJson - metadataRepositories []
                      unless intObj[:metadataRepositories].empty?
                         json.metadataRepository intObj[:metadataRepositories].map { |obj| Repository.build(obj).attributes! }
                      end
 
+                     # mdJson - dataDictionaries []
+                     unless intObj[:dataDictionaries].empty?
+                        json.dataDictionary intObj[:dataDictionaries].map { |obj| Dictionary.build(obj).attributes! }
+                     end
+
                   end
 
                end # build

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

@@ -1,7 +1,7 @@
 # mdJson 2.0 writer - medium
 
 # History:
-#   Stan Smith 2017-03-20 original script
+#  Stan Smith 2017-03-20 original script
 
 require 'jbuilder'
 require_relative 'mdJson_citation'

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

@@ -16,11 +16,7 @@ module ADIWG
 
                   Jbuilder.new do |json|
                      json.contactId hParty[:contactId]
-                     aOrgs = []
-                     hParty[:organizationMembers].each do |hOrg|
-                        aOrgs << hOrg[:contactId]
-                     end
-                     json.organizationMembers aOrgs unless aOrgs.empty?
+                     json.organizationMembers hParty[:organizationMembers] unless hParty[:organizationMembers].empty?
                   end
 
                end # build

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

@@ -1,10 +1,11 @@
 # mdJson 2.0 writer - metadataRepository
 
 # History:
-#   Stan Smith 2017-03-11 refactored for mdJson/mdTranslator 2.0
-#   Josh Bradley original script
+#  Stan Smith 2017-03-11 refactored for mdJson/mdTranslator 2.0
+#  Josh Bradley original script
 
 require 'jbuilder'
+require_relative 'mdJson_citation'
 
 module ADIWG
    module Mdtranslator
@@ -18,6 +19,7 @@ module ADIWG
                   Jbuilder.new do |json|
                      json.repository hRepository[:repository]
                      json.metadataStandard hRepository[:metadataStandard]
+                     json.citation Citation.build(hRepository[:citation]) unless hRepository[:citation].empty?
                   end
 
                end # build

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

@@ -17,6 +17,7 @@ module ADIWG
 
                   Jbuilder.new do |json|
                      json.datumIdentifier Identifier.build(hDatum[:datumIdentifier]) unless hDatum[:datumIdentifier].empty?
+                     json.datumName hDatum[:datumName]
                      json.encodingMethod hDatum[:encodingMethod]
                      json.isDepthSystem hDatum[:isDepthSystem]
                      json.verticalResolution hDatum[:verticalResolution]

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_citation.rb

@@ -23,29 +23,29 @@ module ADIWG
                   citation = ''
 
                   # names
-                  aIndexes = []
+                  aParties = []
                   hCitation[:responsibleParties].each do |hResponsibility|
                      role = hResponsibility[:roleName]
                      hResponsibility[:parties].each do |hParty|
                         party = {}
                         party[:role] = role
-                        party[:index] = hParty[:contactIndex]
-                        aIndexes << party
-                        hParty[:organizationMembers].each do |hMember|
+                        party[:contactId] = hParty[:contactId]
+                        aParties << party
+                        hParty[:organizationMembers].each do |memberId|
                            party = {}
                            party[:role] = role
-                           party[:index] = hMember[:contactIndex]
-                           aIndexes << party
+                           party[:contactId] = memberId
+                           aParties << party
                         end
                      end
                   end
-                  aIndexes.uniq!
-                  aIndexes.each do |hIndex|
-                     hContact = ADIWG::Mdtranslator::Writers::SbJson.get_contact_by_index(hIndex[:index])
+                  aParties.uniq!
+                  aParties.each do |hParty|
+                     hContact = ADIWG::Mdtranslator::Writers::SbJson.get_contact_by_id(hParty[:contactId])
                      unless hContact.empty?
                         unless hContact[:name].nil?
-                           sbRole = Codelists.codelist_adiwg2sb('role_adiwg2sb', hIndex[:role])
-                           sbRole = sbRole.nil? ? hIndex[:role] : sbRole
+                           sbRole = Codelists.codelist_adiwg2sb('role_adiwg2sb', hParty[:role])
+                           sbRole = sbRole.nil? ? hParty[:role] : sbRole
                            citation += hContact[:name] + '(' + sbRole + '), '
                         end
                      end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.13.1
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-11 00:00:00.000000000 Z
+date: 2018-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -317,6 +317,7 @@ files:
 - lib/adiwg/mdtranslator/readers/fgdc/readme.md
 - lib/adiwg/mdtranslator/readers/fgdc/version.rb
 - 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_additionalDocumentation.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_address.rb
@@ -854,7 +855,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: The mdtranslator (metadata translator) is a tool for translating metadata