adiwg-mdtranslator 2.12.0 → 2.13.0

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

@@ -2,83 +2,83 @@
 # 19115-2 writer output in XML
 
 # History:
-#   Stan Smith 2016-12-05 original script
+#  Stan Smith 2016-12-05 original script
 
 require 'adiwg/mdtranslator/internal/module_coordinates'
 require_relative 'class_point'
 require_relative 'class_featureProperties'
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso19115_2
-
-                class MultiPoint
-
-                    def initialize(xml, hResponseObj)
-                        @xml = xml
-                        @hResponseObj = hResponseObj
-                    end
-
-                    def writeXML(hGeoObject, hProperties, objId)
-
-                        # classes used
-                        geoPropClass = FeatureProperties.new(@xml, @hResponseObj)
-
-                        # classes used
-                        pointClass = Point.new(@xml, @hResponseObj)
-
-                        # multiPoint attributes
-                        attributes = {}
-
-                        # multiPoint attributes - gml:id (required)
-                        if objId.nil?
-                            @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
-                            objId = 'multiPoint' + @hResponseObj[:writerMissingIdCount]
-                        else
-                            objId.gsub!(/[^0-9a-zA-Z]/,'')
+   module Mdtranslator
+      module Writers
+         module Iso19115_2
+
+            class MultiPoint
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+               end
+
+               def writeXML(hGeoObject, hProperties, objId)
+
+                  # classes used
+                  geoPropClass = FeatureProperties.new(@xml, @hResponseObj)
+
+                  # classes used
+                  pointClass = Point.new(@xml, @hResponseObj)
+
+                  # multiPoint attributes
+                  attributes = {}
+
+                  # multiPoint attributes - gml:id (required)
+                  if objId.nil?
+                     @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
+                     objId = 'multiPoint' + @hResponseObj[:writerMissingIdCount]
+                  else
+                     objId.gsub!(/[^0-9a-zA-Z]/, '')
+                  end
+                  attributes['gml:id'] = objId
+
+                  # multiPoint attributes - srsDimension
+                  s = AdiwgCoordinates.getDimension(hGeoObject[:coordinates])
+                  if !s.nil?
+                     attributes[:srsDimension] = s
+                  end
+
+                  # multiPoint attributes - srsName (GeoJSON is WGS84)
+                  attributes[:srsName] = 'WGS84'
+
+                  @xml.tag!('gml:MultiPoint', attributes) do
+
+                     # multipoint - 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
+
+                     # multipoint - point members (required)
+                     @xml.tag!('gml:pointMembers') do
+                        unless hGeoObject[:coordinates].empty?
+                           aPoints = hGeoObject[:coordinates]
+                           aPoints.each do |aPoint|
+                              newPoint = {}
+                              newPoint[:type] = 'Point'
+                              newPoint[:coordinates] = aPoint
+                              pointClass.writeXML(newPoint, {}, nil)
+                           end
                         end
-                        attributes['gml:id'] = objId
+                     end
 
-                        # multiPoint attributes - srsDimension
-                        s = AdiwgCoordinates.getDimension(hGeoObject[:coordinates])
-                        if !s.nil?
-                            attributes[:srsDimension] = s
-                        end
+                  end # gml:Point tag
+               end # writeXML
+            end # multiPoint class
 
-                        # multiPoint attributes - srsName (GeoJSON is WGS84)
-                        attributes[:srsName] = 'WGS84'
-
-                        @xml.tag!('gml:MultiPoint', attributes) do
-
-                            # multipoint - 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
-
-                            # multipoint - point members (required)
-                            @xml.tag!('gml:pointMembers') do
-                                unless hGeoObject[:coordinates].empty?
-                                    aPoints = hGeoObject[:coordinates]
-                                    aPoints.each do |aPoint|
-                                        newPoint = {}
-                                        newPoint[:type] = 'Point'
-                                        newPoint[:coordinates] = aPoint
-                                        pointClass.writeXML(newPoint, {}, nil)
-                                    end
-                                end
-                            end
-
-                        end # gml:Point tag
-                    end # writeXML
-                end # multiPoint class
-
-            end
-        end
-    end
+         end
+      end
+   end
 end

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

@@ -2,83 +2,83 @@
 # 19115-2 writer output in XML
 
 # History:
-#   Stan Smith 2016-12-06 original script
+#  Stan Smith 2016-12-06 original script
 
 require 'adiwg/mdtranslator/internal/module_coordinates'
 require_relative 'class_polygon'
 require_relative 'class_featureProperties'
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso19115_2
-
-                class MultiPolygon
-
-                    def initialize(xml, hResponseObj)
-                        @xml = xml
-                        @hResponseObj = hResponseObj
-                    end
-
-                    def writeXML(hGeoObject, hProperties, objId)
-
-                        # classes used
-                        geoPropClass = FeatureProperties.new(@xml, @hResponseObj)
-
-                        # classes used
-                        polyClass = Polygon.new(@xml, @hResponseObj)
-
-                        # multiPolygon attributes
-                        attributes = {}
-
-                        # multiPolygon attributes - gml:id (required)
-                        if objId.nil?
-                            @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
-                            objId = 'multiPolygon' + @hResponseObj[:writerMissingIdCount]
-                        else
-                            objId.gsub!(/[^0-9a-zA-Z]/,'')
+   module Mdtranslator
+      module Writers
+         module Iso19115_2
+
+            class MultiPolygon
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+               end
+
+               def writeXML(hGeoObject, hProperties, objId)
+
+                  # classes used
+                  geoPropClass = FeatureProperties.new(@xml, @hResponseObj)
+
+                  # classes used
+                  polyClass = Polygon.new(@xml, @hResponseObj)
+
+                  # multiPolygon attributes
+                  attributes = {}
+
+                  # multiPolygon attributes - gml:id (required)
+                  if objId.nil?
+                     @hResponseObj[:writerMissingIdCount] = @hResponseObj[:writerMissingIdCount].succ
+                     objId = 'multiPolygon' + @hResponseObj[:writerMissingIdCount]
+                  else
+                     objId.gsub!(/[^0-9a-zA-Z]/, '')
+                  end
+                  attributes['gml:id'] = objId
+
+                  # multiPolygon attributes - srsDimension
+                  s = AdiwgCoordinates.getDimension(hGeoObject[:coordinates])
+                  if !s.nil?
+                     attributes[:srsDimension] = s
+                  end
+
+                  # multiPolygon attributes - srsName (GeoJSON is WGS84)
+                  attributes[:srsName] = 'WGS84'
+
+                  @xml.tag!('gml:MultiGeometry', attributes) do
+
+                     # multiPolygon - 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
+
+                     # multiPolygon - polygon members (required)
+                     @xml.tag!('gml:geometryMembers') do
+                        unless hGeoObject[:coordinates].empty?
+                           aPolys = hGeoObject[:coordinates]
+                           aPolys.each do |aPoly|
+                              newPoly = {}
+                              newPoly[:type] = 'Polygon'
+                              newPoly[:coordinates] = aPoly
+                              polyClass.writeXML(newPoly, {}, nil)
+                           end
                         end
-                        attributes['gml:id'] = objId
+                     end
 
-                        # multiPolygon attributes - srsDimension
-                        s = AdiwgCoordinates.getDimension(hGeoObject[:coordinates])
-                        if !s.nil?
-                            attributes[:srsDimension] = s
-                        end
+                  end # gml:MultiGeometry tag
+               end # writeXML
+            end # MultiPolygon class
 
-                        # multiPolygon attributes - srsName (GeoJSON is WGS84)
-                        attributes[:srsName] = 'WGS84'
-
-                        @xml.tag!('gml:MultiGeometry', attributes) do
-
-                            # multiPolygon - 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
-
-                            # multiPolygon - polygon members (required)
-                            @xml.tag!('gml:geometryMembers') do
-                                unless hGeoObject[:coordinates].empty?
-                                    aPolys = hGeoObject[:coordinates]
-                                    aPolys.each do |aPoly|
-                                        newPoly = {}
-                                        newPoly[:type] = 'Polygon'
-                                        newPoly[:coordinates] = aPoly
-                                        polyClass.writeXML(newPoly, {}, nil)
-                                    end
-                                end
-                            end
-
-                        end # gml:MultiGeometry tag
-                    end # writeXML
-                end # MultiPolygon class
-
-            end
-        end
-    end
+         end
+      end
+   end
 end

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

@@ -2,97 +2,100 @@
 # 19115-2 writer output in XML
 
 # History:
-#   Stan Smith 2016-11-18 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-08-14 added protocol to onlineResource
-#   Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
+#  Stan Smith 2018-04-10 add error and warning messaging
+#  Stan Smith 2016-11-18 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-08-14 added protocol to onlineResource
+#  Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
 # 	Stan Smith 2013-08-14 original script.
 
+require_relative '../iso19115_2_writer'
 require_relative 'class_codelist'
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso19115_2
+   module Mdtranslator
+      module Writers
+         module Iso19115_2
 
-                class CI_OnlineResource
+            class CI_OnlineResource
 
-                    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(hOlResource)
+               def writeXML(hOlResource, inContext = nil)
 
-                        # classes used
-                        codelistClass = MD_Codelist.new(@xml, @hResponseObj)
+                  # classes used
+                  codelistClass = MD_Codelist.new(@xml, @hResponseObj)
 
-                        @xml.tag! 'gmd:CI_OnlineResource' do
+                  @xml.tag! 'gmd:CI_OnlineResource' do
 
-                            # online resource - link - required
-                            s = hOlResource[:olResURI]
-                            unless s.nil?
-                                @xml.tag!('gmd:linkage') do
-                                    @xml.tag!('gmd:URL', s)
-                                end
-                            end
-                            if s.nil?
-                                @xml.tag!('gmd:linkage', {'gco:nilReason' => 'missing'})
-                            end
+                     # online resource - link - required
+                     s = hOlResource[:olResURI]
+                     unless s.nil?
+                        @xml.tag!('gmd:linkage') do
+                           @xml.tag!('gmd:URL', s)
+                        end
+                     end
+                     if s.nil?
+                        @NameSpace.issueWarning(250, 'gmd:linkage', inContext)
+                     end
 
-                            # online resource - protocol
-                            s = hOlResource[:olResProtocol]
-                            unless s.nil?
-                                @xml.tag!('gmd:protocol') do
-                                    @xml.tag!('gco:CharacterString', s)
-                                end
-                            end
-                            if s.nil? && @hResponseObj[:writerShowTags]
-                                @xml.tag!('gmd:protocol')
-                            end
+                     # online resource - protocol
+                     s = hOlResource[:olResProtocol]
+                     unless s.nil?
+                        @xml.tag!('gmd:protocol') do
+                           @xml.tag!('gco:CharacterString', s)
+                        end
+                     end
+                     if s.nil? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('gmd:protocol')
+                     end
 
-                            # online resource - link name
-                            s = hOlResource[:olResName]
-                            unless s.nil?
-                                @xml.tag!('gmd:name') do
-                                    @xml.tag!('gco:CharacterString', s)
-                                end
-                            end
-                            if s.nil? && @hResponseObj[:writerShowTags]
-                                @xml.tag!('gmd:name')
-                            end
+                     # online resource - link name
+                     s = hOlResource[:olResName]
+                     unless s.nil?
+                        @xml.tag!('gmd:name') do
+                           @xml.tag!('gco:CharacterString', s)
+                        end
+                     end
+                     if s.nil? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('gmd:name')
+                     end
 
-                            # online resource - link description
-                            s = hOlResource[:olResDesc]
-                            unless s.nil?
-                                @xml.tag!('gmd:description') do
-                                    @xml.tag!('gco:CharacterString', s)
-                                end
-                            end
-                            if s.nil? && @hResponseObj[:writerShowTags]
-                                @xml.tag!('gmd:description')
-                            end
+                     # online resource - link description
+                     s = hOlResource[:olResDesc]
+                     unless s.nil?
+                        @xml.tag!('gmd:description') do
+                           @xml.tag!('gco:CharacterString', s)
+                        end
+                     end
+                     if s.nil? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('gmd:description')
+                     end
 
-                            # online resource - link function {CI_OnLineFunctionCode}
-                            s = hOlResource[:olResFunction]
-                            unless s.nil?
-                                @xml.tag!('gmd:function') do
-                                    codelistClass.writeXML('gmd', 'iso_onlineFunction',s)
-                                end
-                            end
-                            if s.nil? && @hResponseObj[:writerShowTags]
-                                @xml.tag!('gmd:function')
-                            end
+                     # online resource - link function {CI_OnLineFunctionCode}
+                     s = hOlResource[:olResFunction]
+                     unless s.nil?
+                        @xml.tag!('gmd:function') do
+                           codelistClass.writeXML('gmd', 'iso_onlineFunction', s)
+                        end
+                     end
+                     if s.nil? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('gmd:function')
+                     end
 
-                        end # CI_OnlineResource tag
-                    end # write XML
-                end # CI_OnlineResource class
+                  end # CI_OnlineResource tag
+               end # write XML
+            end # CI_OnlineResource class
 
-            end
-        end
-    end
+         end
+      end
+   end
 end