adiwg-mdtranslator 2.12.0 → 2.13.0

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_conventionalUnit.rb

@@ -5,60 +5,60 @@
 # 	Stan Smith 2015-08-27 copied from 19110 writer
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso19115_2
+   module Mdtranslator
+      module Writers
+         module Iso19115_2
 
-                class ConventionalUnit
+            class ConventionalUnit
 
-                    def initialize(xml, hResponseObj)
-                        @xml = xml
-                        @hResponseObj = hResponseObj
-                    end
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+               end
 
-                    def writeXML(hConv)
+               def writeXML(hConv)
 
-                        # create and identity for the unit
-                        @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
-                        unitID = 'unit' + @hResponseObj[:writerMissingIdCount]
+                  # create and identity for the unit
+                  @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
+                  unitID = 'unit' + @hResponseObj[:writerMissingIdCount]
 
-                        @xml.tag!('gml:ConventionalUnit', {'gml:id' => unitID}) do
-                            @xml.tag!('gml:identifier', {'codeSpace' => hConv[:codeSpace]}, hConv[:identifier])
-                            @xml.tag!('gml:name', hConv[:name])
-                            @xml.tag!('gml:catalogSymbol', hConv[:catalogSymbol])
-                            @xml.tag!('gml:conversionToPreferredUnit', {'uom' => hConv[:preferredUnit]}) do
+                  @xml.tag!('gml:ConventionalUnit', {'gml:id' => unitID}) do
+                     @xml.tag!('gml:identifier', {'codeSpace' => hConv[:codeSpace]}, hConv[:identifier])
+                     @xml.tag!('gml:name', hConv[:name])
+                     @xml.tag!('gml:catalogSymbol', hConv[:catalogSymbol])
+                     @xml.tag!('gml:conversionToPreferredUnit', {'uom' => hConv[:preferredUnit]}) do
 
-                                # two methods of conversion are available
-                                # factor and formula
-                                if !hConv[:factor].nil?
-                                    # factor:
-                                    #    y = factor * x
-                                    #    y is in preferred units
-                                    #    x is in provided units
-                                    #    factor is conversion to preferred units
-                                    @xml.tag!('gml:factor', hConv[:factor])
-                                else
-                                    # formula:
-                                    #    y = (a + bx) / (c + dx)
-                                    #    y is in preferred units
-                                    #    x is in provided units
-                                    #    a,b,c,d are constants to convert to preferred units
-                                    @xml.tag!('gml:formula') do
-                                        @xml.tag!('gml:a', hConv[:a])
-                                        @xml.tag!('gml:b', hConv[:b])
-                                        @xml.tag!('gml:c', hConv[:c])
-                                        @xml.tag!('gml:d', hConv[:d])
-                                    end
-                                end
-
-                            end
+                        # two methods of conversion are available
+                        # factor and formula
+                        if !hConv[:factor].nil?
+                           # factor:
+                           #    y = factor * x
+                           #    y is in preferred units
+                           #    x is in provided units
+                           #    factor is conversion to preferred units
+                           @xml.tag!('gml:factor', hConv[:factor])
+                        else
+                           # formula:
+                           #    y = (a + bx) / (c + dx)
+                           #    y is in preferred units
+                           #    x is in provided units
+                           #    a,b,c,d are constants to convert to preferred units
+                           @xml.tag!('gml:formula') do
+                              @xml.tag!('gml:a', hConv[:a])
+                              @xml.tag!('gml:b', hConv[:b])
+                              @xml.tag!('gml:c', hConv[:c])
+                              @xml.tag!('gml:d', hConv[:d])
+                           end
                         end
 
-                    end
+                     end
+                  end
 
-                end
+               end
 
             end
-        end
-    end
+
+         end
+      end
+   end
 end

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_coverageDescription.rb

@@ -2,98 +2,125 @@
 # 19115-2 writer output in XML
 
 # History:
-#   Stan Smith 2016-11-23 refactored for mdTranslator/mdJson 2.0
+#  Stan Smith 2018-04-09 add error and warning messaging
+#  Stan Smith 2016-11-23 refactored for mdTranslator/mdJson 2.0
 # 	Stan Smith 2015-08-27 original script.
 
+require_relative '../iso19115_2_writer'
 require_relative 'class_codelist'
-require_relative 'class_attributeGroup'
+require_relative 'class_attribute'
 require_relative 'class_image'
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso19115_2
+   module Mdtranslator
+      module Writers
+         module Iso19115_2
 
-                class CoverageDescription
+            class CoverageDescription
 
-                    def initialize(xml, hResponseObj)
-                        @xml = xml
-                        @hResponseObj = hResponseObj
-                    end
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_2
+               end
+               
+               def writeXML(hCoverage)
 
-                    def writeXML(hCoverage)
+                  # classes used
+                  codelistClass = MD_Codelist.new(@xml, @hResponseObj)
+                  attributeClass = Attribute.new(@xml, @hResponseObj)
+                  imageClass = MI_ImageDescription.new(@xml, @hResponseObj)
 
-                        # classes used
-                        codelistClass = MD_Codelist.new(@xml, @hResponseObj)
-                        attGroupClass = AttributeGroup.new(@xml, @hResponseObj)
-                        imageClass = MI_ImageDescription.new(@xml, @hResponseObj)
+                  # determine type of MD_CoverageDescription to write
+                  if hCoverage[:imageDescription].empty?
+                     contentTag = 'gmi:MI_CoverageDescription'
+                  else
+                     contentTag = 'gmi:MI_ImageDescription'
+                  end
 
-                        # determine type of MD_CoverageDescription to write
-                        if hCoverage[:imageDescription].empty?
-                            contentTag = 'gmi:MI_CoverageDescription'
-                        else
-                            contentTag = 'gmi:MI_ImageDescription'
-                        end
-
-                        @xml.tag!(contentTag) do
+                  @xml.tag!(contentTag) do
 
-                            # coverage description - attribute description (required)
-                            # combine coverageName and coverageDescription
-                            attDesc = ''
-                            unless hCoverage[:coverageName].nil?
-                                attDesc += hCoverage[:coverageName] + '; '
-                            end
-                            unless hCoverage[:coverageDescription].nil?
-                                attDesc += hCoverage[:coverageDescription]
-                            end
-                            unless attDesc == ''
-                                @xml.tag!('gmd:attributeDescription') do
-                                    @xml.tag!('gco:RecordType', attDesc)
-                                end
-                            end
-                            if attDesc == ''
-                                @xml.tag!('gmd:attributeDescription', {'gco:nilReason'=>'missing'})
-                            end
+                     # coverage description - attribute description (required)
+                     # combine coverageName and coverageDescription
+                     attDesc = ''
+                     unless hCoverage[:coverageName].nil?
+                        attDesc += hCoverage[:coverageName] + '; '
+                     end
+                     unless hCoverage[:coverageDescription].nil?
+                        attDesc += hCoverage[:coverageDescription]
+                     end
+                     unless attDesc == ''
+                        @xml.tag!('gmd:attributeDescription') do
+                           @xml.tag!('gco:RecordType', attDesc)
+                        end
+                     end
+                     if attDesc == ''
+                        @NameSpace.issueWarning(40, 'gmd:attributeDescription')
+                     end
 
-                            # coverage description - content type (required) {MD_CoverageContentTypeCode}
-                            aGroups = hCoverage[:attributeGroups]
-                            s = nil
-                            unless aGroups.empty?
-                                s = aGroups[0][:attributeContentTypes][0]
-                                unless s.nil?
-                                    @xml.tag!('gmd:contentType') do
-                                        codelistClass.writeXML('gmd', 'iso_coverageContentType',s)
-                                    end
-                                end
-                            end
-                            if s.nil?
-                                @xml.tag!('gmd:contentType', {'gco:nilReason'=>'missing'})
-                            end
+                     # coverage description - content type (required) {MD_CoverageContentTypeCode}
+                     # coverageContentTypeCode (ISO) = attributeContentType (mdJson)
+                     # in ISO 19115-1 coverageContentTypeCode [] (required) in attributeGroup
+                     # ... coverageContentTypeCode applies only to attributeGroup
+                     # in ISO 19115-2 coverageContentTypeCode (required) in CoverageDescription
+                     # ... contentInfo must be either coverageDescription or imageDescription
+                     # ... coverageContentTypeCode applies to both imageDescription and attribute (rangeDimension)
+                     # mdJson does not require either attributeGroup or imageDescription
+                     # so, coverageContentTypeCode will be missing when content info is imageDescription
+                     # how to handle in ISO 19115-2 ...
+                     # when content info is imageDescription set contentCoverageType to 'image'
+                     # when content info is attributeGroup contentCoverageType will be available
+                     # when content info is not provided set contentType to 'nilReason=missing'
+                     contentType = nil
+                     contentType = 'image' if contentTag == 'gmi:MI_ImageDescription'
+                     if contentTag == 'gmi:MI_CoverageDescription'
+                        aGroups = hCoverage[:attributeGroups]
+                        unless aGroups.empty?
+                           aAttContents = aGroups[0][:attributeContentTypes]
+                           unless aAttContents.empty?
+                              contentType = aAttContents[0]
+                           end
+                        end
+                     end
+                     unless contentType.nil?
+                        @xml.tag!('gmd:contentType') do
+                           codelistClass.writeXML('gmd', 'iso_coverageContentType', contentType)
+                        end
+                     end
+                     if contentType.nil?
+                        @NameSpace.issueWarning(41, 'gmd:contentType')
+                     end
 
-                            # coverage description - dimension []
-                            aGroups.each do |hGroup|
-                                aAttributes = hGroup[:attributes]
-                                aAttributes.each do |hAttributes|
-                                    @xml.tag!('gmd:dimension') do
-                                        attGroupClass.writeXML(hAttributes)
-                                    end
-                                end
-                            end
-                            if aGroups.empty? && @hResponseObj[:writerShowTags]
-                                @xml.tag!('gmd:dimension')
-                            end
+                     # coverage description - dimension []
+                     haveAttribute = false
+                     if contentTag == 'gmi:MI_CoverageDescription'
+                        aGroups.each do |hGroup|
+                           aAttributes = hGroup[:attributes]
+                           aAttributes.each do |hAttribute|
+                              @xml.tag!('gmd:dimension') do
+                                 attributeClass.writeXML(hAttribute)
+                                 haveAttribute = true
+                              end
+                           end
+                        end
+                        if !haveAttribute && @hResponseObj[:writerShowTags]
+                           @xml.tag!('gmd:dimension')
+                        end
+                     end
 
-                            # coverage description - image information
-                            hImage = hCoverage[:imageDescription]
-                            unless hImage.empty?
-                                imageClass.writeXML(hCoverage)
-                            end
+                     # coverage description - image information
+                     if contentTag == 'gmi:MI_ImageDescription'
+                        hImage = hCoverage[:imageDescription]
+                        unless hImage.empty?
+                           imageClass.writeXML(hCoverage)
+                        end
+                     end
 
-                        end # MI_CoverageDescription/MI_ImageDescription tag
-                    end # writeXML
-                end # ContentInformation class
+                  end # MI_CoverageDescription/MI_ImageDescription tag
+               end # writeXML
+            end # ContentInformation class
 
-            end
-        end
-    end
+         end
+      end
+   end
 end

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_crs.rb

@@ -33,7 +33,7 @@ module ADIWG
                      hIdentifier = hParamSet[:projection][:projectionIdentifier]
                      unless hIdentifier.empty?
                         @xml.tag!('gmd:projection') do
-                           idClass.writeXML(hIdentifier)
+                           idClass.writeXML(hIdentifier, 'CRS projection')
                         end
                      end
                   end
@@ -46,7 +46,7 @@ module ADIWG
                      hIdentifier = hParamSet[:geodetic][:ellipsoidIdentifier]
                      unless hIdentifier.empty?
                         @xml.tag!('gmd:ellipsoid') do
-                           idClass.writeXML(hIdentifier)
+                           idClass.writeXML(hIdentifier, 'CRS geodetic ellipsoid')
                         end
                      end
                   end
@@ -60,7 +60,7 @@ module ADIWG
                      hIdentifier = hParamSet[:geodetic][:datumIdentifier]
                      unless hIdentifier.empty?
                         @xml.tag!('gmd:datum') do
-                           idClass.writeXML(hIdentifier)
+                           idClass.writeXML(hIdentifier, 'CRS geodetic datum')
                            haveDatum = true
                         end
                      end
@@ -71,7 +71,7 @@ module ADIWG
                      hIdentifier = hParamSet[:verticalDatum][:datumIdentifier]
                      unless hIdentifier.empty?
                         @xml.tag!('gmd:datum') do
-                           idClass.writeXML(hIdentifier)
+                           idClass.writeXML(hIdentifier, 'CRS vertical datum')
                            haveDatum = true
                         end
                      end

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_dataIdentification.rb

@@ -2,6 +2,7 @@
 # 19115-2 writer output in XML
 
 # History:
+#  Stan Smith 2018-04-09 add error and warning messaging
 #  Stan Smith 2018-04-06 changed taxonomy to an array
 #  Stan Smith 2018-01-05 deprecated topicCategory[]
 #  Stan Smith 2018-01-05 get topics from keywords where type='isoTopicCategory'
@@ -14,7 +15,7 @@
 #  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-12-12 refactored to handle namespacing readers and writers
-#  Stan Smith 2014-10-29 add resource time period as a extent temporal element
+#  Stan Smith 2014-10-29 add resource time period as a temporalExtent element
 #  Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
 #  Stan Smith 2014-05-21 added aggregate information section
 #  Stan Smith 2014-05-15 modify to support JSON schema version 0.4.0
@@ -27,6 +28,8 @@
 # 	Stan Smith 2013-09-18 add descriptive keywords
 # 	Stan Smith 2013-08-26 original script
 
+require 'adiwg/mdtranslator/internal/internal_metadata_obj'
+require_relative '../iso19115_2_writer'
 require_relative 'class_codelist'
 require_relative 'class_enumerationList'
 require_relative 'class_citation'
@@ -54,11 +57,13 @@ module ADIWG
                def initialize(xml, hResponseObj)
                   @xml = xml
                   @hResponseObj = hResponseObj
+                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_2
                end
 
                def writeXML(hData, aAssocRes, aDistInfo)
 
                   # classes used
+                  intMetadataClass = InternalMetadata.new
                   codelistClass = MD_Codelist.new(@xml, @hResponseObj)
                   enumerationClass = MD_EnumerationList.new(@xml, @hResponseObj)
                   citationClass = CI_Citation.new(@xml, @hResponseObj)
@@ -83,11 +88,11 @@ module ADIWG
                      hCitation = hData[:citation]
                      unless hCitation.empty?
                         @xml.tag!('gmd:citation') do
-                           citationClass.writeXML(hCitation)
+                           citationClass.writeXML(hCitation, 'main resource citation')
                         end
                      end
                      if hCitation.empty?
-                        @xml.tag!('gmd:citation', {'gco:nilReason' => 'missing'})
+                        @NameSpace.issueWarning(50, 'gmd:citation')
                      end
 
                      # data identification - abstract (required)
@@ -98,7 +103,7 @@ module ADIWG
                         end
                      end
                      if s.nil?
-                        @xml.tag!('gmd:abstract', {'gco:nilReason' => 'missing'})
+                        @NameSpace.issueWarning(51, 'gmd:abstract')
                      end
 
                      # data identification - purpose
@@ -112,6 +117,16 @@ module ADIWG
                         @xml.tag!('gmd:purpose')
                      end
 
+                     # data identification - time period {timePeriod}
+                     # package as a temporal extent
+                     unless hData[:timePeriod].empty?
+                        hExtent = intMetadataClass.newExtent
+                        hTempExtent = intMetadataClass.newTemporalExtent
+                        hTempExtent[:timePeriod] = hData[:timePeriod]
+                        hExtent[:temporalExtents] << hTempExtent
+                        hData[:extents] << hExtent
+                     end
+
                      # data identification - credit []
                      aCredits = hData[:credits]
                      aCredits.each do |credit|
@@ -141,19 +156,19 @@ module ADIWG
                         aParties = hRParty[:parties]
                         aParties.each do |hParty|
                            @xml.tag!('gmd:pointOfContact') do
-                              rPartyClass.writeXML(role, hParty)
+                              rPartyClass.writeXML(role, hParty, 'data resource point of contact')
                            end
                         end
                      end
                      if aRParties.empty? && @hResponseObj[:writerShowTags]
-                        @xml.tag!('gmd:pointOfContact', {'gco:nilReason' => 'missing'})
+                        @NameSpace.issueWarning(52, 'gmd:pointOfContact')
                      end
 
                      # data identification - resource maintenance []
                      aMaint = hData[:resourceMaintenance]
                      aMaint.each do |hMaint|
                         @xml.tag!('gmd:resourceMaintenance') do
-                           mInfoClass.writeXML(hMaint)
+                           mInfoClass.writeXML(hMaint, 'data resource')
                         end
                      end
                      if aMaint.empty? && @hResponseObj[:writerShowTags]
@@ -164,7 +179,7 @@ module ADIWG
                      aGraphics = hData[:graphicOverviews]
                      aGraphics.each do |hGraphic|
                         @xml.tag!('gmd:graphicOverview') do
-                           bGraphicClass.writeXML(hGraphic)
+                           bGraphicClass.writeXML(hGraphic, 'data resource')
                         end
                      end
                      if aGraphics.empty? && @hResponseObj[:writerShowTags]