adiwg-mdtranslator 2.12.0 → 2.13.0

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

@@ -2,143 +2,143 @@
 # 19115-2 writer output in XML
 
 # History:
-#   Stan Smith 2016-11-27 refactored for mdTranslator/mdJson 2.0
+#  Stan Smith 2016-11-27 refactored for mdTranslator/mdJson 2.0
 # 	Stan Smith 2015-08-27 original script
 
 require_relative 'class_codelist'
 require_relative 'class_rsIdentifier'
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso19115_2
-
-                class MI_ImageDescription
-
-                    def initialize(xml, hResponseObj)
-                        @xml = xml
-                        @hResponseObj = hResponseObj
-                    end
-
-                    def writeXML(hCoverage)
-
-                        # classes used
-                        codelistClass = MD_Codelist.new(@xml, @hResponseObj)
-                        resIdClass = RS_Identifier.new(@xml, @hResponseObj)
-
-                        hImage = hCoverage[:imageDescription]
-
-                        # image description - illumination elevation angle
-                        s = hImage[:illuminationElevationAngle]
-                        unless s.nil?
-                            @xml.tag!('gmd:illuminationElevationAngle') do
-                                @xml.tag!('gco:Real', s)
-                            end
-                        end
-                        if s.nil? && @hResponseObj[:writerShowTags]
-                            @xml.tag!('gmd:illuminationElevationAngle')
-                        end
-
-                        # image description - illumination azimuth angle
-                        s = hImage[:illuminationAzimuthAngle]
-                        unless s.nil?
-                            @xml.tag!('gmd:illuminationAzimuthAngle') do
-                                @xml.tag!('gco:Real', s)
-                            end
-                        end
-                        if s.nil? && @hResponseObj[:writerShowTags]
-                            @xml.tag!('gmd:illuminationAzimuthAngle')
-                        end
-
-                        # image description - image condition {MD_ImageConditionCode}
-                        s = hImage[:imagingCondition]
-                        unless s.nil?
-                            @xml.tag!('gmd:imagingCondition') do
-                                codelistClass.writeXML('gmd', 'iso_imageCondition',s)
-                            end
-                        end
-                        if s.nil? && @hResponseObj[:writerShowTags]
-                            @xml.tag!('gmd:imagingCondition')
-                        end
-
-                        # image description - image quality code {RS_Identifier}
-                        resId = hImage[:imageQualityCode]
-                        unless resId.empty?
-                            @xml.tag!('gmd:imageQualityCode') do
-                                resIdClass.writeXML(resId)
-                            end
-                        end
-                        if resId.empty? && @hResponseObj[:writerShowTags]
-                            @xml.tag!('gmd:imageQualityCode')
-                        end
-
-                        # image description - cloud cover percentage
-                        s = hImage[:cloudCoverPercent]
-                        unless s.nil?
-                            @xml.tag!('gmd:cloudCoverPercentage') do
-                                @xml.tag!('gco:Real', s)
-                            end
-                        end
-                        if s.nil? && @hResponseObj[:writerShowTags]
-                            @xml.tag!('gmd:cloudCoverPercentage')
-                        end
-
-                        # image description - processing level code (from coverageItem) {RS_Identifier}
-                        resId = hCoverage[:processingLevelCode]
-                        unless resId.empty?
-                            @xml.tag!('gmd:processingLevelCode') do
-                                resIdClass.writeXML(resId)
-                            end
-                        end
-                        if resId.empty? && @hResponseObj[:writerShowTags]
-                            @xml.tag!('gmd:processingLevelCode')
-                        end
-
-                        # image description - compression generation quality
-                        s = hImage[:compressionQuantity]
-                        unless s.nil?
-                            @xml.tag!('gmd:compressionGenerationQuantity') do
-                                @xml.tag!('gco:Integer', s)
-                            end
-                        end
-                        if s.nil? && @hResponseObj[:writerShowTags]
-                            @xml.tag!('gmd:compressionGenerationQuantity')
-                        end
-
-                        # image description - triangulation indicator
-                        s = hImage[:triangulationIndicator]
-                        @xml.tag!('gmd:triangulationIndicator') do
-                            @xml.tag!('gco:Boolean', s)
-                        end
-
-                        # image description - radiometric calibration data availability
-                        s = hImage[:radiometricCalibrationAvailable]
-                        @xml.tag!('gmd:radiometricCalibrationDataAvailability') do
-                            @xml.tag!('gco:Boolean', s)
-                        end
-
-                        # image description - camera calibration information availability
-                        s = hImage[:cameraCalibrationAvailable]
-                        @xml.tag!('gmd:cameraCalibrationInformationAvailability') do
-                            @xml.tag!('gco:Boolean', s)
-                        end
-
-                        # image description - film distortion information availability
-                        s = hImage[:filmDistortionAvailable]
-                        @xml.tag!('gmd:filmDistortionInformationAvailability') do
-                            @xml.tag!('gco:Boolean', s)
-                        end
-
-                        # image description - lens distortion information availability
-                        s = hImage[:lensDistortionAvailable]
-                        @xml.tag!('gmd:lensDistortionInformationAvailability') do
-                            @xml.tag!('gco:Boolean', s)
-                        end
-
-                    end
-                end
-
+   module Mdtranslator
+      module Writers
+         module Iso19115_2
+
+            class MI_ImageDescription
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+               end
+
+               def writeXML(hCoverage)
+
+                  # classes used
+                  codelistClass = MD_Codelist.new(@xml, @hResponseObj)
+                  resIdClass = RS_Identifier.new(@xml, @hResponseObj)
+
+                  hImage = hCoverage[:imageDescription]
+
+                  # image description - illumination elevation angle
+                  s = hImage[:illuminationElevationAngle]
+                  unless s.nil?
+                     @xml.tag!('gmd:illuminationElevationAngle') do
+                        @xml.tag!('gco:Real', s)
+                     end
+                  end
+                  if s.nil? && @hResponseObj[:writerShowTags]
+                     @xml.tag!('gmd:illuminationElevationAngle')
+                  end
+
+                  # image description - illumination azimuth angle
+                  s = hImage[:illuminationAzimuthAngle]
+                  unless s.nil?
+                     @xml.tag!('gmd:illuminationAzimuthAngle') do
+                        @xml.tag!('gco:Real', s)
+                     end
+                  end
+                  if s.nil? && @hResponseObj[:writerShowTags]
+                     @xml.tag!('gmd:illuminationAzimuthAngle')
+                  end
+
+                  # image description - image condition {MD_ImageConditionCode}
+                  s = hImage[:imagingCondition]
+                  unless s.nil?
+                     @xml.tag!('gmd:imagingCondition') do
+                        codelistClass.writeXML('gmd', 'iso_imageCondition', s)
+                     end
+                  end
+                  if s.nil? && @hResponseObj[:writerShowTags]
+                     @xml.tag!('gmd:imagingCondition')
+                  end
+
+                  # image description - image quality code {RS_Identifier}
+                  resId = hImage[:imageQualityCode]
+                  unless resId.empty?
+                     @xml.tag!('gmd:imageQualityCode') do
+                        resIdClass.writeXML(resId, 'image quality code')
+                     end
+                  end
+                  if resId.empty? && @hResponseObj[:writerShowTags]
+                     @xml.tag!('gmd:imageQualityCode')
+                  end
+
+                  # image description - cloud cover percentage
+                  s = hImage[:cloudCoverPercent]
+                  unless s.nil?
+                     @xml.tag!('gmd:cloudCoverPercentage') do
+                        @xml.tag!('gco:Real', s)
+                     end
+                  end
+                  if s.nil? && @hResponseObj[:writerShowTags]
+                     @xml.tag!('gmd:cloudCoverPercentage')
+                  end
+
+                  # image description - processing level code (from coverageItem) {RS_Identifier}
+                  resId = hCoverage[:processingLevelCode]
+                  unless resId.empty?
+                     @xml.tag!('gmd:processingLevelCode') do
+                        resIdClass.writeXML(resId, 'image processing level code')
+                     end
+                  end
+                  if resId.empty? && @hResponseObj[:writerShowTags]
+                     @xml.tag!('gmd:processingLevelCode')
+                  end
+
+                  # image description - compression generation quality
+                  s = hImage[:compressionQuantity]
+                  unless s.nil?
+                     @xml.tag!('gmd:compressionGenerationQuantity') do
+                        @xml.tag!('gco:Integer', s)
+                     end
+                  end
+                  if s.nil? && @hResponseObj[:writerShowTags]
+                     @xml.tag!('gmd:compressionGenerationQuantity')
+                  end
+
+                  # image description - triangulation indicator
+                  s = hImage[:triangulationIndicator]
+                  @xml.tag!('gmd:triangulationIndicator') do
+                     @xml.tag!('gco:Boolean', s)
+                  end
+
+                  # image description - radiometric calibration data availability
+                  s = hImage[:radiometricCalibrationAvailable]
+                  @xml.tag!('gmd:radiometricCalibrationDataAvailability') do
+                     @xml.tag!('gco:Boolean', s)
+                  end
+
+                  # image description - camera calibration information availability
+                  s = hImage[:cameraCalibrationAvailable]
+                  @xml.tag!('gmd:cameraCalibrationInformationAvailability') do
+                     @xml.tag!('gco:Boolean', s)
+                  end
+
+                  # image description - film distortion information availability
+                  s = hImage[:filmDistortionAvailable]
+                  @xml.tag!('gmd:filmDistortionInformationAvailability') do
+                     @xml.tag!('gco:Boolean', s)
+                  end
+
+                  # image description - lens distortion information availability
+                  s = hImage[:lensDistortionAvailable]
+                  @xml.tag!('gmd:lensDistortionInformationAvailability') do
+                     @xml.tag!('gco:Boolean', s)
+                  end
+
+               end
             end
-        end
-    end
+
+         end
+      end
+   end
 end

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

@@ -2,6 +2,7 @@
 # 19115-2 writer output in XML
 
 # History:
+#  Stan Smith 2018-04-09 add error and warning messaging
 #  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
@@ -12,6 +13,7 @@
 #  Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
 # 	Stan Smith 2013-09-18 original script
 
+require_relative '../iso19115_2_writer'
 require_relative 'class_codelist'
 require_relative 'class_citation'
 
@@ -25,6 +27,7 @@ module ADIWG
                def initialize(xml, hResponseObj)
                   @xml = xml
                   @hResponseObj = hResponseObj
+                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_2
                end
 
                def writeXML(hKeyword)
@@ -48,7 +51,7 @@ module ADIWG
                         end
                      end
                      if aKeyObjects.empty?
-                        @xml.tag!('gmd:keyword', {'gco:nilReason' => 'missing'})
+                        @NameSpace.issueWarning(200, 'gmd:keyword')
                      end
 
                      # keyword - type {MD_KeywordTypeCode}
@@ -66,7 +69,7 @@ module ADIWG
                      hCitation = hKeyword[:thesaurus]
                      unless hCitation.empty?
                         @xml.tag!('gmd:thesaurusName') do
-                           citationClass.writeXML(hCitation)
+                           citationClass.writeXML(hCitation, 'keyword thesaurus')
                         end
                      end
                      if hCitation.empty? && @hResponseObj[:writerShowTags]

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

@@ -2,83 +2,83 @@
 # 19115-2 writer output in XML
 
 # History:
-#   Stan Smith 2016-12-05 refactored for mdTranslator/mdJson 2.0
-#   Stan Smith 2015-07-16 moved module_coordinates from mdJson reader to internal
-#   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 2014-07-08 modify require statements to function in RubyGem structure
-#   Stan Smith 2014-05-30 modified for version 0.5.0
+#  Stan Smith 2016-12-05 refactored for mdTranslator/mdJson 2.0
+#  Stan Smith 2015-07-16 moved module_coordinates from mdJson reader to internal
+#  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 2014-07-08 modify require statements to function in RubyGem structure
+#  Stan Smith 2014-05-30 modified for version 0.5.0
 # 	Stan Smith 2013-11-13 original script.
 
 require 'adiwg/mdtranslator/internal/module_coordinates'
 require_relative 'class_featureProperties'
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso19115_2
-
-                class LineString
-
-                    def initialize(xml, hResponseObj)
-                        @xml = xml
-                        @hResponseObj = hResponseObj
-                    end
-
-                    def writeXML(hGeoObject, hProperties, lineId)
-
-                        # classes used
-                        geoPropClass = FeatureProperties.new(@xml, @hResponseObj)
-
-                        # LineString attributes
-                        attributes = {}
-
-                        # LineString attributes - gml:id (required)
-                        if lineId.nil?
-                            @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
-                            lineId = 'line' + @hResponseObj[:writerMissingIdCount]
-                        else
-                            lineId.gsub!(/[^0-9a-zA-Z]/,'')
+   module Mdtranslator
+      module Writers
+         module Iso19115_2
+
+            class LineString
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+               end
+
+               def writeXML(hGeoObject, hProperties, lineId)
+
+                  # classes used
+                  geoPropClass = FeatureProperties.new(@xml, @hResponseObj)
+
+                  # LineString attributes
+                  attributes = {}
+
+                  # LineString attributes - gml:id (required)
+                  if lineId.nil?
+                     @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
+                     lineId = 'line' + @hResponseObj[:writerMissingIdCount]
+                  else
+                     lineId.gsub!(/[^0-9a-zA-Z]/, '')
+                  end
+                  attributes['gml:id'] = lineId
+
+                  # LineString attributes - srsDimension
+                  s = AdiwgCoordinates.getDimension(hGeoObject[:coordinates])
+                  if !s.nil?
+                     attributes[:srsDimension] = s
+                  end
+
+                  # LineString attributes - srsName (GeoJSON is WGS84)
+                  attributes[:srsName] = 'WGS84'
+
+                  @xml.tag!('gml:LineString', attributes) do
+
+                     # lineString - properties for Feature
+                     unless hProperties.empty?
+                        geoPropClass.writeXML(hProperties)
+                     end
+                     if hProperties.empty? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('gml:description')
+                        @xml.tag!('gml:identifier', {'codeSpace' => ''})
+                        @xml.tag!('gml:name')
+                     end
+
+                     # lineString - pos (required)
+                     unless hGeoObject[:coordinates].empty?
+                        aCoords = hGeoObject[:coordinates]
+                        aCoords.each do |aCoord|
+                           s = aCoord[0].to_s + ' ' + aCoord[1].to_s
+                           @xml.tag!('gml:pos', s)
                         end
-                        attributes['gml:id'] = lineId
+                     end
 
-                        # LineString attributes - srsDimension
-                        s = AdiwgCoordinates.getDimension(hGeoObject[:coordinates])
-                        if !s.nil?
-                            attributes[:srsDimension] = s
-                        end
+                  end # gml:LineString
+               end # writeXML
+            end # LineString class
 
-                        # LineString attributes - srsName (GeoJSON is WGS84)
-                        attributes[:srsName] = 'WGS84'
-
-                        @xml.tag!('gml:LineString', attributes) do
-
-                            # lineString - properties for Feature
-                            unless hProperties.empty?
-                                geoPropClass.writeXML(hProperties)
-                            end
-                            if hProperties.empty? && @hResponseObj[:writerShowTags]
-                                @xml.tag!('gml:description')
-                                @xml.tag!('gml:identifier', {'codeSpace'=>''})
-                                @xml.tag!('gml:name')
-                            end
-
-                            # lineString - pos (required)
-                            unless hGeoObject[:coordinates].empty?
-                                aCoords = hGeoObject[:coordinates]
-                                aCoords.each do |aCoord|
-                                    s = aCoord[0].to_s + ' ' + aCoord[1].to_s
-                                    @xml.tag!('gml:pos', s)
-                                end
-                            end
-
-                        end # gml:LineString
-                    end # writeXML
-                end # LineString class
-
-            end
-        end
-    end
+         end
+      end
+   end
 end