adiwg-mdtranslator 2.12.0 → 2.13.0

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

@@ -2,6 +2,7 @@
 # 19115-2 writer output in XML
 
 # History:
+#  Stan Smith 2018-04-10 add error and warning messaging
 #  Stan Smith 2017-08-30 added support for step sources
 #  Stan Smith 2016-12-13 refactored for mdTranslator/mdJson 2.0
 #  Stan Smith 2015-07-14 refactored to eliminate namespace globals $WriterNS and $IsoNS
@@ -11,6 +12,7 @@
 #  Stan Smith 2014-07-09 modify require statements to function in RubyGem structure
 # 	Stan Smith 2013-11-20 original script.
 
+require_relative '../iso19115_2_writer'
 require_relative 'class_responsibleParty'
 require_relative 'class_source'
 
@@ -24,6 +26,7 @@ module ADIWG
                def initialize(xml, hResponseObj)
                   @xml = xml
                   @hResponseObj = hResponseObj
+                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_2
                end
 
                def writeXML(hStep)
@@ -32,11 +35,14 @@ module ADIWG
                   partyClass = CI_ResponsibleParty.new(@xml, @hResponseObj)
                   sourceClass = LI_Source.new(@xml, @hResponseObj)
 
+                  outContext = 'process step'
+                  outContext = 'process step ' + hStep[:stepId].to_s unless hStep[:stepId].nil?
+
                   # process step - id
                   attributes = {}
                   s = hStep[:stepId]
                   unless s.nil?
-                     attributes['id' => s]
+                     attributes = { id: s.gsub(/[^0-9A-Za-z]/,'') }
                   end
 
                   @xml.tag!('gmd:LI_ProcessStep', attributes) do
@@ -49,7 +55,7 @@ module ADIWG
                         end
                      end
                      if s.nil?
-                        @xml.tag!('gmd:description', {'gco:nilReason' => 'missing'})
+                        @NameSpace.issueWarning(260, 'gmd:description')
                      end
 
                      # process step - rationale
@@ -90,7 +96,7 @@ module ADIWG
                         aParties = hRParty[:parties]
                         aParties.each do |hParty|
                            @xml.tag!('gmd:processor') do
-                              partyClass.writeXML(role, hParty)
+                              partyClass.writeXML(role, hParty, outContext)
                            end
                         end
                      end

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

@@ -2,72 +2,77 @@
 # 19115-2 writer output in XML
 
 # History:
-#   Stan Smith 2016-11-29 refactored for mdTranslator/mdJson 2.0
+#  Stan Smith 2018-04-17 add error and warning messaging
+#  Stan Smith 2016-11-29 refactored for mdTranslator/mdJson 2.0
 # 	Stan Smith 2015-08-27 original script.
 
+require_relative '../iso19115_2_writer'
+
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso19115_2
+   module Mdtranslator
+      module Writers
+         module Iso19115_2
 
-                class MD_RangeDimension
+            class MD_RangeDimension
 
-                    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(hAttribute)
+               def writeXML(hAttribute)
 
-                        # range dimension - sequence identifier {MemberName}
-                        if !hAttribute[:sequenceIdentifier].nil? ||
-                            !hAttribute[:sequenceIdentifierType].nil?
-                            @xml.tag!('gmd:sequenceIdentifier') do
-                                @xml.tag!('gco:MemberName') do
+                  # range dimension - sequence identifier {MemberName}
+                  haveSeqId = false
+                  haveSeqId = true unless hAttribute[:sequenceIdentifier].nil?
+                  haveSeqId = true unless hAttribute[:sequenceIdentifierType].nil?
+                  if haveSeqId
+                     @xml.tag!('gmd:sequenceIdentifier') do
+                        @xml.tag!('gco:MemberName') do
 
-                                    s = hAttribute[:sequenceIdentifier]
-                                    unless s.nil?
-                                        @xml.tag!('gco:aName') do
-                                            @xml.tag!('gco:CharacterString', s)
-                                        end
-                                    end
-                                    if s.nil? && @hResponseObj[:writerShowTags]
-                                        @xml.tag!('gco:aName')
-                                    end
+                           unless hAttribute[:sequenceIdentifier].nil?
+                              @xml.tag!('gco:aName') do
+                                 @xml.tag!('gco:CharacterString', hAttribute[:sequenceIdentifier])
+                              end
+                           end
+                           if hAttribute[:sequenceIdentifier].nil?
+                              @NameSpace.issueWarning(350, 'gco:aName', 'coverage description attribute')
+                           end
 
-                                    s = hAttribute[:sequenceIdentifierType]
-                                    unless s.nil?
-                                        @xml.tag!('gco:attributeType') do
-                                            @xml.tag!('gco:TypeName') do
-                                                @xml.tag!('gco:aName') do
-                                                    @xml.tag!('gco:CharacterString', s)
-                                                end
-                                            end
-                                        end
-                                    end
-                                    if s.nil? && @hResponseObj[:writerShowTags]
-                                        @xml.tag!('gco:attributeType')
+                           unless hAttribute[:sequenceIdentifierType].nil?
+                              @xml.tag!('gco:attributeType') do
+                                 @xml.tag!('gco:TypeName') do
+                                    @xml.tag!('gco:aName') do
+                                       @xml.tag!('gco:CharacterString', hAttribute[:sequenceIdentifierType])
                                     end
-
-                                end
-                            end
+                                 end
+                              end
+                           end
+                           if hAttribute[:sequenceIdentifierType].nil?
+                              @NameSpace.issueWarning(351, 'gco:aName', 'coverage description attribute')
+                           end
                         end
+                     end
+                  end
+                  if !haveSeqId && @hResponseObj[:writerShowTags]
+                     @xml.tag!('gmd:sequenceIdentifier')
+                  end
 
-                        # range dimension - descriptor
-                        s = hAttribute[:attributeDescription]
-                        unless s.nil?
-                            @xml.tag!('gmd:descriptor') do
-                                @xml.tag!('gco:CharacterString', s)
-                            end
-                        end
-                        if s.nil? && @hResponseObj[:writerShowTags]
-                            @xml.tag!('gmd:descriptor')
-                        end
+                  # range dimension - descriptor
+                  unless hAttribute[:attributeDescription].nil?
+                     @xml.tag!('gmd:descriptor') do
+                        @xml.tag!('gco:CharacterString', hAttribute[:attributeDescription])
+                     end
+                  end
+                  if hAttribute[:attributeDescription].nil? && @hResponseObj[:writerShowTags]
+                     @xml.tag!('gmd:descriptor')
+                  end
 
-                    end # writeXML
-                end # MD_RangeDescription attributes
+               end # writeXML
+            end # MD_RangeDescription attributes
 
-            end
-        end
-    end
+         end
+      end
+   end
 end

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

@@ -45,7 +45,7 @@ module ADIWG
                      hIdentifier = hSystem[:systemIdentifier]
                      unless hIdentifier.empty?
                         @xml.tag!('gmd:referenceSystemIdentifier') do
-                           idClass.writeXML(hIdentifier)
+                           idClass.writeXML(hIdentifier, 'spatial reference system')
                         end
                      end
                      if hIdentifier.empty? && @hResponseObj[:writerShowTags]

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

@@ -2,61 +2,61 @@
 # 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 (hResponseObj)
-#   Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
+#  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 (hResponseObj)
+#  Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
 # 	Stan Smith 2013-11-19 original script
 
 require_relative 'class_measure'
 require_relative 'class_fraction'
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso19115_2
-
-                class MD_Resolution
-
-                    def initialize(xml, hResponseObj)
-                        @xml = xml
-                        @hResponseObj = hResponseObj
-                    end
-
-                    def writeXML(hResolution)
-
-                        # classes used
-                        measureClass = Measure.new(@xml, @hResponseObj)
-                        fractionClass = MD_RepresentativeFraction.new(@xml, @hResponseObj)
-
-                        # spatial resolution - equivalent scale
-                        unless hResolution[:scaleFactor].nil?
-                            @xml.tag!('gmd:MD_Resolution') do
-                                @xml.tag!('gmd:equivalentScale') do
-                                    fractionClass.writeXML(hResolution[:scaleFactor])
-                                end
-                            end
-                        end
+   module Mdtranslator
+      module Writers
+         module Iso19115_2
+
+            class MD_Resolution
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+               end
 
-                        # spatial resolution - distance (only if type='distance')
-                        unless hResolution[:measure].nil?
-                            hMeasure = hResolution[:measure]
-                            unless hMeasure.empty?
-                                if hMeasure[:type] == 'distance'
-                                    @xml.tag!('gmd:MD_Resolution') do
-                                        @xml.tag!('gmd:distance') do
-                                            measureClass.writeXML(hMeasure)
-                                        end
-                                    end
-                                end
-                            end
+               def writeXML(hResolution)
+
+                  # classes used
+                  measureClass = Measure.new(@xml, @hResponseObj)
+                  fractionClass = MD_RepresentativeFraction.new(@xml, @hResponseObj)
+
+                  # spatial resolution - equivalent scale
+                  unless hResolution[:scaleFactor].nil?
+                     @xml.tag!('gmd:MD_Resolution') do
+                        @xml.tag!('gmd:equivalentScale') do
+                           fractionClass.writeXML(hResolution[:scaleFactor])
+                        end
+                     end
+                  end
+
+                  # spatial resolution - distance (only if type='distance')
+                  unless hResolution[:measure].nil?
+                     hMeasure = hResolution[:measure]
+                     unless hMeasure.empty?
+                        if hMeasure[:type] == 'distance'
+                           @xml.tag!('gmd:MD_Resolution') do
+                              @xml.tag!('gmd:distance') do
+                                 measureClass.writeXML(hMeasure)
+                              end
+                           end
                         end
+                     end
+                  end
 
-                    end # writeXML
-                end # Measure class
+               end # writeXML
+            end # Measure class
 
-            end
-        end
-    end
+         end
+      end
+   end
 end

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

@@ -2,115 +2,121 @@
 # 19115-2 writer output in XML
 
 # History:
-#   Stan Smith 2016-11-17 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 (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 2014-05-14 modified for JSON schema 0.4.0
+#  Stan Smith 2018-04-10 add error and warning messaging
+#  Stan Smith 2016-11-17 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 (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 2014-05-14 modified for JSON schema 0.4.0
 # 	Stan Smith 2013-08-13 original script.
 
+require_relative '../iso19115_2_writer'
 require_relative 'class_codelist'
 require_relative 'class_contact'
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso19115_2
-
-                class CI_ResponsibleParty
-
-                    def initialize(xml, hResponseObj)
-                        @xml = xml
-                        @hResponseObj = hResponseObj
-                    end
-
-                    def writeXML(role, hParty)
-
-                        # classes used
-                        codelistClass = MD_Codelist.new(@xml, @hResponseObj)
-                        contactClass = CI_Contact.new(@xml, @hResponseObj)
-
-                        contactId = hParty[:contactId]
-                        hContact = ADIWG::Mdtranslator::Writers::Iso19115_2.getContact(contactId)
-                        unless hContact.empty?
-                            isOrg = hContact[:isOrganization]
-                            @xml.tag!('gmd:CI_ResponsibleParty') do
-
-                                # responsible party
-                                if isOrg
-
-                                    # organization name
-                                    s = hContact[:name]
-                                    unless s.nil?
-                                        @xml.tag!('gmd:organisationName') do
-                                            @xml.tag!('gco:CharacterString', s)
-                                        end
-                                    end
-                                    if s.nil? && @hResponseObj[:writerShowTags]
-                                        @xml.tag!('gmd:organisationName')
-                                    end
-
-                                else
-
-                                    # individual name
-                                    s = hContact[:name]
-                                    unless s.nil?
-                                        @xml.tag!('gmd:individualName') do
-                                            @xml.tag!('gco:CharacterString', s)
-                                        end
-                                    end
-                                    if s.nil? && @hResponseObj[:writerShowTags]
-                                        @xml.tag!('gmd:individualName')
-                                    end
-
-                                    # position name
-                                    s = hContact[:positionName]
-                                    unless s.nil?
-                                        @xml.tag!('gmd:positionName') do
-                                            @xml.tag!('gco:CharacterString', s)
-                                        end
-                                    end
-                                    if s.nil? && @hResponseObj[:writerShowTags]
-                                        @xml.tag!('gmd:positionName')
-                                    end
-
-                                end
-
-                                # responsible party - contact info
-                                if !hContact[:phones].empty? ||
-                                    !hContact[:addresses].empty? ||
-                                    !hContact[:eMailList].empty? ||
-                                    !hContact[:onlineResources].empty? ||
-                                    !hContact[:hoursOfService].empty? ||
-                                    !hContact[:contactInstructions].nil?
-
-                                    @xml.tag!('gmd:contactInfo') do
-                                        contactClass.writeXML(hContact)
-                                    end
-                                elsif @hResponseObj[:writerShowTags]
-                                    @xml.tag!('gmd:contactInfo')
-                                end
-
-                                # responsible party - role (required)
-                                s = role
-                                unless s.nil?
-                                    @xml.tag! 'gmd:role' do
-                                        codelistClass.writeXML('gmd', 'iso_role', s)
-                                    end
-                                end
-                                if s.nil?
-                                    @xml.tag!('gmd:role', {'gco:nilReason' => 'missing'})
-                                end
-
-                            end# CI_ResponsibleParty tag
-                        end # valid contact returned
-                    end # write XML
-                end # CI_ResponsibleParty class
-
-            end
-        end
-    end
+   module Mdtranslator
+      module Writers
+         module Iso19115_2
+
+            class CI_ResponsibleParty
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_2
+               end
+
+               def writeXML(role, hParty, inContext = nil)
+
+                  # classes used
+                  codelistClass = MD_Codelist.new(@xml, @hResponseObj)
+                  contactClass = CI_Contact.new(@xml, @hResponseObj)
+
+                  outContext = 'responsible party'
+                  outContext = inContext + ' responsible party' unless inContext.nil?
+
+                  contactId = hParty[:contactId]
+                  hContact = ADIWG::Mdtranslator::Writers::Iso19115_2.getContact(contactId)
+                  unless hContact.empty?
+                     isOrg = hContact[:isOrganization]
+                     @xml.tag!('gmd:CI_ResponsibleParty') do
+
+                        # responsible party
+                        if isOrg
+
+                           # organization name
+                           s = hContact[:name]
+                           unless s.nil?
+                              @xml.tag!('gmd:organisationName') do
+                                 @xml.tag!('gco:CharacterString', s)
+                              end
+                           end
+                           if s.nil? && @hResponseObj[:writerShowTags]
+                              @xml.tag!('gmd:organisationName')
+                           end
+
+                        else
+
+                           # individual name
+                           s = hContact[:name]
+                           unless s.nil?
+                              @xml.tag!('gmd:individualName') do
+                                 @xml.tag!('gco:CharacterString', s)
+                              end
+                           end
+                           if s.nil? && @hResponseObj[:writerShowTags]
+                              @xml.tag!('gmd:individualName')
+                           end
+
+                           # position name
+                           s = hContact[:positionName]
+                           unless s.nil?
+                              @xml.tag!('gmd:positionName') do
+                                 @xml.tag!('gco:CharacterString', s)
+                              end
+                           end
+                           if s.nil? && @hResponseObj[:writerShowTags]
+                              @xml.tag!('gmd:positionName')
+                           end
+
+                        end
+
+                        # responsible party - contact info
+                        if !hContact[:phones].empty? ||
+                           !hContact[:addresses].empty? ||
+                           !hContact[:eMailList].empty? ||
+                           !hContact[:onlineResources].empty? ||
+                           !hContact[:hoursOfService].empty? ||
+                           !hContact[:contactInstructions].nil?
+
+                           @xml.tag!('gmd:contactInfo') do
+                              contactClass.writeXML(hContact)
+                           end
+                        elsif @hResponseObj[:writerShowTags]
+                           @xml.tag!('gmd:contactInfo')
+                        end
+
+                        # responsible party - role (required)
+                        s = role
+                        unless s.nil?
+                           @xml.tag! 'gmd:role' do
+                              codelistClass.writeXML('gmd', 'iso_role', s)
+                           end
+                        end
+                        if s.nil?
+                           @NameSpace.issueWarning(270, 'gmd:role', inContext)
+                        end
+
+                     end # CI_ResponsibleParty tag
+                  end # valid contact returned
+               end # write XML
+            end # CI_ResponsibleParty class
+
+         end
+      end
+   end
 end