adiwg-mdtranslator 2.7.0 → 2.8.0

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

@@ -0,0 +1,57 @@
+# Reader - fgdc to internal data structure
+# unpack fgdc horizontal data geographic resolution
+
+# History:
+#  Stan Smith 2017-12-29 original script
+
+require 'nokogiri'
+require 'adiwg/mdtranslator/internal/internal_metadata_obj'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module Fgdc
+
+            module GeographicResolution
+
+               def self.unpack(xGeographic)
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+
+                  hResolution = intMetadataClass.newSpatialResolution
+                  hGeoResolution = intMetadataClass.newGeographicResolution
+
+                  # geographic reference 4.1.1.1 (latres) - latitude resolution
+                  # -> spatialResolution.geographicResolution.latitudeResolution
+                  latResolution = xGeographic.xpath('./latres').text
+                  unless latResolution.empty?
+                     hGeoResolution[:latitudeResolution] = latResolution.to_f
+                  end
+
+                  # geographic reference 4.1.1.2 (longres) - longitude resolution
+                  # -> spatialResolution.geographicResolution.longitudeResolution
+                  longResolution = xGeographic.xpath('./longres').text
+                  unless longResolution.empty?
+                     hGeoResolution[:longitudeResolution] = longResolution.to_f
+                  end
+
+                  # geographic reference 4.1.1.3 (geogunit) - latitude/longitude units
+                  # -> spatialResolution.geographicResolution.unitOfMeasure
+                  unitMeasure = xGeographic.xpath('./geogunit').text
+                  unless unitMeasure.empty?
+                     hGeoResolution[:unitOfMeasure] = unitMeasure
+                  end
+
+                  hResolution[:geographicResolution] = hGeoResolution
+
+                  return hResolution
+
+               end
+
+            end
+
+         end
+      end
+   end
+end

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

@@ -8,7 +8,7 @@ require 'nokogiri'
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
 require_relative 'module_mapProjection'
 require_relative 'module_mapGridSystem'
-require_relative 'module_mapLocalSystem'
+require_relative 'module_mapLocalPlanar'
 require_relative 'module_mapCoordinateInfo'
 
 module ADIWG
@@ -49,7 +49,7 @@ module ADIWG
                   # planar reference 4.1.2.3 (localp) - local planar
                   xMapLocal = xPlanar.xpath('./localp')
                   unless xMapLocal.empty?
-                     hProjection = MapLocalSystem.unpack(xMapLocal, hResponseObj)
+                     hProjection = MapLocalPlanar.unpack(xMapLocal, hResponseObj)
                   end
 
                   unless hProjection.nil?

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

@@ -5,8 +5,10 @@
 #  Stan Smith 2017-10-02 original script
 
 require 'nokogiri'
-require 'adiwg/mdtranslator/internal/internal_metadata_obj'
 require_relative 'module_horizontalPlanar'
+require_relative 'module_geographicResolution'
+require_relative 'module_geodeticReference'
+require_relative 'module_localSystem'
 
 module ADIWG
    module Mdtranslator
@@ -17,46 +19,13 @@ module ADIWG
 
                def self.unpack(xHorizontalRef, hResourceInfo, hResponseObj)
 
-                  # instance classes needed in script
-                  intMetadataClass = InternalMetadata.new
-
-                  # horizontal reference 4.1.1 (geograph) - geographic coordinate system
+                  # horizontal reference 4.1.1 (geograph) - geographic resolution
                   xGeographic = xHorizontalRef.xpath('./geograph')
                   unless xGeographic.empty?
-
-                     hResolution = intMetadataClass.newSpatialResolution
-                     hGeoResolution = intMetadataClass.newGeographicResolution
-                     hasValue = false
-
-                     # geographic reference 4.1.1.1 (latres) - latitude resolution
-                     # -> spatialResolution.geographicResolution.latitudeResolution
-                     latResolution = xGeographic.xpath('./latres').text
-                     unless latResolution.empty?
-                        hGeoResolution[:latitudeResolution] = latResolution.to_f
-                        hasValue = true
-                     end
-
-                     # geographic reference 4.1.1.2 (longres) - longitude resolution
-                     # -> spatialResolution.geographicResolution.longitudeResolution
-                     longResolution = xGeographic.xpath('./longres').text
-                     unless longResolution.empty?
-                        hGeoResolution[:longitudeResolution] = longResolution.to_f
-                        hasValue = true
-                     end
-
-                     # geographic reference 4.1.1.3 (geogunit) - latitude/longitude units
-                     # -> spatialResolution.geographicResolution.unitOfMeasure
-                     unitMeasure = xGeographic.xpath('./geogunit').text
-                     unless unitMeasure.empty?
-                        hGeoResolution[:unitOfMeasure] = unitMeasure
-                        hasValue = true
-                     end
-
-                     if hasValue
-                        hResolution[:geographicResolution] = hGeoResolution
+                     hResolution = GeographicResolution.unpack(xGeographic)
+                     unless hResolution.nil?
                         hResourceInfo[:spatialResolutions] << hResolution
                      end
-
                   end
 
                   # horizontal reference 4.1.2 (planar) - planar coordinate system []
@@ -70,89 +39,19 @@ module ADIWG
                   # horizontal reference 4.1.3 (local) - local coordinate system
                   xLocal = xHorizontalRef.xpath('./local')
                   unless xLocal.empty?
-
-                     hProjection = intMetadataClass.newProjection
-                     hProjection[:projectionName] = 'local'
-
-                     # local planar 4.1.3.1 (localdes) - local description
-                     # -> referenceSystemParameters.projection.localPlanarDescription
-                     description = xLocal.xpath('./localdes').text
-                     unless description.empty?
-                        hProjection[:localPlanarDescription] = description
-                     end
-
-                     # local planar 4.1.3.2 (localgeo) - local georeference information
-                     # -> referenceSystemParameters.projection.localPlanarGeoreference
-                     georeference = xLocal.xpath('./localgeo').text
-                     unless georeference.empty?
-                        hProjection[:localPlanarGeoreference] = georeference
+                     hReferenceSystem = LocalSystem.unpack(xLocal)
+                     unless hReferenceSystem.nil?
+                        hResourceInfo[:spatialReferenceSystems] << hReferenceSystem
                      end
-
-                     hReferenceSystem = intMetadataClass.newSpatialReferenceSystem
-                     hSystemParameters = intMetadataClass.newReferenceSystemParameterSet
-                     hSystemParameters[:projection] = hProjection
-                     hReferenceSystem[:systemParameterSet] = hSystemParameters
-                     hResourceInfo[:spatialReferenceSystems] << hReferenceSystem
-
                   end
 
                   # horizontal reference 4.1.4 (geodetic) - parameters for shape of earth
                   xGeodetic = xHorizontalRef.xpath('./geodetic')
                   unless xGeodetic.empty?
-
-                     hEllipsoid = intMetadataClass.newEllipsoid
-
-                     # geodetic model 4.1.4.1 (horizdn) - horizontal datum name
-                     # -> referenceSystemParameters.datumIdentifier.identifier.identifier
-                     datumName = xGeodetic.xpath('./horizdn').text
-                     unless datumName.empty?
-                        hIdentifier = intMetadataClass.newIdentifier
-                        hIdentifier[:identifier] = datumName
-                        hEllipsoid[:ellipsoidIdentifier] = hIdentifier
-                     end
-
-                     # geodetic model 4.1.4.2 (ellips) - ellipsoid name
-                     # -> referenceSystemParameters.ellipsoid.ellipsoidName
-                     ellipsoidName = xGeodetic.xpath('./ellips').text
-                     unless ellipsoidName.empty?
-                        hEllipsoid[:ellipsoidName] = ellipsoidName
-                     end
-
-                     # geodetic model 4.1.4.3 (semiaxis) - semi-major axis
-                     # -> referenceSystemParameters.ellipsoid.semiMajorAxis
-                     semiAxis = xGeodetic.xpath('./semiaxis').text
-                     unless semiAxis.empty?
-                        hEllipsoid[:semiMajorAxis] = semiAxis.to_f
-                     end
-
-                     # geodetic model 4.1.2.4.4 (plandu) - distance units
-                     # take value from the first 'planar' section with 'plandu' specified
-                     axPlanar = xHorizontalRef.xpath('./planar')
-                     unless axPlanar.empty?
-                        axPlanar.each do |xPlanar|
-                           xPlanCI = xPlanar.xpath('./planci')
-                           unless xPlanCI.empty?
-                              units = xPlanCI.xpath('./plandu').text
-                              unless units.empty?
-                                 hEllipsoid[:axisUnits] = units
-                              end
-                           end
-                        end
+                     hReferenceSystem = GeodeticReference.unpack(xHorizontalRef)
+                     unless hReferenceSystem.nil?
+                        hResourceInfo[:spatialReferenceSystems] << hReferenceSystem
                      end
-
-                     # geodetic model 4.1.4.4 (denflat) - denominator of flattening ratio
-                     # -> referenceSystemParameters.ellipsoid.denominatorOfFlatteningRatio
-                     flattening = xGeodetic.xpath('./denflat').text
-                     unless flattening.empty?
-                        hEllipsoid[:denominatorOfFlatteningRatio] = flattening.to_f
-                     end
-
-                     hReferenceSystem = intMetadataClass.newSpatialReferenceSystem
-                     hSystemParameters = intMetadataClass.newReferenceSystemParameterSet
-                     hSystemParameters[:ellipsoid] = hEllipsoid
-                     hReferenceSystem[:systemParameterSet] = hSystemParameters
-                     hResourceInfo[:spatialReferenceSystems] << hReferenceSystem
-
                   end
 
                   return hResourceInfo

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

@@ -35,6 +35,9 @@ module ADIWG
                            hCitation = intMetadataClass.newCitation
                            hCitation[:title] = thesaurus
                            hKeyword[:thesaurus] = hCitation
+                           if thesaurus == 'ISO 19115 Topic Category'
+                              hKeyword[:keywordType] = 'isoTopicCategory'
+                           end
                         end
 
                         # theme keyword 1.6.1.2 (themekey) - theme keyword keyword {keywordObject}
@@ -50,18 +53,7 @@ module ADIWG
                            end
                         end
 
-                        # if keyword thesaurus is 'ISO 19115 Topic Category'
-                        # also convert to ISO topic categories
-                        if hKeyword[:thesaurus][:title] == 'ISO 19115 Topic Category'
-                           hKeyword[:keywords].each do |hKeyObj|
-                              hResourceInfo[:topicCategories] << hKeyObj[:keyword]
-                           end
-                           hKeyword = {}
-                        end
-
-                        unless hKeyword.empty?
-                           aKeywords << hKeyword
-                        end
+                        aKeywords << hKeyword
 
                      end
                   end
@@ -94,9 +86,7 @@ module ADIWG
                            end
                         end
 
-                        unless hKeyword.empty?
-                           aKeywords << hKeyword
-                        end
+                        aKeywords << hKeyword
 
                      end
                   end
@@ -129,9 +119,7 @@ module ADIWG
                            end
                         end
 
-                        unless hKeyword.empty?
-                           aKeywords << hKeyword
-                        end
+                        aKeywords << hKeyword
 
                      end
                   end
@@ -164,9 +152,7 @@ module ADIWG
                            end
                         end
 
-                        unless hKeyword.empty?
-                           aKeywords << hKeyword
-                        end
+                        aKeywords << hKeyword
 
                      end
                   end
@@ -198,9 +184,7 @@ module ADIWG
                         end
                      end
 
-                     unless hKeyword.empty?
-                        aKeywords << hKeyword
-                     end
+                     aKeywords << hKeyword
 
                   end
 
@@ -231,9 +215,7 @@ module ADIWG
                         end
                      end
 
-                     unless hKeyword.empty?
-                        aKeywords << hKeyword
-                     end
+                     aKeywords << hKeyword
 
                   end
 

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

@@ -0,0 +1,53 @@
+# Reader - fgdc to internal data structure
+# unpack fgdc horizontal data local reference
+
+# History:
+#  Stan Smith 2017-12-29 original script
+
+require 'nokogiri'
+require 'adiwg/mdtranslator/internal/internal_metadata_obj'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module Fgdc
+
+            module LocalSystem
+
+               def self.unpack(xLocal)
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+
+                  hProjection = intMetadataClass.newProjection
+                  hProjection[:projectionName] = 'local'
+
+                  # local planar 4.1.3.1 (localdes) - local description
+                  # -> referenceSystemParameters.projection.localPlanarDescription
+                  description = xLocal.xpath('./localdes').text
+                  unless description.empty?
+                     hProjection[:localPlanarDescription] = description
+                  end
+
+                  # local planar 4.1.3.2 (localgeo) - local georeference information
+                  # -> referenceSystemParameters.projection.localPlanarGeoreference
+                  georeference = xLocal.xpath('./localgeo').text
+                  unless georeference.empty?
+                     hProjection[:localPlanarGeoreference] = georeference
+                  end
+
+                  hReferenceSystem = intMetadataClass.newSpatialReferenceSystem
+                  hSystemParameters = intMetadataClass.newReferenceSystemParameterSet
+                  hSystemParameters[:projection] = hProjection
+                  hReferenceSystem[:systemParameterSet] = hSystemParameters
+
+                  return hReferenceSystem
+
+               end
+
+            end
+
+         end
+      end
+   end
+end

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

@@ -113,6 +113,7 @@ module ADIWG
                   end
 
                   # map projection 4.1.2.4.4 (plandu) - planar distance units
+                  # handled in sections coordinateResolution and bearingDistanceResolution sections above
                   # -> resourceInfo.spatialResolutions.spatialResolution.bearingDistanceResolution.distanceUnitOfMeasure
                   # -> resourceInfo.spatialResolutions.spatialResolution.coordinateResolution.unitOfMeasure
 

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

@@ -5,7 +5,6 @@
 #  Stan Smith 2017-10-04 original script
 
 require 'nokogiri'
-require 'adiwg/mdtranslator/internal/internal_metadata_obj'
 require_relative 'mapProjections/projection_transverseMercator'
 require_relative 'mapProjections/projection_polarStereo'
 require_relative 'mapProjections/projection_lambertConic'
@@ -29,22 +28,23 @@ module ADIWG
 
                   # grid system 4.1.2.2.1 (gridsysn) - grid coordinate system name
                   # -> ReferenceSystemParameters.projection.projectionIdentifier.identifier
-                  name = xMapGrid.xpath('./gridsysn').text
-                  unless name.empty?
-                     hIdentifier = intMetadataClass.newIdentifier
-                     hIdentifier[:identifier] = name
-                     hProjection[:projectionIdentifier] = hIdentifier
+                  gridName = xMapGrid.xpath('./gridsysn').text
+                  unless gridName.empty?
+                     hProjection[:gridSystemName] = gridName
                   end
 
                   # grid system 4.1.2.2.2 (utm) - universal transverse mercator
                   xUTM = xMapGrid.xpath('./utm')
                   unless xUTM.empty?
 
+                     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}
-                     # -> ReferenceSystemParameters.projection.zone
+                     # -> ReferenceSystemParameters.projection.gridZone
                      zone = xUTM.xpath('./utmzone').text
                      unless zone.empty?
-                        hProjection[:zone] = zone
+                        hProjection[:gridZone] = zone
                      end
 
                      # + transverse mercator
@@ -59,11 +59,14 @@ module ADIWG
                   xUSP = xMapGrid.xpath('./ups')
                   unless xUSP.empty?
 
+                     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}
-                     # -> ReferenceSystemParameters.projection.zone
+                     # -> ReferenceSystemParameters.projection.gridZone
                      zone = xUSP.xpath('./upszone').text
                      unless zone.empty?
-                        hProjection[:zone] = zone
+                        hProjection[:gridZone] = zone
                      end
 
                      # + polar stereographic
@@ -78,11 +81,14 @@ module ADIWG
                   xStateP = xMapGrid.xpath('./spcs')
                   unless xStateP.empty?
 
+                     hProjection[:gridSystem] = 'spcs'
+                     hProjection[:gridSystemName] = 'State Plane Coordinate System (SPCS)' if gridName.empty?
+
                      # grid system 4.1.2.2.4.1 (spcszone) - state plane zone number {nnnn}
-                     # -> ReferenceSystemParameters.projection.zone
+                     # -> ReferenceSystemParameters.projection.gridZone
                      zone = xStateP.xpath('./spcszone').text
                      unless zone.empty?
-                        hProjection[:zone] = zone
+                        hProjection[:gridZone] = zone
                      end
 
                      # + [ lambert conformal conic | transverse mercator | oblique mercator | polyconic ]
@@ -116,11 +122,14 @@ module ADIWG
                   xArc = xMapGrid.xpath('./arcsys')
                   unless xArc.empty?
 
+                     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}
-                     # -> ReferenceSystemParameters.projection.zone
+                     # -> ReferenceSystemParameters.projection.gridZone
                      zone = xArc.xpath('./arczone').text
                      unless zone.empty?
-                        hProjection[:zone] = zone
+                        hProjection[:gridZone] = zone
                      end
 
                      # + [ equirectangular | azimuthal equidistant ]
@@ -142,8 +151,11 @@ module ADIWG
                   # -> ReferenceSystemParameters.projection.otherGridDescription
                   otherG = xMapGrid.xpath('./othergrd').text
                   unless otherG.empty?
+
+                     hProjection[:gridSystem] = 'other'
+                     hProjection[:gridSystemName] = 'other grid coordinate system' if gridName.empty?
+
                      hProjection[:otherGridDescription] = otherG
-                     hProjection[:projectionName] = 'other grid system'
                      return hProjection
                   end