adiwg-mdtranslator 2.13.3 → 2.14.0

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

@@ -18,7 +18,7 @@ module ADIWG
                @intMetadataClass = InternalMetadata.new
 
                # standard parallels
-               def self.unpackStandParallel(xParams, hProjection, hResponseObj)
+               def self.unpackStandParallel(xParams, hProjection)
                   paramCount = 0
                   aStandP = xParams.xpath('./stdparll')
                   unless aStandP.empty?
@@ -39,7 +39,7 @@ module ADIWG
                end
 
                # longitude of central meridian
-               def self.unpackLongCM(xParams, hProjection, hResponseObj)
+               def self.unpackLongCM(xParams, hProjection)
                   longCM = xParams.xpath('./longcm').text
                   unless longCM.empty?
                      hProjection[:longitudeOfCentralMeridian] = longCM.to_f
@@ -49,7 +49,7 @@ module ADIWG
                end
 
                # latitude of projection origin
-               def self.unpackLatPO(xParams, hProjection, hResponseObj)
+               def self.unpackLatPO(xParams, hProjection)
                   latPO = xParams.xpath('./latprjo').text
                   unless latPO.empty?
                      hProjection[:latitudeOfProjectionOrigin] = latPO.to_f
@@ -59,7 +59,7 @@ module ADIWG
                end
 
                # false northing and easting(xParams, hProjection, hResponseObj)
-               def self.unpackFalseNE(xParams, hProjection, hResponseObj)
+               def self.unpackFalseNE(xParams, hProjection)
                   paramCount = 0
                   falseE = xParams.xpath('./feast').text
                   unless falseE.empty?
@@ -75,7 +75,7 @@ module ADIWG
                end
 
                # height of perspective point above surface
-               def self.unpackHeightAS(xParams, hProjection, hResponseObj)
+               def self.unpackHeightAS(xParams, hProjection)
                   heightAS = xParams.xpath('./heightpt').text
                   unless heightAS.empty?
                      hProjection[:heightOfProspectivePointAboveSurface] = heightAS.to_f
@@ -85,7 +85,7 @@ module ADIWG
                end
 
                # longitude of projection center
-               def self.unpackLongPC(xParams, hProjection, hResponseObj)
+               def self.unpackLongPC(xParams, hProjection)
                   longPC = xParams.xpath('./longpc').text
                   unless longPC.empty?
                      hProjection[:longitudeOfProjectionCenter] = longPC.to_f
@@ -95,7 +95,7 @@ module ADIWG
                end
 
                # latitude of projection center
-               def self.unpackLatPC(xParams, hProjection, hResponseObj)
+               def self.unpackLatPC(xParams, hProjection)
                   latPC = xParams.xpath('./latprjc').text
                   unless latPC.empty?
                      hProjection[:latitudeOfProjectionCenter] = latPC.to_f
@@ -105,7 +105,7 @@ module ADIWG
                end
 
                # scale factor at equator
-               def self.unpackSFEquator(xParams, hProjection, hResponseObj)
+               def self.unpackSFEquator(xParams, hProjection)
                   sFEquator = xParams.xpath('./sfequat').text
                   unless sFEquator.empty?
                      hProjection[:scaleFactorAtEquator] = sFEquator.to_f
@@ -115,7 +115,7 @@ module ADIWG
                end
 
                # scale factor at center line
-               def self.unpackSFCenter(xParams, hProjection, hResponseObj)
+               def self.unpackSFCenter(xParams, hProjection)
                   sFCenter = xParams.xpath('./sfctrlin').text
                   unless sFCenter.empty?
                      hProjection[:scaleFactorAtCenterLine] = sFCenter.to_f
@@ -125,7 +125,7 @@ module ADIWG
                end
 
                # scale factor at central meridian
-               def self.unpackSFCM(xParams, hProjection, hResponseObj)
+               def self.unpackSFCM(xParams, hProjection)
                   sFCM = xParams.xpath('./sfctrmer').text
                   unless sFCM.empty?
                      hProjection[:scaleFactorAtCentralMeridian] = sFCM.to_f
@@ -135,7 +135,7 @@ module ADIWG
                end
 
                # scale factor at projection origin
-               def self.unpackSFPO(xParams, hProjection, hResponseObj)
+               def self.unpackSFPO(xParams, hProjection)
                   sFProjectO = xParams.xpath('./sfprjorg').text
                   unless sFProjectO.empty?
                      hProjection[:scaleFactorAtProjectionOrigin] = sFProjectO.to_f
@@ -145,7 +145,7 @@ module ADIWG
                end
 
                # oblique line azimuth
-               def self.unpackObliqueLA(xParams, hProjection, hResponseObj)
+               def self.unpackObliqueLA(xParams, hProjection)
                   xObliqueLA = xParams.xpath('./obqlazim')
                   unless xObliqueLA.empty?
                      paramCount = 0
@@ -165,7 +165,7 @@ module ADIWG
                end
 
                # oblique line point
-               def self.unpackObliqueLP(xParams, hProjection, hResponseObj)
+               def self.unpackObliqueLP(xParams, hProjection)
                   xObliqueLP = xParams.xpath('./obqlpt')
                   unless xObliqueLP.empty?
                      paramCount = 0
@@ -174,23 +174,23 @@ module ADIWG
 
                      lat1 = xObliqueLP.xpath('./obqllat[1]').text
                      unless lat1.empty?
-                        hPoint1[:azimuthLineLatitude] = lat1.to_f
+                        hPoint1[:obliqueLineLatitude] = lat1.to_f
                         paramCount += 1
                      end
                      long1 = xObliqueLP.xpath('./obqllong[1]').text
                      unless long1.empty?
-                        hPoint1[:azimuthLineLongitude] = long1.to_f
+                        hPoint1[:obliqueLineLongitude] = long1.to_f
                         paramCount += 1
                      end
 
                      lat2 = xObliqueLP.xpath('./obqllat[2]').text
                      unless lat2.empty?
-                        hPoint2[:azimuthLineLatitude] = lat2.to_f
+                        hPoint2[:obliqueLineLatitude] = lat2.to_f
                         paramCount += 1
                      end
                      long2 = xObliqueLP.xpath('./obqllong[2]').text
                      unless long2.empty?
-                        hPoint2[:azimuthLineLongitude] = long2.to_f
+                        hPoint2[:obliqueLineLongitude] = long2.to_f
                         paramCount += 1
                      end
 
@@ -205,7 +205,7 @@ module ADIWG
                end
 
                # straight vertical longitude from pole
-               def self.unpackVSLong(xParams, hProjection, hResponseObj)
+               def self.unpackVSLong(xParams, hProjection)
                   sVLongP = xParams.xpath('./svlong').text
                   unless sVLongP.empty?
                      hProjection[:straightVerticalLongitudeFromPole] = sVLongP.to_f
@@ -215,7 +215,7 @@ module ADIWG
                end
 
                # landsat number
-               def self.unpackLandSat(xParams, hProjection, hResponseObj)
+               def self.unpackLandSat(xParams, hProjection)
                   landsatN = xParams.xpath('./landsat').text
                   unless landsatN.empty?
                      hProjection[:landsatNumber] = landsatN.to_i
@@ -225,7 +225,7 @@ module ADIWG
                end
 
                # landsat path number
-               def self.unpackLandSatPath(xParams, hProjection, hResponseObj)
+               def self.unpackLandSatPath(xParams, hProjection)
                   landsatP = xParams.xpath('./pathnum').text
                   unless landsatP.empty?
                      hProjection[:landsatPath] = landsatP.to_i
@@ -235,10 +235,11 @@ module ADIWG
                end
 
                # other projection
-               def self.unpackOtherProjection(xParams, hProjection, hResponseObj)
+               def self.unpackOtherProjection(xParams, hProjection)
                   other = xParams.xpath('./otherprj').text
                   unless other.empty?
-                     hProjection[:otherProjectionDescription] = other
+                     hProjection[:projectionIdentifier][:identifier] = 'other'
+                     hProjection[:projectionIdentifier][:description] = other
                      return 1
                   end
                   return 0

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

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - equidistant conic
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-16 original script
 
 require 'nokogiri'
@@ -19,28 +20,27 @@ module ADIWG
                   # map projection 4.1.2.1.4 (equicon) - Equidistant Conic
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'equidistantConic'
-                     hProjection[:projectionName] = 'Equidistant Conic'
 
                      # -> ReferenceSystemParameters.projection.standardParallel1
                      # -> ReferenceSystemParameters.projection.standardParallel2
-                     paramCount += ProjectionCommon.unpackStandParallel(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackStandParallel(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)
 
                      # verify parameter count
                      if paramCount == 6
                         return hProjection
                      else
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: Equidistant Conic projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: Equidistant Conic projection is missing one or more parameters'
                      end
                   end
 

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

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - equirectangular
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-16 original script
 
 require 'nokogiri'
@@ -19,25 +20,24 @@ module ADIWG
                   # map projection 4.1.2.1.5 (equirect) - Equirectangular
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'equirectangular'
-                     hProjection[:projectionName] = 'Equirectangular'
 
                      # -> ReferenceSystemParameters.projection.standardParallel1
-                     paramCount += ProjectionCommon.unpackStandParallel(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackStandParallel(xParams, hProjection)
 
                      # -> 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)
 
                      # add distance units
                      # verify parameter count
                      if paramCount == 4
                         return hProjection
                      else
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: Equirectangular projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: Equirectangular projection is missing one or more parameters'
                      end
                   end
 

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

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - general vertical near-side perspective projection
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-16 original script
 
 require 'nokogiri'
@@ -20,28 +21,27 @@ module ADIWG
                   # map projection 4.1.2.1.6 (gvnsp) - General Vertical Near-sided Perspective
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'generalVertical'
-                     hProjection[:projectionName] = 'General Vertical Near-sided Perspective'
 
                      # -> ReferenceSystemParameters.projection.heightOfProspectivePointAboveSurface
-                     paramCount += ProjectionCommon.unpackHeightAS(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackHeightAS(xParams, hProjection)
 
                      # -> 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)
 
                      # add distance units
                      # verify parameter count
                      if paramCount == 5
                         return hProjection
                      else
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: General Vertical Near-side perspective projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: General Vertical Near-side perspective projection is missing one or more parameters'
                      end
                   end
 

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

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - gnomonic projection
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-16 original script
 
 require 'nokogiri'
@@ -20,24 +21,23 @@ module ADIWG
                   # map projection 4.1.2.1.7 (gnomonic) - Gnomonic
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'gnomonic'
-                     hProjection[:projectionName] = 'Gnomonic'
 
                      # -> 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: Gnomonic projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: Gnomonic projection is missing one or more parameters'
                      end
                   end
 

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

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - lambert conformal conic
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-16 original script
 
 require 'nokogiri'
@@ -20,28 +21,27 @@ module ADIWG
                   # map projection 4.1.2.1.9 (lambertc) - Lambert Conformal Conic
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'lambertConic'
-                     hProjection[:projectionName] = 'Lambert Conformal Conic'
 
                      # -> ReferenceSystemParameters.projection.standardParallel1
                      # -> ReferenceSystemParameters.projection.standardParallel2
-                     paramCount += ProjectionCommon.unpackStandParallel(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackStandParallel(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)
 
                      # verify parameter count
                      if paramCount == 6
                         return hProjection
                      else
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: Lambert Conformal Conic projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: Lambert Conformal Conic projection is missing one or more parameters'
                      end
                   end
 

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

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - lambert equal area projection
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-16 original script
 
 require 'nokogiri'
@@ -20,24 +21,23 @@ module ADIWG
                   # map projection 4.1.2.1.8 (lamberta) - Lambert Azimuthal Equal Area
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'lambertEqualArea'
-                     hProjection[:projectionName] = 'Lambert Azimuthal Equal Area'
 
                      # -> 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: Lambert Azimuthal Equal Area projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: Lambert Azimuthal Equal Area projection is missing one or more parameters'
                      end
                   end
 

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

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - mercator
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-16 original script
 
 require 'nokogiri'
@@ -21,28 +22,27 @@ module ADIWG
                   # -> ReferenceSystemParameters.projection.[ standardParallel1 | scaleFactorAtEquator ]
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'mercator'
-                     hProjection[:projectionName] = 'Mercator'
 
                      # -> ReferenceSystemParameters.projection.standardParallel1
                      # -> ReferenceSystemParameters.projection.standardParallel2
-                     paramCount += ProjectionCommon.unpackStandParallel(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackStandParallel(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.scaleFactorAtEquator
-                     paramCount += ProjectionCommon.unpackSFEquator(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackSFEquator(xParams, hProjection)
 
                      # -> 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 == 4
                         return hProjection
                      else
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: Mercator projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: Mercator projection is missing one or more parameters'
                      end
                   end
 

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

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - miller cylindrical
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-16 original script
 
 require 'nokogiri'
@@ -20,21 +21,20 @@ module ADIWG
                   # map projection 4.1.2.1.12 (miller) - Miller Cylindrical
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'miller'
-                     hProjection[:projectionName] = 'Miller Cylindrical'
 
                      # -> 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: FGDC reader: Miller Cylindrical projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: Miller Cylindrical projection is missing one or more parameters'
                      end
                   end
 

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

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

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

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - oblique mercator
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-17 original script
 
 require 'nokogiri'
@@ -20,32 +21,31 @@ module ADIWG
                   # map projection 4.1.2.1.13 (obqmerc) - Oblique Mercator
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'obliqueMercator'
-                     hProjection[:projectionName] = 'Oblique Mercator'
 
                      # -> ReferenceSystemParameters.projection.scaleFactorAtCenterLine
-                     paramCount += ProjectionCommon.unpackSFCenter(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackSFCenter(xParams, hProjection)
 
                      # -> oblique line azimuth ( azimuthAngle && azimuthMeasurePointLongitude )
                      # -> ReferenceSystemParameters.projection.azimuthAngle
                      # -> ReferenceSystemParameters.projection.azimuthMeasurePointLongitude
-                     paramCount += ProjectionCommon.unpackObliqueLA(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackObliqueLA(xParams, hProjection)
 
                      # -> oblique line point 2( obliqueLinePoint{} )
-                     paramCount += ProjectionCommon.unpackObliqueLP(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackObliqueLP(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 == 6
                         return hProjection
                      else
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: Oblique Mercator projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: Oblique Mercator projection is missing one or more parameters'
                      end
                   end
 

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

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - orthographic
 
 # 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.14 (orthogr) - Orthographic
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'orthographic'
-                     hProjection[:projectionName] = 'Orthographic'
 
                      # -> 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: Orthographic projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: Orthographic projection is missing one or more parameters'
                      end
                   end