adiwg-mdtranslator 2.15.0 → 2.16.1

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_processing.rb

@@ -0,0 +1,104 @@
+# unpack processing
+# Reader - ADIwg JSON to internal data structure
+
+# History:
+#  Stan Smith 2019-09-23 original script
+
+require_relative 'module_identifier'
+require_relative 'module_citation'
+require_relative 'module_algorithm'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module MdJson
+
+            module Processing
+
+               def self.unpack(hProcessing, responseObj, inContext = nil)
+
+                  @MessagePath = ADIWG::Mdtranslator::Readers::MdJson::MdJson
+
+                  # return nil object if input is empty
+                  if hProcessing.empty?
+                     @MessagePath.issueWarning(990, responseObj, inContext)
+                     return nil
+                  end
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intProcessing = intMetadataClass.newProcessing
+
+                  outContext = 'process step report'
+                  outContext = inContext + ' > ' + outContext unless inContext.nil?
+
+                  # processing - identifier {identifier} (required)
+                  if hProcessing.has_key?('identifier')
+                     unless hProcessing['identifier'].empty?
+                        hReturn = Identifier.unpack(hProcessing['identifier'], responseObj, outContext)
+                        unless hReturn.nil?
+                           intProcessing[:identifier] = hReturn
+                        end
+                     end
+                  end
+                  if intProcessing[:identifier].empty?
+                     @MessagePath.issueWarning(991, responseObj, inContext)
+                  end
+
+                  # processing - software reference
+                  if hProcessing.has_key?('softwareReference')
+                     aCitation = hProcessing['softwareReference']
+                     aCitation.each do |item|
+                        hCitation = Citation.unpack(item, responseObj, outContext)
+                        unless hCitation.nil?
+                           intProcessing[:softwareReferences] << hCitation
+                        end
+                     end
+                  end
+
+                  # processing - procedure description
+                  if hProcessing.has_key?('procedureDescription')
+                     unless hProcessing['procedureDescription'] == ''
+                        intProcessing[:procedureDescription] = hProcessing['procedureDescription']
+                     end
+                  end
+
+                  # processing - documentation
+                  if hProcessing.has_key?('documentation')
+                     aCitation = hProcessing['documentation']
+                     aCitation.each do |item|
+                        hCitation = Citation.unpack(item, responseObj, outContext)
+                        unless hCitation.nil?
+                           intProcessing[:documentation] << hCitation
+                        end
+                     end
+                  end
+
+                  # processing - runtime parameters
+                  if hProcessing.has_key?('runtimeParameters')
+                     unless hProcessing['runtimeParameters'] == ''
+                        intProcessing[:runtimeParameters] = hProcessing['runtimeParameters']
+                     end
+                  end
+
+                  # processing - algorithm
+                  if hProcessing.has_key?('algorithm')
+                     aAlgorithm = hProcessing['algorithm']
+                     aAlgorithm.each do |item|
+                        hAlgorithm = Algorithm.unpack(item, responseObj, outContext)
+                        unless hAlgorithm.nil?
+                           intProcessing[:algorithms] << hAlgorithm
+                        end
+                     end
+                  end
+
+                  return intProcessing
+
+               end
+
+            end
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_source.rb

@@ -2,6 +2,7 @@
 # Reader - ADIwg JSON to internal data structure
 
 # History:
+#  Stan Smith 2019-09-22 add LE_Source elements
 #  Stan Smith 2018-06-25 refactored error and warning messaging
 #  Stan Smith 2016-10-17 refactored for mdJson 2.0
 #  Stan Smith 2015-07-14 refactored to remove global namespace constants
@@ -15,6 +16,8 @@ require_relative 'module_processStep'
 require_relative 'module_spatialReference'
 require_relative 'module_scope'
 require_relative 'module_spatialResolution'
+require_relative 'module_identifier'
+require_relative 'module_nominalResolution'
 
 module ADIWG
    module Mdtranslator
@@ -74,7 +77,7 @@ module ADIWG
                      aCitation.each do |item|
                         hCitation = Citation.unpack(item, responseObj, outContext)
                         unless hCitation.nil?
-                           intSource[:metadataCitation] << hCitation
+                           intSource[:metadataCitations] << hCitation
                         end
                      end
                   end
@@ -112,7 +115,7 @@ module ADIWG
                      end
                   end
 
-                  # source - scope {scope}
+                  # source - scope {scope} (required if)
                   if hSource.has_key?('scope')
                      hObject = hSource['scope']
                      unless hObject.empty?
@@ -124,6 +127,28 @@ module ADIWG
                      end
                   end
 
+                  # source - processed level {identifier}
+                  if hSource.has_key?('processedLevel')
+                     hObject = hSource['processedLevel']
+                     unless hObject.empty?
+                        hReturn = Identifier.unpack(hObject, responseObj, outContext)
+                        unless hReturn.nil?
+                           intSource[:processedLevel] = hReturn
+                        end
+                     end
+                  end
+
+                  # source - resolution {nominalResolution}
+                  if hSource.has_key?('resolution')
+                     hObject = hSource['resolution']
+                     unless hObject.empty?
+                        hReturn = NominalResolution.unpack(hObject, responseObj, outContext)
+                        unless hReturn.nil?
+                           intSource[:resolution] = hReturn
+                        end
+                     end
+                  end
+
                   unless haveRequired
                      @MessagePath.issueError(771, responseObj, inContext)
                   end

data/lib/adiwg/mdtranslator/version.rb

@@ -1,6 +1,9 @@
 # adiwg mdTranslator
 
 # version 2 history
+# 2.16.1 2019-09-19 refactor fgdc reader to output FGDC entityAttribute citation title as dictionary citation title
+# 2.16.1 2019-09-18 add applicationProfile and protocolRequest to onlineResource
+# 2.16.0 2019-09-17 add 19110:2005 dictionary support to 19115-1
 # 2.15.0 2019-05-15 added ISO 19115-3(1) writer
 # 2.14.2 2018-11-02 changed keywordType from 'method' to 'methodology' for FGDC reader/writer
 # 2.14.1 2018-10-31 add fix for empty verticalDatum in fgdc and iso 19115_2 writers
@@ -104,7 +107,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.15.0"
+      VERSION = "2.16.1"
    end
 end
 

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

@@ -44,6 +44,13 @@ module ADIWG
                      @html.br
                   end
 
+                  # online resource - application profile
+                  unless hOlRes[:olResApplicationProfile].nil?
+                     @html.em('Application Profile: ')
+                     @html.text!(hOlRes[:olResApplicationProfile])
+                     @html.br
+                  end
+
                   # online resource - protocol
                   unless hOlRes[:olResProtocol].nil?
                      @html.em('Protocol: ')
@@ -51,6 +58,13 @@ module ADIWG
                      @html.br
                   end
 
+                  # online resource - protocol request
+                  unless hOlRes[:olResProtocolRequest].nil?
+                     @html.em('Protocol Request: ')
+                     @html.text!(hOlRes[:olResProtocolRequest])
+                     @html.br
+                  end
+
                end # writeHtml
             end # Html_OnlineResource
 

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

@@ -58,11 +58,11 @@ module ADIWG
                   end
 
                   # source - metadata citation [] {citation}
-                  unless hSource[:metadataCitation].empty?
+                  unless hSource[:metadataCitations].empty?
                      @html.details do
                         @html.summary('Metadata Citations', {'class' => 'h5'})
                         @html.section(:class => 'block') do
-                           hSource[:metadataCitation].each do |hCitation|
+                           hSource[:metadataCitations].each do |hCitation|
                               @html.details do
                                  @html.summary(hCitation[:title], {'class' => 'h5'})
                                  @html.section(:class => 'block') do

data/lib/adiwg/mdtranslator/writers/iso19110/classes/class_fcFeatureCatalogue.rb

@@ -2,6 +2,7 @@
 # writer output in XML
 
 # History:
+#  Stan Smith 2019-09-17 handle namespace setup for dictionary embedded in 19115
 #  Stan Smith 2018-05-03 add variable for changing XSD location
 #  Stan Smith 2018-04-03 refactored error and warning messaging
 #  Stan Smith 2017-01-20 refactored for mdJson/mdTranslator 2.0
@@ -30,14 +31,13 @@ module ADIWG
                   @NameSpace = ADIWG::Mdtranslator::Writers::Iso19110
                end
 
-               def writeXML(intObj)
+               def writeXML(hDictionary, embed)
 
                   # classes used
                   localeClass = PT_Locale.new(@xml, @hResponseObj)
                   rPartyClass = CI_ResponsibleParty.new(@xml, @hResponseObj)
                   featureClass = FC_FeatureType.new(@xml, @hResponseObj)
 
-                  hDictionary = intObj[:dataDictionaries][0]
                   hCitation = hDictionary[:citation]
                   aEntities = hDictionary[:entities]
                   version = @hResponseObj[:translatorVersion]
@@ -57,19 +57,24 @@ module ADIWG
                   remoteSchema = 'ftp://ftp.ncddc.noaa.gov/pub/Metadata/Online_ISO_Training/Intro_to_ISO/schemas/ISObio/gfc/gfc.xsd'
 
                   # FC_FeatureCatalogue
-                  @xml.tag!('gfc:FC_FeatureCatalogue',
-                            {'xmlns:gmi' => 'http://www.isotc211.org/2005/gmi',
-                             'xmlns:gmd' => 'http://www.isotc211.org/2005/gmd',
-                             'xmlns:gco' => 'http://www.isotc211.org/2005/gco',
-                             'xmlns:gml' => 'http://www.opengis.net/gml/3.2',
-                             'xmlns:gsr' => 'http://www.isotc211.org/2005/gsr',
-                             'xmlns:gss' => 'http://www.isotc211.org/2005/gss',
-                             'xmlns:gst' => 'http://www.isotc211.org/2005/gst',
-                             'xmlns:gmx' => 'http://www.isotc211.org/2005/gmx',
-                             'xmlns:gfc' => 'http://www.isotc211.org/2005/gfc',
-                             'xmlns:xlink' => 'http://www.w3.org/1999/xlink',
-                             'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-                             'xsi:schemaLocation' => "http://www.isotc211.org/2005/gfc #{remoteSchema}"}) do
+                  if embed
+                     attributes = {}
+                  else
+                     attributes = {'xmlns:gmi' => 'http://www.isotc211.org/2005/gmi',
+                                   'xmlns:gmd' => 'http://www.isotc211.org/2005/gmd',
+                                   'xmlns:gco' => 'http://www.isotc211.org/2005/gco',
+                                   'xmlns:gml' => 'http://www.opengis.net/gml/3.2',
+                                   'xmlns:gsr' => 'http://www.isotc211.org/2005/gsr',
+                                   'xmlns:gss' => 'http://www.isotc211.org/2005/gss',
+                                   'xmlns:gst' => 'http://www.isotc211.org/2005/gst',
+                                   'xmlns:gmx' => 'http://www.isotc211.org/2005/gmx',
+                                   'xmlns:gfc' => 'http://www.isotc211.org/2005/gfc',
+                                   'xmlns:xlink' => 'http://www.w3.org/1999/xlink',
+                                   'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+                                   'xsi:schemaLocation' => "http://www.isotc211.org/2005/gfc #{remoteSchema}"}
+                  end
+
+                  @xml.tag!('gfc:FC_FeatureCatalogue', attributes) do
 
                      # feature catalogue - name, version, version date are
                      # are taken from citation

data/lib/adiwg/mdtranslator/writers/iso19110/iso19110_writer.rb

@@ -21,7 +21,7 @@ module ADIWG
       module Writers
          module Iso19110
 
-            def self.startWriter(intObj, hResponseObj, whichDict = 0)
+            def self.startWriter(intObj, hResponseObj, whichDict = 0, embed = false)
 
                # load error message array
                file = File.join(File.dirname(__FILE__), 'iso19110_writer_messages_eng') + '.yml'
@@ -41,8 +41,8 @@ module ADIWG
                   issueNotice(111)
                end
 
-               dictionary = intObj[:dataDictionaries][whichDict]
-               @domains = dictionary[:domains]
+               hDictionary = intObj[:dataDictionaries][whichDict]
+               @domains = hDictionary[:domains]
 
                # set the format of the output file based on the writer specified
                hResponseObj[:writerOutputFormat] = 'xml'
@@ -53,7 +53,7 @@ module ADIWG
 
                # start writing the ISO 19110 XML record
                metadataWriter = FC_FeatureCatalogue.new(@xml, hResponseObj)
-               metadata = metadataWriter.writeXML(intObj)
+               metadata = metadataWriter.writeXML(hDictionary, embed)
 
                return metadata
 

data/lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_featureCatalog.rb

@@ -0,0 +1,53 @@
+# ISO <<abstract class>> MD_FeatureCatalogue
+# 19115-1 writer output in XML
+
+# History:
+# 	Stan Smith 2019-08-20 original script.
+
+require_relative '../../iso19110/iso19110_writer'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Iso19115_1
+
+            class MD_FeatureCatalogue
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_1
+               end
+               
+               def writeXML(intObj,whichDict)
+
+                  # set up iso19110 writer namespace
+                  nameSpace19110 = ADIWG::Mdtranslator::Writers::Iso19110
+
+                  # write 19110 record
+                  fcCatalogClass = nameSpace19110.startWriter(intObj, @hResponseObj, whichDict, true)
+
+                  # strip first line
+                  first_line = fcCatalogClass.index("\n")
+                  fcCatalogClass.slice!(0, first_line + 1)
+
+                  outContext = 'feature catalog'
+
+                  unless fcCatalogClass.empty?
+                     @xml.tag!('mrc:MD_FeatureCatalogue') do
+                        @xml.tag!('mrc:featureCatalogue') do
+
+                           # data dictionary
+                           @xml << fcCatalogClass
+
+                        end
+                     end
+                  end
+
+               end # writeXML
+            end # MD_FeatureCatalogue class
+
+         end
+      end
+   end
+end

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

@@ -3,6 +3,7 @@
 
 # History:
 # 	Stan Smith 2019-03-12 original script
+#  Stan Smith 2019-08-22 add support for data dictionary (feature catalogue)
 
 require 'uuidtools'
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
@@ -23,6 +24,7 @@ require_relative 'class_dataIdentification'
 require_relative 'class_maintenance'
 require_relative 'class_spatialRepresentation'
 require_relative 'class_referenceSystem'
+require_relative 'class_featureCatalog'
 
 module ADIWG
    module Mdtranslator
@@ -57,6 +59,7 @@ module ADIWG
                   maintenanceClass = MD_MaintenanceInformation.new(@xml, @hResponseObj)
                   representationClass = SpatialRepresentation.new(@xml, @hResponseObj)
                   referenceSystemClass = MD_ReferenceSystem.new(@xml, @hResponseObj)
+                  mdCatalogClass = MD_FeatureCatalogue.new(@xml, @hResponseObj)
 
                   # create shortcuts to sections of internal object
                   hMetadata = intObj[:metadata]
@@ -64,6 +67,7 @@ module ADIWG
                   hResInfo = hMetadata[:resourceInfo]
                   aDistributions = hMetadata[:distributorInfo]
                   aLineage = hMetadata[:lineageInfo]
+                  aDictionaries = intObj[:dataDictionaries]
                   version = @hResponseObj[:translatorVersion]
 
                   # document head
@@ -116,6 +120,8 @@ module ADIWG
 
                                'xmlns:fcc' => 'http://standards.iso.org/iso/19110/fcc/1.0',
                                'xmlns:gfc' => 'http://standards.iso.org/iso/19110/gfc/1.1',
+                               'xmlns:gmd' => 'http://www.isotc211.org/2005/gmd',
+                               'xmlns:gmx' => 'http://www.isotc211.org/2005/gmx',
 
                                'xsi:schemaLocation' => "http://standards.iso.org/iso/19115/-3/mdt/2.0 #{remoteSchema}"
                             }) do
@@ -296,8 +302,7 @@ module ADIWG
 
                      # ###################### End Data Identification #######################
 
-                     # metadata information - content information []
-                     # FC_FeatureCatalogue not implemented
+                     # metadata information - content information [] {coverage and image description}
                      aCoverages = hResInfo[:coverageDescriptions]
                      aCoverages.each do |hCoverage|
                         unless hCoverage.empty?
@@ -311,7 +316,17 @@ module ADIWG
                            end
                         end
                      end
-                     if aCoverages.empty? && @hResponseObj[:writerShowTags]
+
+                     # metadata information - content information [] {data dictionary}
+                     aDictionaries.each_with_index do |hDictionary, index|
+                        unless hDictionary.empty?
+                           @xml.tag!('mdb:contentInfo') do
+                              mdCatalogClass.writeXML(intObj, index)
+                           end
+                        end
+                     end
+
+                     if aCoverages.empty? && aDictionaries.empty? && @hResponseObj[:writerShowTags]
                         @xml.tag!('mdb:contentInfo')
                      end
 

data/lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_onlineResource.rb

@@ -2,6 +2,7 @@
 # 19115-1 writer output in XML
 
 # History:
+#  Stan Smith 2019-09-18 add protocolRequest and applicationProfile
 # 	Stan Smith 2019-03-14 original script.
 
 require_relative '../iso19115_1_writer'
@@ -47,7 +48,15 @@ module ADIWG
                         @xml.tag!('cit:protocol')
                      end
 
-                     # online resource - application profile - not implemented
+                     # online resource - application profile
+                     unless hOlResource[:olResApplicationProfile].nil?
+                        @xml.tag!('cit:applicationProfile') do
+                           @xml.tag!('gco:CharacterString', hOlResource[:olResApplicationProfile])
+                        end
+                     end
+                     if hOlResource[:olResApplicationProfile].nil? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('cit:applicationProfile')
+                     end
 
                      # online resource - link name
                      unless hOlResource[:olResName].nil?
@@ -79,7 +88,15 @@ module ADIWG
                         @xml.tag!('cit:function')
                      end
 
-                     # online resource - protocol request - not implemented
+                     # online resource - protocol request
+                     unless hOlResource[:olResProtocolRequest].nil?
+                        @xml.tag!('cit:protocolRequest') do
+                           @xml.tag!('gco:CharacterString', hOlResource[:olResProtocolRequest])
+                        end
+                     end
+                     if hOlResource[:olResProtocolRequest].nil? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('cit:protocolRequest')
+                     end
 
                   end # CI_OnlineResource tag
                end # write XML