adiwg-mdtranslator 2.13.3 → 2.14.0

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_parameters.rb

@@ -2,10 +2,12 @@
 # unpack fgdc map projection - parameter set
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-18 original script
 
 require 'nokogiri'
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
+require_relative 'projection_common'
 
 module ADIWG
    module Mdtranslator
@@ -18,63 +20,61 @@ module ADIWG
 
                   # map projection 4.1.2.1.23 (mapprojp) - projection parameter set
                   unless xParams.empty?
-                     hProjection[:projection] = 'parameters'
-                     hProjection[:projectionName] = 'Projection Parameter Set'
 
                      # -> ReferenceSystemParameters.projection.standardParallel1
                      # -> ReferenceSystemParameters.projection.standardParallel2
-                     ProjectionCommon.unpackStandParallel(xParams, hProjection, hResponseObj)
+                     ProjectionCommon.unpackStandParallel(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.longitudeOfCentralMeridian
-                     ProjectionCommon.unpackLongCM(xParams, hProjection, hResponseObj)
+                     ProjectionCommon.unpackLongCM(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.latitudeOfProjectionOrigin
-                     ProjectionCommon.unpackLatPO(xParams, hProjection, hResponseObj)
+                     ProjectionCommon.unpackLatPO(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.falseEasting
                      # -> ReferenceSystemParameters.projection.falseNorthing
-                     ProjectionCommon.unpackFalseNE(xParams, hProjection, hResponseObj)
+                     ProjectionCommon.unpackFalseNE(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.heightOfProspectivePointAboveSurface
-                     ProjectionCommon.unpackHeightAS(xParams, hProjection, hResponseObj)
+                     ProjectionCommon.unpackHeightAS(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.longitudeOfProjectionCenter
-                     ProjectionCommon.unpackLongPC(xParams, hProjection, hResponseObj)
+                     ProjectionCommon.unpackLongPC(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.latitudeOfProjectionCenter
-                     ProjectionCommon.unpackLatPC(xParams, hProjection, hResponseObj)
+                     ProjectionCommon.unpackLatPC(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.scaleFactorAtEquator
-                     ProjectionCommon.unpackSFEquator(xParams, hProjection, hResponseObj)
+                     ProjectionCommon.unpackSFEquator(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.scaleFactorAtCenterLine
-                     ProjectionCommon.unpackSFCenter(xParams, hProjection, hResponseObj)
+                     ProjectionCommon.unpackSFCenter(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.scaleFactorAtCentralMeridian
-                     ProjectionCommon.unpackSFCM(xParams, hProjection, hResponseObj)
+                     ProjectionCommon.unpackSFCM(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.scaleFactorAtProjectionOrigin
-                     ProjectionCommon.unpackSFPO(xParams, hProjection, hResponseObj)
+                     ProjectionCommon.unpackSFPO(xParams, hProjection)
 
                      # -> oblique line azimuth ( azimuthAngle && azimuthMeasurePointLongitude )
                      # -> ReferenceSystemParameters.projection.azimuthAngle
                      # -> ReferenceSystemParameters.projection.azimuthMeasurePointLongitude
-                     ProjectionCommon.unpackObliqueLA(xParams, hProjection, hResponseObj)
+                     ProjectionCommon.unpackObliqueLA(xParams, hProjection)
 
                      # -> oblique line point 2( obliqueLinePoint{} )
-                     ProjectionCommon.unpackObliqueLP(xParams, hProjection, hResponseObj)
+                     ProjectionCommon.unpackObliqueLP(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.straightVerticalLongitudeFromPole
-                     ProjectionCommon.unpackVSLong(xParams, hProjection, hResponseObj)
+                     ProjectionCommon.unpackVSLong(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.landsatNumber
-                     ProjectionCommon.unpackLandSat(xParams, hProjection, hResponseObj)
+                     ProjectionCommon.unpackLandSat(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.landsatPath
-                     ProjectionCommon.unpackLandSatPath(xParams, hProjection, hResponseObj)
+                     ProjectionCommon.unpackLandSatPath(xParams, hProjection)
 
-                     # -> ReferenceSystemParameters.projection.otherProjectionDescription
-                     ProjectionCommon.unpackOtherProjection(xParams, hProjection, hResponseObj)
+                     # -> ReferenceSystemParameters.projection.projectionIdentifier.description
+                     ProjectionCommon.unpackOtherProjection(xParams, hProjection)
 
                      return hProjection
 

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_polarStereo.rb

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - polar stereographic
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-17 original script
 
 require 'nokogiri'
@@ -20,31 +21,30 @@ module ADIWG
                   # map projection 4.1.2.1.15 (polarst) - Polar Stereographic
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'polarStereo'
-                     hProjection[:projectionName] = 'Polar Stereographic'
 
                      # -> ReferenceSystemParameters.projection.straightVerticalLongitudeFromPole
-                     paramCount += ProjectionCommon.unpackVSLong(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackVSLong(xParams, hProjection)
 
                      # -> [ standardParallel1 | scaleFactorAtProjectionOrigin ]
                      # -> ReferenceSystemParameters.projection.standardParallel1
-                     paramCount += ProjectionCommon.unpackStandParallel(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackStandParallel(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.scaleFactorAtProjectionOrigin
-                     paramCount += ProjectionCommon.unpackSFPO(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackSFPO(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.latitudeOfProjectionCenter
-                     paramCount += ProjectionCommon.unpackLatPC(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackLatPC(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.falseEasting
                      # -> ReferenceSystemParameters.projection.falseNorthing
-                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection)
 
                      # verify parameter count
                      if paramCount == 4
                         return hProjection
                      else
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: Polar Stereographic projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: Polar Stereographic projection is missing one or more parameters'
                      end
                   end
 

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_polyconic.rb

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - polyconic
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-17 original script
 
 require 'nokogiri'
@@ -20,24 +21,23 @@ module ADIWG
                   # map projection 4.1.2.1.16 (polycon) - Polyconic
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'polyconic'
-                     hProjection[:projectionName] = 'Polyconic'
 
                      # -> ReferenceSystemParameters.projection.longitudeOfCentralMeridian
-                     paramCount += ProjectionCommon.unpackLongCM(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackLongCM(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.latitudeOfProjectionOrigin
-                     paramCount += ProjectionCommon.unpackLatPO(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackLatPO(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.falseEasting
                      # -> ReferenceSystemParameters.projection.falseNorthing
-                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection)
 
                      # verify parameter count
                      if paramCount == 4
                         return hProjection
                      else
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: Polyconic projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: Polyconic projection is missing one or more parameters'
                      end
                   end
 

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_robinson.rb

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - robinson
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-18 original script
 
 require 'nokogiri'
@@ -20,21 +21,20 @@ module ADIWG
                   # map projection 4.1.2.1.17 (robinson) - Robinson
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'robinson'
-                     hProjection[:projectionName] = 'Robinson'
 
                      # -> ReferenceSystemParameters.projection.longitudeOfProjectionCenter
-                     paramCount += ProjectionCommon.unpackLongPC(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackLongPC(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.falseEasting
                      # -> ReferenceSystemParameters.projection.falseNorthing
-                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection)
 
                      # verify parameter count
                      if paramCount == 3
                         return hProjection
                      else
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: Robinson projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: Robinson projection is missing one or more parameters'
                      end
                   end
 

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_sinusoidal.rb

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - sinusoidal
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-18 original script
 
 require 'nokogiri'
@@ -20,21 +21,20 @@ module ADIWG
                   # map projection 4.1.2.1.18 (sinusoid) - Sinusoidal
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'sinusoidal'
-                     hProjection[:projectionName] = 'Sinusoidal'
 
                      # -> ReferenceSystemParameters.projection.longitudeOfCentralMeridian
-                     paramCount += ProjectionCommon.unpackLongCM(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackLongCM(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.falseEasting
                      # -> ReferenceSystemParameters.projection.falseNorthing
-                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection)
 
                      # verify parameter count
                      if paramCount == 3
                         return hProjection
                      else
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: Sinusoidal projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: Sinusoidal projection is missing one or more parameters'
                      end
                   end
 

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_spaceOblique.rb

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - space oblique
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-18 original script
 
 require 'nokogiri'
@@ -20,24 +21,23 @@ module ADIWG
                   # map projection 4.1.2.1.19 (spaceobq) - Space Oblique Mercator (Landsat)
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'spaceOblique'
-                     hProjection[:projectionName] = 'Space Oblique Mercator (Landsat)'
 
                      # -> ReferenceSystemParameters.projection.landsatNumber
-                     paramCount += ProjectionCommon.unpackLandSat(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackLandSat(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.landsatPath
-                     paramCount += ProjectionCommon.unpackLandSatPath(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackLandSatPath(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.falseEasting
                      # -> ReferenceSystemParameters.projection.falseNorthing
-                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection)
 
                      # verify parameter count
                      if paramCount == 4
                         return hProjection
                      else
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: Space Oblique projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: Space Oblique projection is missing one or more parameters'
                      end
                   end
 

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_stereographic.rb

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - stereographic
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-18 original script
 
 require 'nokogiri'
@@ -20,24 +21,23 @@ module ADIWG
                   # map projection 4.1.2.1.20 (stereo) - Stereographic
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'stereographic'
-                     hProjection[:projectionName] = 'Stereographic'
 
                      # -> ReferenceSystemParameters.projection.longitudeOfProjectionCenter
-                     paramCount += ProjectionCommon.unpackLongPC(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackLongPC(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.latitudeOfProjectionCenter
-                     paramCount += ProjectionCommon.unpackLatPC(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackLatPC(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.falseEasting
                      # -> ReferenceSystemParameters.projection.falseNorthing
-                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection)
 
                      # verify parameter count
                      if paramCount == 4
                         return hProjection
                      else
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: Stereographic projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: Stereographic projection is missing one or more parameters'
                      end
                   end
 

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_transverseMercator.rb

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - transverse mercator
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-04 original script
 
 require 'nokogiri'
@@ -19,26 +20,25 @@ module ADIWG
                   # map projection 4.1.2.1.21 (transmer) - Transverse Mercator
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'transverseMercator'
-                     hProjection[:projectionName] = 'Transverse Mercator'
 
                      # -> ReferenceSystemParameters.projection.scaleFactorAtCentralMeridian
-                     paramCount += ProjectionCommon.unpackSFCM(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackSFCM(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.longitudeOfCentralMeridian
-                     paramCount += ProjectionCommon.unpackLongCM(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackLongCM(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.latitudeOfProjectionOrigin
-                     paramCount += ProjectionCommon.unpackLatPO(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackLatPO(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.falseEasting
                      # -> ReferenceSystemParameters.projection.falseNorthing
-                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection)
 
                      if paramCount == 5
                         return hProjection
                      else
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: Transverse Mercator projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: Transverse Mercator projection is missing one or more parameters'
                      end
                   end
 

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_vanDerGrinten.rb

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - van der grinten
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-18 original script
 
 require 'nokogiri'
@@ -19,20 +20,19 @@ module ADIWG
                   # map projection 4.1.2.1.22 (vdgrin) - van der Grinten
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'grinten'
-                     hProjection[:projectionName] = 'van der Grinten'
 
                      # -> ReferenceSystemParameters.projection.longitudeOfCentralMeridian
-                     paramCount += ProjectionCommon.unpackLongCM(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackLongCM(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.falseEasting
                      # -> ReferenceSystemParameters.projection.falseNorthing
-                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection)
 
                      if paramCount == 3
                         return hProjection
                      else
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: Van Der Grinten projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: Van Der Grinten projection is missing one or more parameters'
                      end
                   end
 

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

@@ -2,6 +2,7 @@
 # unpack fgdc horizontal data geodetic reference
 
 # History:
+#  Stan Smith 2018-09-26 deprecate datumName and ellipsoidName from mdJSON
 #  Stan Smith 2017-12-29 original script
 
 require 'nokogiri'
@@ -23,20 +24,25 @@ module ADIWG
                   xGeodetic = xHorizontalRef.xpath('./geodetic')
 
                   # geodetic model 4.1.4.1 (horizdn) - horizontal datum name
-                  # -> referenceSystemParameters.geodetic.datumName
+                  # -> referenceSystemParameters.geodetic.datumIdentifier.identifier
                   datumName = xGeodetic.xpath('./horizdn').text
                   unless datumName.empty?
-                     hGeodetic[:datumName] = datumName
+                     hGeodetic[:datumIdentifier] = intMetadataClass.newIdentifier
+                     hGeodetic[:datumIdentifier][:identifier] = datumName
+                     hGeodetic[:datumIdentifier][:name] = datumName
                   end
 
                   # geodetic model 4.1.4.2 (ellips) - ellipsoid name (required)
-                  # -> referenceSystemParameters.geodetic.ellipsoidName
+                  # -> referenceSystemParameters.geodetic.ellipsoidIdentifier.identifier
                   ellipsoidName = xGeodetic.xpath('./ellips').text
                   unless ellipsoidName.empty?
-                     hGeodetic[:ellipsoidName] = ellipsoidName
+                     hGeodetic[:ellipsoidIdentifier] = intMetadataClass.newIdentifier
+                     hGeodetic[:ellipsoidIdentifier][:identifier] = ellipsoidName
+                     hGeodetic[:ellipsoidIdentifier][:name] = ellipsoidName
                   end
                   if ellipsoidName.empty?
-                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: geodetic reference ellipsoid name is missing'
+                     hResponseObj[:readerExecutionMessages] <<
+                        'WARNING: FGDC reader: geodetic reference ellipsoid name is missing'
                   end
 
                   # geodetic model 4.1.4.3 (semiaxis) - semi-major axis (required)
@@ -46,7 +52,8 @@ module ADIWG
                      hGeodetic[:semiMajorAxis] = semiAxis.to_f
                   end
                   if semiAxis.empty?
-                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: geodetic reference semi-major axis is missing'
+                     hResponseObj[:readerExecutionMessages] <<
+                        'WARNING: FGDC reader: geodetic reference radius of semi-major axis is missing'
                   end
 
                   # geodetic model 4.1.2.4.4 (plandu) - distance units
@@ -71,7 +78,8 @@ module ADIWG
                      hGeodetic[:denominatorOfFlatteningRatio] = flattening.to_f
                   end
                   if flattening.empty?
-                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: geodetic reference flattening ratio is missing'
+                     hResponseObj[:readerExecutionMessages] <<
+                        'WARNING: FGDC reader: geodetic reference denominator flattening ratio is missing'
                   end
 
                   hReferenceSystem = intMetadataClass.newSpatialReferenceSystem

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

@@ -29,7 +29,8 @@ module ADIWG
                      hGeoResolution[:latitudeResolution] = latResolution.to_f
                   end
                   if latResolution.empty?
-                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: geographic latitude resolution is missing'
+                     hResponseObj[:readerExecutionMessages] <<
+                        'WARNING: FGDC reader: geographic latitude resolution is missing'
                   end
 
                   # geographic reference 4.1.1.2 (longres) - longitude resolution (required)
@@ -39,7 +40,8 @@ module ADIWG
                      hGeoResolution[:longitudeResolution] = longResolution.to_f
                   end
                   if longResolution.empty?
-                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: geographic longitude resolution is missing'
+                     hResponseObj[:readerExecutionMessages] <<
+                        'WARNING: FGDC reader: geographic longitude resolution is missing'
                   end
 
                   # geographic reference 4.1.1.3 (geogunit) - latitude/longitude units (required)
@@ -49,7 +51,8 @@ module ADIWG
                      hGeoResolution[:unitOfMeasure] = unitMeasure
                   end
                   if unitMeasure.empty?
-                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: geographic latitude/longitude units are missing'
+                     hResponseObj[:readerExecutionMessages] <<
+                        'WARNING: FGDC reader: geographic latitude/longitude units are missing'
                   end
 
                   hResolution[:geographicResolution] = hGeoResolution

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

@@ -2,14 +2,15 @@
 # unpack fgdc horizontal planar data reference
 
 # History:
+#  Stan Smith 2018-10-04 refactor mdJson projection object
 #  Stan Smith 2017-10-03 original script
 
 require 'nokogiri'
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
 require_relative 'module_mapProjection'
 require_relative 'module_mapGridSystem'
-require_relative 'module_mapLocalPlanar'
-require_relative 'module_mapCoordinateInfo'
+require_relative 'module_localPlanar'
+require_relative 'module_planarCoordinateInfo'
 
 module ADIWG
    module Mdtranslator
@@ -22,7 +23,9 @@ module ADIWG
 
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
-                  hProjection = nil
+                  hReferenceSystem = intMetadataClass.newSpatialReferenceSystem
+                  hSystemParameters = intMetadataClass.newReferenceSystemParameterSet
+                  hProjection = {}
 
                   # get distance unit of measure for use in map projections and grid systems
                   distanceUnits = nil
@@ -52,9 +55,8 @@ module ADIWG
                      hProjection = MapLocalPlanar.unpack(xMapLocal, hResponseObj)
                   end
 
-                  unless hProjection.nil?
-                     hReferenceSystem = intMetadataClass.newSpatialReferenceSystem
-                     hSystemParameters = intMetadataClass.newReferenceSystemParameterSet
+                  # packing
+                  unless hProjection.empty?
                      unless distanceUnits.nil?
                         hProjection[:falseEastingNorthingUnits] = distanceUnits
                      end

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

@@ -39,7 +39,7 @@ module ADIWG
                   # horizontal reference 4.1.3 (local) - local coordinate system
                   xLocal = xHorizontalRef.xpath('./local')
                   unless xLocal.empty?
-                     hReferenceSystem = LocalSystem.unpack(xLocal, hResponseObj)
+                     hReferenceSystem = MapLocalSystem.unpack(xLocal, hResponseObj)
                      unless hReferenceSystem.nil?
                         hResourceInfo[:spatialReferenceSystems] << hReferenceSystem
                      end

data/lib/adiwg/mdtranslator/readers/fgdc/modules/{module_mapLocalPlanar.rb → module_localPlanar.rb}

@@ -2,6 +2,7 @@
 # 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'
@@ -18,28 +19,35 @@ module ADIWG
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
                   hProjection = intMetadataClass.newProjection
+                  hIdentifier = intMetadataClass.newIdentifier
+                  hLocal = intMetadataClass.newLocal
+                  hProjection[:projectionIdentifier] = hIdentifier
+                  hProjection[:local] = hLocal
 
-                  hProjection[:projection] = 'localPlanar'
-                  hProjection[:projectionName] = 'local planar coordinate system'
+                  hIdentifier[:identifier] = 'localPlanar'
+                  hIdentifier[:name] = 'Local Planar Coordinate System'
+                  hLocal[:fixedToEarth] = true
 
                   # local planar 4.1.2.3.1 (localpd) - local planar description (required)
-                  # -> ReferenceSystemParameters.projection.localPlanarDescription
+                  # -> ReferenceSystemParameters.projection.local.description
                   description = xMapLocal.xpath('./localpd').text
                   unless description.empty?
-                     hProjection[:localPlanarDescription] = description
+                     hLocal[:description] = description
                   end
                   if description.empty?
-                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: local planar coordinate system description is missing'
+                     hResponseObj[:readerExecutionMessages] <<
+                        'WARNING: FGDC reader: local planar coordinate system description is missing'
                   end
 
                   # local planar 4.1.2.3.2 (localpgi) - local planar georeference information (required)
-                  # -> ReferenceSystemParameters.projection.localPlanarGeoreference
+                  # -> ReferenceSystemParameters.projection.local.georeference
                   georeference = xMapLocal.xpath('./localpgi').text
                   unless georeference.empty?
-                     hProjection[:localPlanarGeoreference] = georeference
+                     hLocal[:georeference] = georeference
                   end
                   if georeference.empty?
-                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: local planar coordinate system georeference information is missing'
+                     hResponseObj[:readerExecutionMessages] <<
+                        'WARNING: FGDC reader: local planar coordinate system georeference information is missing'
                   end
 
                   return hProjection