adiwg-mdtranslator 2.13.3 → 2.14.0

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_localSystem.rb

@@ -2,6 +2,7 @@
 # unpack fgdc horizontal data local reference
 
 # History:
+#  Stan Smith 2018-10-05 refactor mdJson projection object
 #  Stan Smith 2017-12-29 original script
 
 require 'nokogiri'
@@ -12,31 +13,45 @@ module ADIWG
       module Readers
          module Fgdc
 
-            module LocalSystem
+            module MapLocalSystem
 
                def self.unpack(xLocal, hResponseObj)
 
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
-
                   hProjection = intMetadataClass.newProjection
-                  hProjection[:projection] = 'localSystem'
-                  hProjection[:projectionName] = 'local coordinate system'
+                  hIdentifier = intMetadataClass.newIdentifier
+                  hLocal = intMetadataClass.newLocal
+                  hProjection[:projectionIdentifier] = hIdentifier
+                  hProjection[:local] = hLocal
+
+                  hIdentifier[:identifier] = 'localSystem'
+                  hIdentifier[:name] = 'Local Coordinate System'
+                  hLocal[:fixedToEarth] = false
 
                   # local planar 4.1.3.1 (localdes) - local description
-                  # -> referenceSystemParameters.projection.localPlanarDescription
+                  # -> ReferenceSystemParameters.projection.local.description
                   description = xLocal.xpath('./localdes').text
                   unless description.empty?
-                     hProjection[:localPlanarDescription] = description
+                     hLocal[:description] = description
+                  end
+                  if description.empty?
+                     hResponseObj[:readerExecutionMessages] <<
+                        'WARNING: FGDC reader: local coordinate system description is missing'
                   end
 
                   # local planar 4.1.3.2 (localgeo) - local georeference information
-                  # -> referenceSystemParameters.projection.localPlanarGeoreference
+                  # -> ReferenceSystemParameters.projection.local.georeference
                   georeference = xLocal.xpath('./localgeo').text
                   unless georeference.empty?
-                     hProjection[:localPlanarGeoreference] = georeference
+                     hLocal[:georeference] = georeference
+                  end
+                  if georeference.empty?
+                     hResponseObj[:readerExecutionMessages] <<
+                        'WARNING: FGDC reader: local coordinate system georeference information is missing'
                   end
 
+                  # packing
                   hReferenceSystem = intMetadataClass.newSpatialReferenceSystem
                   hSystemParameters = intMetadataClass.newReferenceSystemParameterSet
                   hSystemParameters[:projection] = hProjection

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_mapGridSystem.rb

@@ -2,16 +2,15 @@
 # unpack fgdc map grid coordinate system
 
 # History:
+#  Stan Smith 2018-10-04 refactor mdJson projection object
 #  Stan Smith 2017-10-04 original script
 
 require 'nokogiri'
-require_relative 'mapProjections/projection_transverseMercator'
-require_relative 'mapProjections/projection_polarStereo'
-require_relative 'mapProjections/projection_lambertConic'
-require_relative 'mapProjections/projection_obliqueMercator'
-require_relative 'mapProjections/projection_polyconic'
-require_relative 'mapProjections/projection_equirectangular'
-require_relative 'mapProjections/projection_azimuthEquidistant'
+require_relative 'gridSystems/grid_utm'
+require_relative 'gridSystems/grid_ups'
+require_relative 'gridSystems/grid_statePlane'
+require_relative 'gridSystems/grid_equalArcSecond'
+require_relative 'gridSystems/grid_other'
 
 module ADIWG
    module Mdtranslator
@@ -25,178 +24,56 @@ module ADIWG
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
                   hProjection = intMetadataClass.newProjection
+                  hGridSystemId = intMetadataClass.newIdentifier
+                  hProjectionId = intMetadataClass.newIdentifier
+                  hProjection[:gridIdentifier] = hGridSystemId
+                  hProjection[:projectionIdentifier] = hProjectionId
 
                   # grid system 4.1.2.2.1 (gridsysn) - grid coordinate system name (required)
                   # -> ReferenceSystemParameters.projection.projectionIdentifier.identifier
                   gridName = xMapGrid.xpath('./gridsysn').text
                   unless gridName.empty?
-                     hProjection[:gridSystemName] = gridName
+                     hGridSystemId[:name] = gridName
                   end
                   if gridName.empty?
                      hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: grid system name is missing'
                   end
 
-                  haveGrid = false
                   # grid system 4.1.2.2.2 (utm) - universal transverse mercator
                   xUTM = xMapGrid.xpath('./utm')
                   unless xUTM.empty?
-
-                     haveGrid = true
-                     hProjection[:gridSystem] = 'utm'
-                     hProjection[:gridSystemName] = 'Universal Transverse Mercator (UTM)' if gridName.empty?
-
-                     # grid system 4.1.2.2.2.1 (utmzone) - utm zone number {-60..-1, 1..60} (required)
-                     # -> ReferenceSystemParameters.projection.gridZone
-                     zone = xUTM.xpath('./utmzone').text
-                     unless zone.empty?
-                        hProjection[:gridZone] = zone
-                     end
-                     if zone.empty?
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: UTM zone number is missing'
-                     end
-
-                     # + transverse mercator (required)
-                     xTransMer = xUTM.xpath('./transmer')
-                     unless xTransMer.empty?
-                        return TransverseMercatorProjection.unpack(xTransMer, hProjection, hResponseObj)
-                     end
-                     if xTransMer.empty?
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: UTM transverse mercator definition is missing'
-                     end
-
+                     return MapGridUtm.unpack(xUTM, hProjection, hResponseObj)
                   end
 
                   # grid system 4.1.2.2.3 (ups) - universal polar stereographic
-                  xUSP = xMapGrid.xpath('./ups')
-                  unless xUSP.empty?
-
-                     haveGrid = true
-                     hProjection[:gridSystem] = 'ups'
-                     hProjection[:gridSystemName] = 'Universal Polar Stereographic (UPS)' if gridName.empty?
-
-                     # grid system 4.1.2.2.3.1 (upszone) - utm zone number {-60..-1, 1..60} (required)
-                     # -> ReferenceSystemParameters.projection.gridZone
-                     zone = xUSP.xpath('./upszone').text
-                     unless zone.empty?
-                        hProjection[:gridZone] = zone
-                     end
-                     if zone.empty?
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: UPS zone number is missing'
-                     end
-
-                     # + polar stereographic (required)
-                     xPolarS = xUSP.xpath('./polarst')
-                     unless xPolarS.empty?
-                        return PolarStereoProjection.unpack(xPolarS, hProjection, hResponseObj)
-                     end
-                     if xPolarS.empty?
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: UPS polar stereographic definition is missing'
-                     end
-
+                  xUPS = xMapGrid.xpath('./ups')
+                  unless xUPS.empty?
+                     return MapGridUps.unpack(xUPS, hProjection, hResponseObj)
                   end
 
                   # grid system 4.1.2.2.4 (spcs) - state plane coordinate system
                   xStateP = xMapGrid.xpath('./spcs')
                   unless xStateP.empty?
-
-                     hProjection[:gridSystem] = 'spcs'
-                     hProjection[:gridSystemName] = 'State Plane Coordinate System (SPCS)' if gridName.empty?
-
-                     haveGrid = true
-                     # grid system 4.1.2.2.4.1 (spcszone) - state plane zone number {nnnn} (required)
-                     # -> ReferenceSystemParameters.projection.gridZone
-                     zone = xStateP.xpath('./spcszone').text
-                     unless zone.empty?
-                        hProjection[:gridZone] = zone
-                     end
-                     if zone.empty?
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: state plane zone number is missing'
-                     end
-
-                     # + [ lambert conformal conic | transverse mercator | oblique mercator | polyconic ] (required)
-                     # + lambert conformal conic
-                     xLambert = xStateP.xpath('./lambertc')
-                     unless xLambert.empty?
-                        return LambertConicProjection.unpack(xLambert, hProjection, hResponseObj)
-                     end
-
-                     # + transverse mercator
-                     xTransMer = xStateP.xpath('./transmer')
-                     unless xTransMer.empty?
-                        return TransverseMercatorProjection.unpack(xTransMer, hProjection, hResponseObj)
-                     end
-
-                     # + oblique mercator
-                     xObliqueM = xStateP.xpath('./obqmerc')
-                     unless xObliqueM.empty?
-                        return ObliqueMercatorProjection.unpack(xObliqueM, hProjection, hResponseObj)
-                     end
-
-                     # + polyconic
-                     xPolyCon = xStateP.xpath('./polycon')
-                     unless xPolyCon.empty?
-                        return PolyconicProjection.unpack(xPolyCon, hProjection, hResponseObj)
-                     end
-
-                     # error message
-                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: UPS state plane projection definition is missing'
-
+                     return MapGridStatePlane.unpack(xStateP, hProjection, hResponseObj)
                   end
 
                   # grid system 4.1.2.2.5 (arcsys) - equal arc-second coordinate system
                   xArc = xMapGrid.xpath('./arcsys')
                   unless xArc.empty?
-
-                     haveGrid = true
-                     hProjection[:gridSystem] = 'arcsys'
-                     hProjection[:gridSystemName] = 'Equal Arc-second Coordinate System (ARC)' if gridName.empty?
-
-                     # grid system 4.1.2.2.5.1 (arcszone) - state plane zone number {1..18} (required)
-                     # -> ReferenceSystemParameters.projection.gridZone
-                     zone = xArc.xpath('./arczone').text
-                     unless zone.empty?
-                        hProjection[:gridZone] = zone
-                     end
-                     if zone.empty?
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: equal arc-second zone number is missing'
-                     end
-
-                     # + [ equirectangular | azimuthal equidistant ] (required)
-                     # + equirectangular
-                     xEquiR = xArc.xpath('./equirect')
-                     unless xEquiR.empty?
-                        return EquirectangularProjection.unpack(xEquiR, hProjection, hResponseObj)
-                     end
-
-                     # + azimuthal equidistant
-                     xAzimuthE = xArc.xpath('./azimequi')
-                     unless xAzimuthE.empty?
-                        return AzimuthEquidistantProjection.unpack(xAzimuthE, hProjection, hResponseObj)
-                     end
-
-                     # error message
-                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: UPS equal arc-second projection definition is missing'
+                     return MapGridEqualArcSecond.unpack(xArc, hProjection, hResponseObj)
                   end
 
                   # grid system 4.1.2.2.6 (othergrd) - other coordinate system {text}
-                  # -> ReferenceSystemParameters.projection.otherGridDescription
+                  # -> ReferenceSystemParameters.projection.gridIdentifier.description
                   otherG = xMapGrid.xpath('./othergrd').text
                   unless otherG.empty?
-
-                     haveGrid = true
-                     hProjection[:gridSystem] = 'other'
-                     hProjection[:gridSystemName] = 'other grid coordinate system' if gridName.empty?
-
-                     hProjection[:otherGridDescription] = otherG
-                     return hProjection
+                     return MapGridOther.unpack(otherG, hProjection)
                   end
 
                   # error message
-                  unless haveGrid
-                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: grid system is missing'
-                  end
+                  hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: grid system is missing'
 
-                  return nil
+                  return hProjection
 
                end
 

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_mapProjection.rb

@@ -2,6 +2,7 @@
 # unpack fgdc map projection
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-03 original script
 
 require 'nokogiri'
@@ -41,14 +42,14 @@ module ADIWG
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
                   hProjection = intMetadataClass.newProjection
+                  hIdentifier = intMetadataClass.newIdentifier
+                  hProjection[:projectionIdentifier] = hIdentifier
 
                   # map projection 4.1.2.1.1 (mapprojn) - map projection name (required)
                   # -> ReferenceSystemParameters.projection.projectionIdentifier.identifier
                   name = xMapProjection.xpath('./mapprojn').text
                   unless name.empty?
-                     hIdentifier = intMetadataClass.newIdentifier
-                     hIdentifier[:identifier] = name
-                     hProjection[:projectionIdentifier] = hIdentifier
+                     hIdentifier[:name] = name
                   end
                   if name.empty?
                      hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: map projection name is missing'
@@ -57,132 +58,176 @@ module ADIWG
                   # map projection 4.1.2.1.2 (albers) - Albers Conical Equal Area
                   xAlbers = xMapProjection.xpath('./albers')
                   unless xAlbers.empty?
+                     hIdentifier[:identifier] = 'albers'
+                     hIdentifier[:name] = 'Albers Conical Equal Area' if name.empty?
                      return AlbersProjection.unpack(xAlbers, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.3 (azimequi) - Azimuthal Equidistant
                   xAzimequi = xMapProjection.xpath('./azimequi')
                   unless xAzimequi.empty?
+                     hIdentifier[:identifier] = 'azimuthalEquidistant'
+                     hIdentifier[:name] = 'Azimuthal Equidistant' if name.empty?
                      return AzimuthEquidistantProjection.unpack(xAzimequi, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.4 (equicon) - Equidistant Conic
                   xEquiCon = xMapProjection.xpath('./equicon')
                   unless xEquiCon.empty?
+                     hIdentifier[:identifier] = 'equidistantConic'
+                     hIdentifier[:name] = 'Equidistant Conic' if name.empty?
                      return EquidistantConicProjection.unpack(xEquiCon, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.5 (equirect) - Equirectangular
                   xEquirec = xMapProjection.xpath('./equirect')
                   unless xEquirec.empty?
+                     hIdentifier[:identifier] = 'equirectangular'
+                     hIdentifier[:name] = 'Equirectangular' if name.empty?
                      return EquirectangularProjection.unpack(xEquirec, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.6 (gvnsp) - General Vertical Near-sided Perspective
                   xGenVert = xMapProjection.xpath('./gvnsp')
                   unless xGenVert.empty?
+                     hIdentifier[:identifier] = 'generalVertical'
+                     hIdentifier[:name] = 'General Vertical Near-sided Perspective' if name.empty?
                      return GeneralVerticalProjection.unpack(xGenVert, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.7 (gnomonic) - Gnomonic
                   xGeomonic = xMapProjection.xpath('./gnomonic')
                   unless xGeomonic.empty?
+                     hIdentifier[:identifier] = 'gnomonic'
+                     hIdentifier[:name] = 'Gnomonic' if name.empty?
                      return GnomonicProjection.unpack(xGeomonic, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.8 (lamberta) - Lambert Azimuthal Equal Area
                   xLambertA = xMapProjection.xpath('./lamberta')
                   unless xLambertA.empty?
+                     hIdentifier[:identifier] = 'lambertEqualArea'
+                     hIdentifier[:name] = 'Lambert Azimuthal Equal Area' if name.empty?
                      return LambertEqualAreaProjection.unpack(xLambertA, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.9 (lambertc) - Lambert Conformal Conic
                   xLambertC = xMapProjection.xpath('./lambertc')
                   unless xLambertC.empty?
+                     hIdentifier[:identifier] = 'lambertConic'
+                     hIdentifier[:name] = 'Lambert Conformal Conic' if name.empty?
                      return LambertConicProjection.unpack(xLambertC, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.10 (mercator) - Mercator
                   xMercator = xMapProjection.xpath('./mercator')
                   unless xMercator.empty?
+                     hIdentifier[:identifier] = 'mercator'
+                     hIdentifier[:name] = 'Mercator' if name.empty?
                      return MercatorProjection.unpack(xMercator, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.11 (modsak) - Modified Stereographic for Alaska
                   xAlaska = xMapProjection.xpath('./modsak')
                   unless xAlaska.empty?
+                     hIdentifier[:identifier] = 'alaska'
+                     hIdentifier[:name] = 'Modified Stereographic for Alaska' if name.empty?
                      return ModifiedAlaskaProjection.unpack(xAlaska, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.12 (miller) - Miller Cylindrical
                   xMiller = xMapProjection.xpath('./miller')
                   unless xMiller.empty?
+                     hIdentifier[:identifier] = 'miller'
+                     hIdentifier[:name] = 'Miller Cylindrical' if name.empty?
                      return MillerCylinderProjection.unpack(xMiller, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.13 (obqmerc) - Oblique Mercator
                   xObliqueM = xMapProjection.xpath('./obqmerc')
                   unless xObliqueM.empty?
+                     hIdentifier[:identifier] = 'obliqueMercator'
+                     hIdentifier[:name] = 'Oblique Mercator' if name.empty?
                      return ObliqueMercatorProjection.unpack(xObliqueM, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.14 (orthogr) - Orthographic
                   xOrtho = xMapProjection.xpath('./orthogr')
                   unless xOrtho.empty?
+                     hIdentifier[:identifier] = 'orthographic'
+                     hIdentifier[:name] = 'Orthographic' if name.empty?
                      return OrthographicProjection.unpack(xOrtho, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.15 (polarst) - Polar Stereographic
                   xPolarStereo = xMapProjection.xpath('./polarst')
                   unless xPolarStereo.empty?
+                     hIdentifier[:identifier] = 'polarStereo'
+                     hIdentifier[:name] = 'Polar Stereographic' if name.empty?
                      return PolarStereoProjection.unpack(xPolarStereo, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.16 (polycon) - Polyconic
                   xPolycon = xMapProjection.xpath('./polycon')
                   unless xPolycon.empty?
+                     hIdentifier[:identifier] = 'polyconic'
+                     hIdentifier[:name] = 'Polyconic' if name.empty?
                      return PolyconicProjection.unpack(xPolycon, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.17 (robinson) - Robinson
                   xRobin = xMapProjection.xpath('./robinson')
                   unless xRobin.empty?
+                     hIdentifier[:identifier] = 'robinson'
+                     hIdentifier[:name] = 'Robinson' if name.empty?
                      return RobinsonProjection.unpack(xRobin, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.18 (sinusoid) - Sinusoidal
                   xSinu = xMapProjection.xpath('./sinusoid')
                   unless xSinu.empty?
+                     hIdentifier[:identifier] = 'sinusoidal'
+                     hIdentifier[:name] = 'Sinusoidal' if name.empty?
                      return SinusoidalProjection.unpack(xSinu, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.19 (spaceobq) - Space Oblique Mercator (Landsat)
                   xSpaceO = xMapProjection.xpath('./spaceobq')
                   unless xSpaceO.empty?
+                     hIdentifier[:identifier] = 'spaceOblique'
+                     hIdentifier[:name] = 'Space Oblique Mercator (Landsat)' if name.empty?
                      return SpaceObliqueProjection.unpack(xSpaceO, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.20 (stereo) - Stereographic
                   xStereo = xMapProjection.xpath('./stereo')
                   unless xStereo.empty?
+                     hIdentifier[:identifier] = 'stereographic'
+                     hIdentifier[:name] = 'Stereographic' if name.empty?
                      return StereographicProjection.unpack(xStereo, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.21 (transmer) - Transverse Mercator
                   xTransMer = xMapProjection.xpath('./transmer')
                   unless xTransMer.empty?
+                     hIdentifier[:identifier] = 'transverseMercator'
+                     hIdentifier[:name] = 'Transverse Mercator' if name.empty?
                      return TransverseMercatorProjection.unpack(xTransMer, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.22 (vdgrin) - van der Grinten
                   xVanDerG = xMapProjection.xpath('./vdgrin')
                   unless xVanDerG.empty?
+                     hIdentifier[:identifier] = 'grinten'
+                     hIdentifier[:name] = 'Van Der Grinten' if name.empty?
                      return VanDerGrintenProjection.unpack(xVanDerG, hProjection, hResponseObj)
                   end
 
                   # map projection 4.1.2.1.23 (mapprojp) - projection parameter set
                   xParamSet = xMapProjection.xpath('./mapprojp')
                   unless xParamSet.empty?
+                     hIdentifier[:identifier] = 'parameters'
+                     hIdentifier[:name] = 'Projection Parameters' if name.empty?
                      return ProjectionParameters.unpack(xParamSet, hProjection, hResponseObj)
                   end
 

data/lib/adiwg/mdtranslator/readers/fgdc/modules/{module_mapCoordinateInfo.rb → module_planarCoordinateInfo.rb}

@@ -26,7 +26,8 @@ module ADIWG
                      hResourceInfo[:spatialRepresentationTypes] << encoding
                   end
                   if encoding.empty?
-                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: planar coordinate encoding method is missing'
+                     hResponseObj[:readerExecutionMessages] <<
+                        'WARNING: FGDC reader: planar coordinate encoding method is missing'
                   end
 
                   haveRep = false
@@ -44,7 +45,8 @@ module ADIWG
                         hCoordResolution[:abscissaResolutionX] = abscissa.to_f
                      end
                      if abscissa.empty?
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: coordinate representation abscissa resolution is missing'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: coordinate representation abscissa resolution is missing'
                      end
 
                      # map projection 4.1.2.4.2.2 (ordres) - ordinate resolution (required)
@@ -54,7 +56,8 @@ module ADIWG
                         hCoordResolution[:ordinateResolutionY] = ordinate.to_f
                      end
                      if ordinate.empty?
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: coordinate representation ordinate resolution is missing'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: coordinate representation ordinate resolution is missing'
                      end
 
                      # map projection 4.1.2.4.4 (plandu) - planar distance units (required)
@@ -64,7 +67,8 @@ module ADIWG
                         hCoordResolution[:unitOfMeasure] = distUnits
                      end
                      if distUnits.empty?
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: planar distance units are missing'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: planar distance units are missing'
                      end
 
                      hResolution = intMetadataClass.newSpatialResolution
@@ -87,7 +91,8 @@ module ADIWG
                         hBDResolution[:distanceResolution] = distRes.to_f
                      end
                      if distRes.empty?
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: bearing-distance distance resolution is missing'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: bearing-distance distance resolution is missing'
                      end
 
                      # map projection 4.1.2.4.4 (plandu) - planar distance units (required)
@@ -97,7 +102,8 @@ module ADIWG
                         hBDResolution[:distanceUnitOfMeasure] = distUnits
                      end
                      if distUnits.empty?
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: bearing-distance distance units is missing'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: bearing-distance distance units is missing'
                      end
 
                      # map projection 4.1.2.4.3.2 (bearres) - bearing resolution (required)
@@ -107,7 +113,8 @@ module ADIWG
                         hBDResolution[:bearingResolution] = bearingRes.to_f
                      end
                      if bearingRes.empty?
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: bearing-distance bearing resolution is missing'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: bearing-distance bearing resolution is missing'
                      end
 
                      # map projection 4.1.2.4.3.3 (bearunit) - bearing units (required)
@@ -117,7 +124,8 @@ module ADIWG
                         hBDResolution[:bearingUnitsOfMeasure] = bearingUnits
                      end
                      if bearingUnits.empty?
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: bearing-distance bearing units is missing'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: bearing-distance bearing units is missing'
                      end
 
                      # map projection 4.1.2.4.3.4 (bearrefd) - bearing reference direction (required)
@@ -127,7 +135,8 @@ module ADIWG
                         hBDResolution[:bearingReferenceDirection] = bearingDirection
                      end
                      if bearingDirection.empty?
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: bearing-distance bearing direction is missing'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: bearing-distance bearing direction is missing'
                      end
 
                      # map projection 4.1.2.4.3.5 (bearrefm) - bearing reference meridian (required)
@@ -137,9 +146,11 @@ module ADIWG
                         hBDResolution[:bearingReferenceMeridian] = bearingMeridian
                      end
                      if bearingMeridian.empty?
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: bearing-distance bearing meridian is missing'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: bearing-distance bearing meridian is missing'
                      end
 
+                     # packing
                      hResolution = intMetadataClass.newSpatialResolution
                      hResolution[:bearingDistanceResolution] = hBDResolution
                      hResourceInfo[:spatialResolutions] << hResolution
@@ -148,7 +159,8 @@ module ADIWG
 
                   # error messages
                   unless haveRep
-                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: planar coordinate representation is missing'
+                     hResponseObj[:readerExecutionMessages] <<
+                        'WARNING: FGDC reader: planar coordinate representation is missing'
                   end
 
                   # map projection 4.1.2.4.4 (plandu) - planar distance units

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_taxonomy.rb

@@ -54,7 +54,7 @@ module ADIWG
                   unless xTaxClass.empty?
                      hTaxonClass = TaxonClass.unpack(xTaxClass, hResponseObj)
                      unless hTaxonClass.nil?
-                        hTaxonomy[:taxonClass] = hTaxonClass
+                        hTaxonomy[:taxonClasses] << hTaxonClass
                      end
                   end
                   if xTaxClass.empty?

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_verticalAltitude.rb

@@ -2,6 +2,7 @@
 # unpack fgdc vertical altitude reference
 
 # History:
+#  Stan Smith 2018-09-26 move altitude datum name to datumIdentifier
 #  Stan Smith 2017-10-19 original script
 
 require 'nokogiri'
@@ -19,14 +20,16 @@ module ADIWG
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
                   hDatum = intMetadataClass.newVerticalDatum
+                  hDatumIdentifier = intMetadataClass.newIdentifier
 
                   hDatum[:isDepthSystem] = false
 
                   # altitude datum 4.2.1.1 (altdatum) - altitude datum name (required)
-                  # -> referenceSystemParameters.verticalDatum.datumName
+                  # -> referenceSystemParameters.verticalDatum.datumIdentifier.identifier
                   datumName = xAltSys.xpath('./altdatum').text
                   unless datumName.empty?
-                     hDatum[:datumName] = datumName
+                     hDatumIdentifier[:identifier] = datumName
+                     hDatum[:datumIdentifier] = hDatumIdentifier
                   end
                   if datumName.empty?
                      hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: vertical altitude datum name is missing'

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_verticalDepth.rb

@@ -2,6 +2,7 @@
 # unpack fgdc vertical depth reference
 
 # History:
+#  Stan Smith 2018-09-26 move altitude datum name to datumIdentifier
 #  Stan Smith 2017-10-19 original script
 
 require 'nokogiri'
@@ -19,13 +20,16 @@ module ADIWG
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
                   hDatum = intMetadataClass.newVerticalDatum
+                  hDatumIdentifier = intMetadataClass.newIdentifier
+
                   hDatum[:isDepthSystem] = true
 
                   # depth datum 4.2.2.1 (depthdn) - depth datum name
-                  # -> referenceSystemParameters.verticalDatum.datumName
+                  # -> referenceSystemParameters.verticalDatum.datumIdentifier.identifier
                   datumName = xDepthSys.xpath('./depthdn').text
                   unless datumName.empty?
-                     hDatum[:datumName] = datumName
+                     hDatumIdentifier[:identifier] = datumName
+                     hDatum[:datumIdentifier] = hDatumIdentifier
                   end
                   if datumName.empty?
                      hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: vertical depth datum name is missing'