adiwg-mdtranslator 2.13.3 → 2.14.0

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_planarMap.rb

@@ -2,6 +2,7 @@
 # FGDC CSDGM writer output in XML
 
 # History:
+#  Stan Smith 2018-10-10 refactor mdJson projection object
 #  Stan Smith 2018-03-21 original script
 
 require_relative 'class_mapProjectionTags'
@@ -18,271 +19,258 @@ module ADIWG
                   @hResponseObj = hResponseObj
                end
 
-               def writeXML(hProjection)
+               def writeXML(hProjection, inContext = nil)
 
                   # classes used
                   classTags = MapProjectionTags.new(@xml, @hResponseObj)
 
+                  outContext = 'map projection'
+                  outContext = inContext + ' ' + outContext unless inContext.nil?
+
                   # planar 4.1.2.1 (mapproj) - map projection
                   # <- hProjection.projectionName = oneOf ...
-                  projection = hProjection[:projection]
+                  projection = hProjection[:projectionIdentifier][:identifier]
+                  projectionName = nil
+                  if hProjection.key?(:name)
+                     projectionName = hProjection[:name]
+                  end
                   case projection
                      when 'alaska'
                         @xml.tag!('mapproj') do
-                           projectionName = 'Modified Stereographic for Alaska'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
+                           projectionName = 'Alaska Modified Stereographic' if projectionName.nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('modsak') do
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'albers'
                         @xml.tag!('mapproj') do
                            projectionName = 'Albers Conical Equal Area'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('albers') do
-                              classTags.write_standParallel(hProjection)
-                              classTags.write_longCM(hProjection)
-                              classTags.write_latPO(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_standParallel(hProjection, outContext)
+                              classTags.write_longCM(hProjection, outContext)
+                              classTags.write_latPO(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'azimuthalEquidistant'
                         @xml.tag!('mapproj') do
                            projectionName = 'Azimuthal Equidistant'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('azimequi') do
-                              classTags.write_longCM(hProjection)
-                              classTags.write_latPO(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_longCM(hProjection, outContext)
+                              classTags.write_latPO(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'equidistantConic'
                         @xml.tag!('mapproj') do
                            projectionName = 'Equidistant Conic'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('equicon') do
-                              classTags.write_standParallel(hProjection)
-                              classTags.write_longCM(hProjection)
-                              classTags.write_latPO(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_standParallel(hProjection, outContext)
+                              classTags.write_longCM(hProjection, outContext)
+                              classTags.write_latPO(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'equirectangular'
                         @xml.tag!('mapproj') do
                            projectionName = 'Equirectangular'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('equirect') do
-                              classTags.write_standParallel(hProjection)
-                              classTags.write_longCM(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_standParallel(hProjection, outContext)
+                              classTags.write_longCM(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'generalVertical'
                         @xml.tag!('mapproj') do
                            projectionName = 'General Vertical Near-sided Perspective'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('gvnsp') do
-                              classTags.write_heightPP(hProjection)
-                              classTags.write_longPC(hProjection)
-                              classTags.write_latPC(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_heightPP(hProjection, outContext)
+                              classTags.write_longPC(hProjection, outContext)
+                              classTags.write_latPC(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'gnomonic'
                         @xml.tag!('mapproj') do
                            projectionName = 'Gnomonic'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('gnomonic') do
-                              classTags.write_longPC(hProjection)
-                              classTags.write_latPC(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_longPC(hProjection, outContext)
+                              classTags.write_latPC(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'lambertEqualArea'
                         @xml.tag!('mapproj') do
                            projectionName = 'Lambert Azimuthal Equal Area'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('lamberta') do
-                              classTags.write_longPC(hProjection)
-                              classTags.write_latPC(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_longPC(hProjection, outContext)
+                              classTags.write_latPC(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'lambertConic'
                         @xml.tag!('mapproj') do
                            projectionName = 'Lambert Conformal Conic'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('lambertc') do
-                              classTags.write_standParallel(hProjection)
-                              classTags.write_longCM(hProjection)
-                              classTags.write_latPO(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_standParallel(hProjection, outContext)
+                              classTags.write_longCM(hProjection, outContext)
+                              classTags.write_latPO(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'mercator'
                         @xml.tag!('mapproj') do
                            projectionName = 'Mercator'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('mercator') do
-                              if hProjection[:standardParallel1] || hProjection[:standardParallel2]
-                                 classTags.write_standParallel(hProjection)
-                              elsif hProjection[:scaleFactorAtEquator]
-                                 classTags.write_scaleFactorE(hProjection)
+                              if hProjection[:scaleFactorAtEquator]
+                                 classTags.write_scaleFactorE(hProjection, outContext)
+                              else
+                                 classTags.write_standParallel(hProjection, outContext)
                               end
-                              classTags.write_longCM(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_longCM(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'miller'
                         @xml.tag!('mapproj') do
                            projectionName = 'Miller Cylindrical'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('miller') do
-                              classTags.write_longCM(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_longCM(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'obliqueMercator'
                         @xml.tag!('mapproj') do
                            projectionName = 'Oblique Mercator'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('obqmerc') do
-                              classTags.write_scaleFactorCL(hProjection)
+                              classTags.write_scaleFactorCL(hProjection, outContext)
                               if hProjection[:obliqueLinePoints].empty?
-                                 classTags.write_obliqueLineAzimuth(hProjection)
+                                 classTags.write_obliqueLineAzimuth(hProjection, outContext)
                               else
-                                 @xml.tag!('obqlpt') do
-                                    hProjection[:obliqueLinePoints].each do |hLinePt|
-                                       classTags.write_obliqueLinePoint(hLinePt)
-                                    end
-                                 end
+                                 classTags.write_obliqueLinePoint(hProjection, outContext)
                               end
-                              classTags.write_latPO(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_latPO(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'orthographic'
                         @xml.tag!('mapproj') do
                            projectionName = 'Orthographic'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('orthogr') do
-                              classTags.write_longPC(hProjection)
-                              classTags.write_latPC(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_longPC(hProjection, outContext)
+                              classTags.write_latPC(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'polarStereo'
                         @xml.tag!('mapproj') do
                            projectionName = 'Polar Stereographic'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('polarst') do
-                              classTags.write_straightFromPole(hProjection)
+                              classTags.write_straightFromPole(hProjection, outContext)
                               if hProjection[:standardParallel1] || hProjection[:standardParallel2]
-                                 classTags.write_standParallel(hProjection)
-                              elsif hProjection[:scaleFactorAtProjectionOrigin]
-                                 classTags.write_scaleFactorPO(hProjection)
+                                 classTags.write_standParallel(hProjection, outContext)
+                              else hProjection[:scaleFactorAtProjectionOrigin]
+                                 classTags.write_scaleFactorPO(hProjection, outContext)
                               end
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'polyconic'
                         @xml.tag!('mapproj') do
                            projectionName = 'Polyconic'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('polycon') do
-                              classTags.write_longCM(hProjection)
-                              classTags.write_latPO(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_longCM(hProjection, outContext)
+                              classTags.write_latPO(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'robinson'
                         @xml.tag!('mapproj') do
                            projectionName = 'Robinson'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('robinson') do
-                              classTags.write_longPC(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_longPC(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'sinusoidal'
                         @xml.tag!('mapproj') do
                            projectionName = 'Sinusoidal'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('sinusoid') do
-                              classTags.write_longCM(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_longCM(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'spaceOblique'
                         @xml.tag!('mapproj') do
                            projectionName = 'Space Oblique Mercator'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('spaceobq') do
-                              classTags.write_landsat(hProjection)
-                              classTags.write_landsatPath(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_landsat(hProjection, outContext)
+                              classTags.write_landsatPath(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'stereographic'
                         @xml.tag!('mapproj') do
                            projectionName = 'Stereographic'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('stereo') do
-                              classTags.write_longPC(hProjection)
-                              classTags.write_latPC(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_longPC(hProjection, outContext)
+                              classTags.write_latPC(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'transverseMercator'
                         @xml.tag!('mapproj') do
                            projectionName = 'Transverse Mercator'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('transmer') do
-                              classTags.write_scaleFactorCM(hProjection)
-                              classTags.write_longCM(hProjection)
-                              classTags.write_latPO(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_scaleFactorCM(hProjection, outContext)
+                              classTags.write_longCM(hProjection, outContext)
+                              classTags.write_latPO(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'grinten'
                         @xml.tag!('mapproj') do
                            projectionName = 'Van der Grinten'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('vdgrin') do
-                              classTags.write_longCM(hProjection)
-                              classTags.write_falseNE(hProjection)
+                              classTags.write_longCM(hProjection, outContext)
+                              classTags.write_falseNE(hProjection, outContext)
                            end
                         end
                      when 'parameters'
                         @xml.tag!('mapproj') do
                            projectionName = 'Map Projection Parameters'
-                           hProjection[:projectionName] = projectionName if hProjection[:projectionName].nil?
                            classTags.write_name(projectionName)
                            @xml.tag!('mapprojp') do
-                              classTags.write_allParams(hProjection)
+                              classTags.write_allParams(hProjection, outContext)
                            end
                         end
+                     when 'other'
+                        @xml.tag!('mapproj') do
+                           projectionName = 'Other Projection Description'
+                           classTags.write_name(projectionName)
+                           classTags.write_otherProjection(hProjection, outContext)
+                        end
                   end
 
                end # writeXML

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_planarReference.rb

@@ -2,11 +2,12 @@
 # FGDC CSDGM writer output in XML
 
 # History:
+#  Stan Smith 2018-10-09 refactor mdJson projection object
 #  Stan Smith 2018-03-21 original script
 
 require_relative 'class_planarMap'
 require_relative 'class_planarGrid'
-require_relative 'class_planarLocal'
+require_relative 'class_localPlanar'
 require_relative 'class_planarInfo'
 
 module ADIWG
@@ -21,7 +22,7 @@ module ADIWG
                   @hResponseObj = hResponseObj
                end
 
-               def writeXML(aSpaceRefs, aRepTypes, aResolutions)
+               def writeXML(aSpaceRefs, aRepTypes, aResolutions, inContext = nil)
 
                   # classes used
                   classMap = PlanarMap.new(@xml, @hResponseObj)
@@ -29,58 +30,32 @@ module ADIWG
                   classLocal = PlanarLocal.new(@xml, @hResponseObj)
                   classInfo = PlanarInformation.new(@xml, @hResponseObj)
 
+                  outContext = 'horizontal planar'
+                  outContext = inContext + ' ' + outContext unless inContext.nil?
+
                   # <- planar 4.1.2 ...
                   # <- spatialReferences[].systemParameterSet.projection (map) 4.1.2.1
                   # <- spatialReferences[].systemParameterSet.projection (grid) 4.1.2.2
                   # <- spatialReferences[].systemParameterSet.projection (localPlanar) 4.1.2.3
-                  # <- planar information 4.1.2.4 ...
-
-                  # planar 4.1.2.1 (mapproj) - map projection
                   aSpaceRefs.each do |hSpaceRef|
                      unless hSpaceRef[:systemParameterSet].empty?
-                        if hSpaceRef[:systemParameterSet][:projection]
+                        unless hSpaceRef[:systemParameterSet][:projection].empty?
                            hProjection = hSpaceRef[:systemParameterSet][:projection]
-                           unless hProjection.empty?
-                              unless hProjection[:projection].nil?
-                                 classMap.writeXML(hProjection)
-                              end
+                           unless hProjection[:gridIdentifier].empty?
+                              classGrid.writeXML(hProjection, outContext)
+                              break
                            end
-                        end
-                     end
-                  end
-
-                  # planar 4.1.2.2 (gridsys) - grid projection
-                  aSpaceRefs.each do |hSpaceRef|
-                     unless hSpaceRef[:systemParameterSet].empty?
-                        if hSpaceRef[:systemParameterSet][:projection]
-                           hProjection = hSpaceRef[:systemParameterSet][:projection]
-                           unless hProjection.empty?
-                              unless hProjection[:gridSystem].nil?
-                                 classGrid.writeXML(hProjection)
-                              end
-                           end
-                        end
-                     end
-                  end
-
-                  # planar 4.1.2.3 (localp) - local planar projection
-                  aSpaceRefs.each do |hSpaceRef|
-                     unless hSpaceRef[:systemParameterSet].empty?
-                        if hSpaceRef[:systemParameterSet][:projection]
-                           hProjection = hSpaceRef[:systemParameterSet][:projection]
-                           unless hProjection.empty?
-                              unless hProjection[:projection].nil?
-                                 if hProjection[:projection] == 'localPlanar'
-                                    classLocal.writeXML(hProjection)
-                                 end
-                              end
+                           if hProjection[:projectionIdentifier][:identifier] == 'localPlanar'
+                              classLocal.writeXML(hProjection, outContext)
+                              break
                            end
+                           classMap.writeXML(hProjection, outContext)
                         end
                      end
                   end
 
-                  # planar 4.1.2.4 (planci) - local planar projection
-                  classInfo.writeXML(aRepTypes, aResolutions)
+                  # planar 4.1.2.4 (planci) - planar coordinate information
+                  classInfo.writeXML(aRepTypes, aResolutions, outContext)
 
                end # writeXML
             end # PlanarReference

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_spatialReference.rb

@@ -2,6 +2,7 @@
 # FGDC CSDGM writer output in XML
 
 # History:
+#  Stan Smith 2018-10-09 refactor mdJson projection object
 #  Stan Smith 2017-12-29 original script
 
 require_relative '../fgdc_writer'
@@ -36,6 +37,8 @@ module ADIWG
                   geodeticClass = GeodeticReference.new(@xml, @hResponseObj)
                   vDatumClass = VerticalDatum.new(@xml, @hResponseObj)
 
+                  outContext = 'spatial reference'
+
                   # spatial reference 4.1 (horizsys) - horizontal coordinate reference system (required)
                   # oneOf [geograph | planar | local]
                   @xml.tag!('horizsys') do
@@ -47,7 +50,7 @@ module ADIWG
                            if hSpaceRes[:geographicResolution]
                               unless hSpaceRes[:geographicResolution].empty?
                                  @xml.tag!('geograph') do
-                                    geoResClass.writeXML(hSpaceRes[:geographicResolution])
+                                    geoResClass.writeXML(hSpaceRes[:geographicResolution], outContext)
                                  end
                                  break
                               end
@@ -64,12 +67,10 @@ module ADIWG
                      havePlanar = true unless aRepTypes.empty?
                      aSpaceRefs.each do |hSpaceRef|
                         unless hSpaceRef[:systemParameterSet].empty?
-                           if hSpaceRef[:systemParameterSet][:projection]
+                           unless hSpaceRef[:systemParameterSet][:projection].empty?
                               hProjection = hSpaceRef[:systemParameterSet][:projection]
-                              unless hProjection.empty?
-                                 unless hProjection[:projection] == 'localSystem'
-                                    havePlanar = true
-                                 end
+                              unless hProjection[:projectionIdentifier][:identifier] == 'localSystem'
+                                 havePlanar = true
                               end
                            end
                         end
@@ -80,7 +81,7 @@ module ADIWG
                      end
                      if havePlanar
                         @xml.tag!('planar') do
-                           planarClass.writeXML(aSpaceRefs, aRepTypes, aResolutions)
+                           planarClass.writeXML(aSpaceRefs, aRepTypes, aResolutions, outContext)
                         end
                      end
 
@@ -95,9 +96,9 @@ module ADIWG
                            if hSpaceRef[:systemParameterSet][:projection]
                               hProjection = hSpaceRef[:systemParameterSet][:projection]
                               unless hProjection.empty?
-                                 if hProjection[:projection] == 'localSystem'
+                                 if hProjection[:projectionIdentifier][:identifier] == 'localSystem'
                                     @xml.tag!('local') do
-                                       localClass.writeXML(hProjection)
+                                       localClass.writeXML(hProjection, outContext)
                                     end
                                  end
                               end
@@ -113,7 +114,7 @@ module ADIWG
                               hGeodetic = hSpaceRef[:systemParameterSet][:geodetic]
                               unless hGeodetic.empty?
                                  @xml.tag!('geodetic') do
-                                    geodeticClass.writeXML(hGeodetic)
+                                    geodeticClass.writeXML(hGeodetic, outContext)
                                  end
                               end
                            end
@@ -136,7 +137,7 @@ module ADIWG
                   end
                   if haveVertical
                      @xml.tag!('vertdef') do
-                        vDatumClass.writeXML(aSpaceRefs)
+                        vDatumClass.writeXML(aSpaceRefs, outContext)
                      end
                   end
 

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_taxonomy.rb

@@ -2,6 +2,7 @@
 # FGDC CSDGM writer output in XML
 
 # History:
+#  Stan Smith 2018-10-19 refactored for mdJson schema 2.6.0
 #  Stan Smith 2018-03-26 refactored error and warning messaging
 #  Stan Smith 2017-12-12 original script
 
@@ -53,13 +54,17 @@ module ADIWG
                      @xml.tag!('taxongen')
                   end
 
-                  # taxonomy bio (taxoncl) - taxonomic classification {required}
-                  unless hTaxonomy[:taxonClass].empty?
+                  # taxonomy bio (taxoncl) - taxonomic classification [0] {required}
+                  unless hTaxonomy[:taxonClasses].empty?
                      @xml.tag!('taxoncl') do
-                        taxClassClass.writeXML(hTaxonomy[:taxonClass])
+                        taxClassClass.writeXML(hTaxonomy[:taxonClasses][0])
                      end
                   end
-                  if hTaxonomy[:taxonClass].empty?
+                  if hTaxonomy[:taxonClasses].length > 1
+                     @NameSpace.issueNotice(401)
+                     @NameSpace.issueNotice(402)
+                  end
+                  if hTaxonomy[:taxonClasses].empty?
                      @NameSpace.issueWarning(400, 'taxoncl')
                   end
 

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_taxonomySystem.rb

@@ -56,9 +56,8 @@ module ADIWG
                      @NameSpace.issueWarning(431, nil)
                   end
 
-                  # taxonomic system (idref) - identification reference [] {identifier}
-                  hTaxonomy[:idReferences].each do |hReference|
-                     hCitation = hReference[:citation]
+                  # taxonomic system (idref) - identification reference [] {citation}
+                  hTaxonomy[:idReferences].each do |hCitation|
                      unless hCitation.empty?
                         @xml.tag!('idref') do
                            citationClass.writeXML(hCitation, [])

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_verticalDatum.rb

@@ -2,6 +2,7 @@
 # FGDC CSDGM writer output in XML
 
 # History:
+#  Stan Smith 2018-09-26 deprecate datumName use datumIdentifier.identifier
 #  Stan Smith 2018-03-27 refactored error and warning messaging
 #  Stan Smith 2018-01-16 original script
 
@@ -18,7 +19,7 @@ module ADIWG
                   @NameSpace = ADIWG::Mdtranslator::Writers::Fgdc
                end
 
-               def writeXML(aSpaceRefs)
+               def writeXML(aSpaceRefs, inContext = nil)
 
                   aSpaceRefs.each do |hSpaceRef|
                      unless hSpaceRef[:systemParameterSet].empty?
@@ -30,10 +31,10 @@ module ADIWG
                               @xml.tag!('depthsys') do
 
                                  # vertical datum 4.2.1.1 (depthdn) - depth datum name (required)
-                                 unless hVDatum[:datumName].nil?
-                                    @xml.tag!('depthdn', hVDatum[:datumName])
+                                 unless hVDatum[:datumIdentifier].empty?
+                                    @xml.tag!('depthdn', hVDatum[:datumIdentifier][:identifier])
                                  end
-                                 if hVDatum[:datumName].nil?
+                                 if hVDatum[:datumIdentifier].empty?
                                     @NameSpace.issueWarning(460, 'depthdn')
                                  end
 
@@ -67,10 +68,10 @@ module ADIWG
                               @xml.tag!('altsys') do
 
                                  # altitude datum 4.2.2.1 (altdatum) - altitude datum name (required)
-                                 unless hVDatum[:datumName].nil?
-                                    @xml.tag!('altdatum', hVDatum[:datumName])
+                                 unless hVDatum[:datumIdentifier].empty?
+                                    @xml.tag!('altdatum', hVDatum[:datumIdentifier][:identifier])
                                  end
-                                 if hVDatum[:datumName].nil?
+                                 if hVDatum[:datumIdentifier].empty?
                                     @NameSpace.issueWarning(464, 'altdatum')
                                  end