adiwg-mdtranslator 2.20.0.pre.beta.3 → 2.20.0.pre.beta.7

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

@@ -16,6 +16,22 @@ 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
@@ -64,7 +80,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/html/sections/html_dataQualityReport.rb

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

@@ -277,6 +277,33 @@ module ADIWG
 
                      # data identification - resource constraints [] {MD_Constraints}
                      aConstraint = hResource[:constraints]
+                     legalConstraint = aConstraint.find { |hCon| hCon[:type] == 'legal' }
+                     # handle distribution liability statements - add to legal constraint -> other constraints
+                     aDistInfo = hMetadata[:distributorInfo]
+                     liabilityStatements = []
+                     aDistInfo.each do |hDistribution|
+                        unless hDistribution.empty?
+                           unless hDistribution[:liabilityStatement].nil?
+                              liabilityStatements << hDistribution[:liabilityStatement]
+                           end
+                        end
+                     end
+                     if liabilityStatements.any?
+                        # Create a new legal constraint if it doesn't exist
+                        unless legalConstraint
+                           legalConstraint = {
+                              type: 'legal',
+                              legalConstraint: {
+                                 otherCons: []
+                              }
+                           }
+                           aConstraint << legalConstraint
+                        end
+                        liabilityStatements.each do |liabilityStatement|
+                           legalConstraint[:legalConstraint][:otherCons] << liabilityStatement
+                        end
+                     end
+
                      aConstraint.each do |hCon|
                         @xml.tag!('mri:resourceConstraints') do
                            constraintClass.writeXML(hCon, 'resource information')
@@ -286,6 +313,8 @@ module ADIWG
                         @xml.tag!('mri:resourceConstraints')
                      end
 
+                     # data identification - resource constraints {}  from distribution liability statement
+
                      # data identification - associated resource [] {MD_AssociatedResource}
                      aAssocRes.each do |hAssocRes|
                         @xml.tag!('mri:associatedResource') do

data/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_dataQualityReport.rb

@@ -34,7 +34,7 @@ module ADIWG
             citationClass = CI_Citation.new(@xml, @hResponseObj)
 
             @xml.tag!('mdq:report') do
-              @xml.tag!("mdq:DQ_#{hReport[:type]}") do
+              @xml.tag!("mdq:#{hReport[:type]}") do
 
                 # standaloneQualityReportDetails
                 unless hReport[:standaloneQualityReportDetails].nil?

data/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_enumerationList.rb

@@ -0,0 +1,52 @@
+# ISO <<CodeLists>> Enumerations
+# 19115-2 writer output in XML
+
+# History:
+#  Stan Smith 2016-12-12 refactored for mdTranslator/mdJson 2.0
+#  Stan Smith 2015-07-14 refactored to eliminate namespace globals $WriterNS and $IsoNS
+#  Stan Smith 2015-07-14 refactored to make iso19110 independent of iso19115_2 classes
+#  Stan Smith 2015-06-22 replace global ($response) with passed in object (responseObj)
+#  Stan Smith 2015-06-12 refactored to use mdCodes gem for codelist contents
+#  Stan Smith 2014-12-15 replaced NOAA CT_CodelistCatalogue with mdTranslator CT_CodelistCatalogue
+#  Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
+#  Stan Smith 2014-10-15 allow non-ISO codesNames to be rendered
+# 	Stan Smith 2013-08-09 original script
+
+require 'adiwg-mdcodes'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Iso19115_3
+
+            class MD_EnumerationList
+
+               def initialize(xml, responseObj)
+                  @xml = xml
+                  @hResponseObj = responseObj
+               end
+
+               def writeXML(codeList, codeName)
+
+                  # get requested codelist from the adiwg-mdcodes gem
+                  mdCodelist = ADIWG::Mdcodes.getCodelistDetail(codeList)
+
+                  sourceName = mdCodelist['sourceName']
+                  codelist = mdCodelist['codelist']
+
+                  # search the codelist for a matching codeName
+                  # only valid enumeration values can be written in ISO
+                  codelist.each do |code|
+                     if code['codeName'] == codeName
+                        @xml.tag!('gmd:' + "#{sourceName}", codeName)
+                        break
+                     end
+                  end
+
+               end # writeXML
+            end # MD_EnumerationList class
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_extension.rb

@@ -0,0 +1,208 @@
+# ISO <<Class>> MD_MetadataExtensionInformation
+# 19115-2 writer output in XML
+
+# History:
+#  Stan Smith 2019-03-22 replaced Enumeration class with method
+#  Stan Smith 2018-04-09 add error and warning messaging
+#  Stan Smith 2015-07-14 refactored to eliminate namespace globals $WriterNS and $IsoNS
+#  Stan Smith 2015-07-14 refactored to make iso19110 independent of iso19115_2 classes
+#  Stan Smith 2015-06-22 replace global ($response) with passed in object (hResponseObj)
+#  Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
+#  Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
+#  Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
+# 	Stan Smith 2013-11-22 original script.
+
+require 'adiwg/mdtranslator/internal/module_codelistFun'
+require_relative '../iso19115_3_writer'
+require_relative 'class_codelist'
+require_relative 'class_enumerationList'
+require_relative 'class_onlineResource'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Iso19115_3
+
+            class MD_MetadataExtensionInformation
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_3
+               end
+
+               def writeXML(hExtension)
+
+                  # classes used
+                  codelistClass = MD_Codelist.new(@xml, @hResponseObj)
+                  olResClass = CI_OnlineResource.new(@xml, @hResponseObj)
+
+                  outContext = 'extension information'
+                  outContext = 'extension name ' + hExtension[:name] unless hExtension[:name].nil?
+
+                  @xml.tag!('gmd:MD_MetadataExtensionInformation') do
+
+                     # metadata extension - online resource {CI_OnLineResource}
+                     hOLResource = hExtension[:onLineResource]
+                     unless hOLResource.empty?
+                        @xml.tag!('gmd:extensionOnLineResource') do
+                           olResClass.writeXML(hOLResource, outContext)
+                        end
+                     end
+                     if hOLResource.empty? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('gmd:extensionOnLineResource')
+                     end
+
+                     # metadata extension = extended element information
+                     @xml.tag!('gmd:extendedElementInformation') do
+                        @xml.tag!('gmd:MD_ExtendedElementInformation') do
+
+                           # extended element info - name (required)
+                           s = hExtension[:name]
+                           unless s.nil?
+                              @xml.tag!('gmd:name') do
+                                 @xml.tag!('gco:CharacterString', s)
+                              end
+                           end
+                           if s.nil?
+                              @NameSpace.issueWarning(100, 'gmd:name')
+                           end
+
+                           # extended element info - short name
+                           s = hExtension[:shortName]
+                           unless s.nil?
+                              @xml.tag!('gmd:shortName') do
+                                 @xml.tag!('gco:CharacterString', s)
+                              end
+                           end
+                           if s.nil? && @hResponseObj[:writerShowTags]
+                              @xml.tag!('gmd:shortName')
+                           end
+
+                           # extended element info - definition (required)
+                           s = hExtension[:definition]
+                           unless s.nil?
+                              @xml.tag!('gmd:definition') do
+                                 @xml.tag!('gco:CharacterString', s)
+                              end
+                           end
+                           if s.nil?
+                              @NameSpace.issueWarning(101, 'gmd:definition', outContext)
+                           end
+
+                           # extended element info - obligation {MD_ObligationCode}
+                           obligation = hExtension[:obligation]
+                           unless obligation.nil?
+                              if CodelistFun.validateItem('iso_obligation', obligation)
+                                 @xml.tag!('gmd:obligation') do
+                                    @xml.tag!('gmd:MD_ObligationCode', obligation)
+                                 end
+                              else
+                                 @NameSpace.issueWarning(380, 'gmd:obligation', "#{obligation}")
+                              end
+                           end
+                           if obligation.nil? && @hResponseObj[:writerShowTags]
+                              @xml.tag!('gmd:obligation')
+                           end
+
+                           # extended element info - data type (required)
+                           s = hExtension[:dataType]
+                           unless s.nil?
+                              @xml.tag!('gmd:dataType') do
+                                 codelistClass.writeXML('gmd', 'iso_entityClass', s)
+                              end
+                           end
+                           if s.nil?
+                              @NameSpace.issueWarning(102, 'gmd:dataType', outContext)
+                           end
+
+                           # extended element info - maximum occurrence
+                           s = hExtension[:maxOccurrence]
+                           unless s.nil?
+                              @xml.tag!('gmd:maximumOccurrence') do
+                                 @xml.tag!('gco:CharacterString', s)
+                              end
+                           end
+                           if s.nil? && @hResponseObj[:writerShowTags]
+                              @xml.tag!('gmd:maximumOccurrence')
+                           end
+
+                           # extended element info - parent entity [] (required)
+                           aParents = hExtension[:parentEntities]
+                           aParents.each do |parent|
+                              @xml.tag!('gmd:parentEntity') do
+                                 @xml.tag!('gco:CharacterString', parent)
+                              end
+                           end
+                           if aParents.empty?
+                              @NameSpace.issueWarning(103, 'gmd:parentEntity', outContext)
+                           end
+
+                           # extended element info - rule
+                           s = hExtension[:rule]
+                           unless s.nil?
+                              @xml.tag!('gmd:rule') do
+                                 @xml.tag!('gco:CharacterString', s)
+                              end
+                           end
+                           if s.nil?
+                              @NameSpace.issueWarning(104, 'gmd:rule', outContext)
+                           end
+
+                           # extended element info - rationale []
+                           aRations = hExtension[:rationales]
+                           aRations.each do |ration|
+                              @xml.tag!('gmd:rationale') do
+                                 @xml.tag!('gco:CharacterString', ration)
+                              end
+                           end
+                           if aRations.empty? && @hResponseObj[:writerShowTags]
+                              @xml.tag!('gmd:rationale')
+                           end
+
+                           # extended element info - source [] (required)
+                           # only allowing 1 for now
+                           role = hExtension[:sourceRole]
+                           unless role.nil?
+                              @xml.tag!('gmd:source') do
+                                 @xml.tag!('gmd:CI_ResponsibleParty') do
+                                    orgName = hExtension[:sourceOrganization]
+                                    unless orgName.nil?
+                                       @xml.tag!('gmd:organisationName') do
+                                          @xml.tag!('gco:CharacterString', orgName)
+                                       end
+                                    end
+                                    uri = hExtension[:sourceURI]
+                                    unless uri.nil?
+                                       @xml.tag!('gmd:contactInfo') do
+                                          @xml.tag!('gmd:CI_Contact') do
+                                             @xml.tag!('gmd:onlineResource') do
+                                                @xml.tag!('gmd:CI_OnlineResource') do
+                                                   @xml.tag!('gmd:linkage') do
+                                                      @xml.tag!('gmd:URL', uri)
+                                                   end
+                                                end
+                                             end
+                                          end
+                                       end
+                                    end
+                                    @xml.tag!('gmd:role') do
+                                       codelistClass.writeXML('gmd', 'iso_role', role)
+                                    end
+                                 end
+                              end
+                           end
+                           if role.nil?
+                              @NameSpace.issueWarning(105, 'gmd:source', outContext)
+                           end
+
+                        end # gmd:MD_ExtendedElementInformation tag
+                     end # gmd:extendedElementInformation
+                  end # gmd:MD_MetadataExtensionInformation
+               end # writeXML
+            end # MD_MetadataExtensionInformation class
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_gcoDateTime.rb

@@ -24,7 +24,16 @@ module ADIWG
                   # date - date (required)
                   unless date.nil?
                      case dateRes
-                        when 'Y', 'YM', 'YMD', 'YMDh', 'YMDhm', 'YMDhms'
+                        when 'Y'
+                           dateStr = AdiwgDateTimeFun.stringDateFromDateTime(date, 'Y')
+                           @xml.tag!('gco:Date', dateStr)
+                        when 'YM'
+                           dateStr = AdiwgDateTimeFun.stringDateFromDateTime(date, 'YM')
+                           @xml.tag!('gco:Date', dateStr)
+                        when 'YMD'
+                           dateStr = AdiwgDateTimeFun.stringDateFromDateTime(date, 'YMD')
+                           @xml.tag!('gco:Date', dateStr)
+                        when 'YMDh', 'YMDhm', 'YMDhms'
                            dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(date, 'YMDhms')
                            @xml.tag!('gco:DateTime', dateStr)
                         when 'YMDhZ', 'YMDhmZ', 'YMDhmsZ'

data/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_mdMetadata.rb

@@ -26,6 +26,7 @@ require_relative 'class_maintenance'
 require_relative 'class_spatialRepresentation'
 require_relative 'class_referenceSystem'
 require_relative 'class_featureCatalog'
+require_relative 'class_extension'
 
 module ADIWG
    module Mdtranslator
@@ -62,6 +63,7 @@ module ADIWG
                   representationClass = SpatialRepresentation.new(@xml, @hResponseObj)
                   referenceSystemClass = MD_ReferenceSystem.new(@xml, @hResponseObj)
                   mdCatalogClass = MD_FeatureCatalogue.new(@xml, @hResponseObj)
+                  extensionClass = MD_MetadataExtensionInformation.new(@xml, @hResponseObj)
 
                   # create shortcuts to sections of internal object
                   hMetadata = intObj[:metadata]
@@ -291,6 +293,31 @@ module ADIWG
                         @xml.tag!('mdb:referenceSystemInfo')
                      end
 
+                     taxonomyArray = hResInfo[:taxonomy]
+                     unless taxonomyArray.empty?
+                        # metadata information - metadata extension info
+                        # add biological profile to all metadata records
+                        intBio = intMetadataClass.newMetadataExtension
+                        intBio[:name] = 'Taxonomy System'
+                        intBio[:shortName] = 'TaxonSys'
+                        intBio[:definition] = 'Documentation of taxonomic sources, procedures, and treatments'
+                        intBio[:obligation] = 'optional'
+                        intBio[:dataType] = 'class'
+                        intBio[:maxOccurrence] = '1'
+                        intBio[:parentEntities] << 'MD_Identification'
+                        intBio[:rule] = 'New Metadata section as a class to MD_Identification'
+                        intBio[:rationales] << 'The set of data elements contained within this class element ' +
+                           'represents an attempt to provide better documentation of ' +
+                           'taxonomic sources, procedures, and treatments.'
+                        intBio[:sourceOrganization] = 'National Biological Information Infrastructure'
+                        intBio[:sourceURI] = 'https://www2.usgs.gov/core_science_systems/Access/p1111-1.html'
+                        intBio[:sourceRole] = 'author'
+
+                        @xml.tag!('gmd:metadataExtensionInfo') do
+                           extensionClass.writeXML(intBio)
+                        end
+                     end
+
                      # ###################### Begin Data Identification #####################
 
                      # metadata information - data identification info - required

data/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_timePeriod.rb

@@ -65,9 +65,7 @@ module ADIWG
                      # if empty add indeterminatePosition="unknown"
                      unless hPeriod[:startDateTime].empty?
                         hDateTime = hPeriod[:startDateTime]
-                        dateTime = hDateTime[:dateTime]
-                        timeResolution = hDateTime[:dateResolution]
-                        dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(dateTime, timeResolution)
+                        dateStr = AdiwgDateTimeFun.stringDateTimeFromDateObject(hDateTime)
                         @xml.tag!('gml:beginPosition', dateStr)
                      end
                      if hPeriod[:startDateTime].empty?
@@ -79,9 +77,7 @@ module ADIWG
                      # if empty add indeterminatePosition="unknown"
                      unless hPeriod[:endDateTime].empty?
                         hDateTime = hPeriod[:endDateTime]
-                        dateTime = hDateTime[:dateTime]
-                        timeResolution = hDateTime[:dateResolution]
-                        dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(dateTime, timeResolution)
+                        dateStr = AdiwgDateTimeFun.stringDateTimeFromDateObject(hDateTime)
                         @xml.tag!('gml:endPosition', dateStr)
                      end
                      if hPeriod[:endDateTime].empty?

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_dictionary.rb

@@ -24,6 +24,7 @@ module ADIWG
                def self.build(hDictionary)
 
                   Jbuilder.new do |json|
+                     json.dictionaryId hDictionary[:dictionaryId] unless hDictionary[:dictionaryId].empty?
                      json.citation Citation.build(hDictionary[:citation]) unless hDictionary[:citation].empty?
                      json.description hDictionary[:description]
                      json.subject hDictionary[:subjects] unless hDictionary[:subjects].empty?

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/sbJson/sections/sbJson_citation.rb

@@ -12,15 +12,15 @@ module ADIWG
 
             module Citation
 
-               # build from citation as follows ...
-               # names, [] {citation.responsibleParty[]}
-               # dates(type), [] {citation.dates[]}
-               # title, {citation.title}
-               # uri, [] {citation.onlineResource[]}
                def self.build(hCitation)
 
                   citation = ''
 
+                  if hCitation[:otherDetails].length > 0
+                     citation = hCitation[:otherDetails][0]
+                     return citation
+                  end
+
                   # names
                   aParties = []
                   hCitation[:responsibleParties].each do |hResponsibility|
@@ -45,32 +45,15 @@ module ADIWG
                         unless hContact[:name].nil?
                            sbRole = Codelists.codelist_adiwg2sb('role_adiwg2sb', hParty[:role])
                            sbRole = sbRole.nil? ? hParty[:role] : sbRole
-                           citation += hContact[:name] + '(' + sbRole + '), '
+                           if sbRole.downcase == 'author'
+                              citation += hContact[:name] + ', '
+                           end
                         end
                      end
                   end
 
-                  # dates
-                  hCitation[:dates].each do |hDate|
-                     dateStr = AdiwgDateTimeFun.stringDateFromDateObject(hDate)
-                     dateType = Codelists.codelist_adiwg2sb('date_adiwg2sb', hDate[:dateType])
-                     unless dateType.nil?
-                        citation += dateStr + '(' + dateType + '), '
-                     end
-                  end
-
                   # title
-                  citation += hCitation[:title] + ', '
-
-                  # uri
-                  hCitation[:onlineResources].each do |hOnline|
-                     citation += hOnline[:olResURI] + ', '
-                  end
-
-                  # clean off last comma
-                  if citation.length > 0
-                     citation = citation[0...-2]
-                  end
+                  citation += hCitation[:title]
 
                   citation
 

data/lib/adiwg/mdtranslator/writers/simple_html/sections/html_allocation.rb

@@ -90,7 +90,7 @@ module ADIWG
                   # allocation - online resource [] {onlineResource}
                   hAllocation[:onlineResources].each do |hOnline|
                      @html.div do
-                        @html.div('Online Resource', {'class' => 'h5'})
+                        @html.h5('Online Resource', {'class' => 'h5'})
                         @html.div(:class => 'block') do
                            onlineClass.writeHtml(hOnline)
                         end