adiwg-mdtranslator 2.7.0 → 2.8.0

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

@@ -5,21 +5,13 @@
 #  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'
-require_relative 'mapProjections/projection_obliqueMercator'
-require_relative 'mapProjections/projection_polyconic'
-require_relative 'mapProjections/projection_equirectangular'
-require_relative 'mapProjections/projection_azimuthEquidistant'
 
 module ADIWG
    module Mdtranslator
       module Readers
          module Fgdc
 
-            module MapLocalSystem
+            module MapLocalPlanar
 
                def self.unpack(xMapLocal, hResponseObj)
 
@@ -27,11 +19,8 @@ module ADIWG
                   intMetadataClass = InternalMetadata.new
                   hProjection = intMetadataClass.newProjection
 
-                  # -> ReferenceSystemParameters.projection.projectionIdentifier.identifier
-                  hIdentifier = intMetadataClass.newIdentifier
-                  hIdentifier[:identifier] = 'local planar coordinate system'
-                  hProjection[:projectionIdentifier] = hIdentifier
-                  hProjection[:projectionName] = 'local planar'
+                  hProjection[:projection] = 'localPlanar'
+                  hProjection[:projectionName] = 'local planar coordinate system'
 
                   # local planar 4.1.2.3.1 (localpd) - local planar description
                   # -> ReferenceSystemParameters.projection.localPlanarDescription

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

@@ -7,7 +7,7 @@
 require 'nokogiri'
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
 require_relative 'module_horizontalReference'
-require_relative 'module_verticalReference'
+require_relative 'module_verticalDatum'
 
 module ADIWG
    module Mdtranslator

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

@@ -114,7 +114,7 @@ module ADIWG
                         unless xRepository.empty?
                            hResponsibility = Contact.unpack(xRepository, hResponseObj)
                            unless hResponsibility.nil?
-                              hResponsibility[:roleName] = 'curator'
+                              hResponsibility[:roleName] = 'custodian'
                               hVoucher[:repository] = hResponsibility
                            end
                         end

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

@@ -18,16 +18,15 @@ module ADIWG
 
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
-                  hIdentifier = intMetadataClass.newIdentifier
                   hDatum = intMetadataClass.newVerticalDatum
 
                   hDatum[:isDepthSystem] = false
 
                   # altitude datum 4.2.1.1 (altdatum) - altitude datum name
-                  # -> referenceSystemParameters.verticalDatum.datumIdentifier.identifier
-                  identifier = xAltSys.xpath('./altdatum').text
-                  unless identifier.empty?
-                     hIdentifier[:identifier] = identifier
+                  # -> referenceSystemParameters.verticalDatum.datumName
+                  datumName = xAltSys.xpath('./altdatum').text
+                  unless datumName.empty?
+                     hDatum[:datumName] = datumName
                   end
 
                   # altitude datum 4.2.1.2 (altres) - altitude resolution []
@@ -53,7 +52,6 @@ module ADIWG
 
                   hParamSet = intMetadataClass.newReferenceSystemParameterSet
                   hRefSystem = intMetadataClass.newSpatialReferenceSystem
-                  hDatum[:datumIdentifier] = hIdentifier
                   hParamSet[:verticalDatum] = hDatum
                   hRefSystem[:systemParameterSet] = hParamSet
                   return hRefSystem

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

@@ -18,16 +18,14 @@ module ADIWG
 
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
-                  hIdentifier = intMetadataClass.newIdentifier
                   hDatum = intMetadataClass.newVerticalDatum
-
                   hDatum[:isDepthSystem] = true
 
                   # depth datum 4.2.2.1 (depthdn) - depth datum name
-                  # -> referenceSystemParameters.verticalDatum.datumIdentifier.identifier
-                  identifier = xDepthSys.xpath('./depthdn').text
-                  unless identifier.empty?
-                     hIdentifier[:identifier] = identifier
+                  # -> referenceSystemParameters.verticalDatum.datumName
+                  datumName = xDepthSys.xpath('./depthdn').text
+                  unless datumName.empty?
+                     hDatum[:datumName] = datumName
                   end
 
                   # depth datum 4.2.2.2 (depthres) - depth resolution [] (take first)
@@ -53,7 +51,6 @@ module ADIWG
 
                   hParamSet = intMetadataClass.newReferenceSystemParameterSet
                   hRefSystem = intMetadataClass.newSpatialReferenceSystem
-                  hDatum[:datumIdentifier] = hIdentifier
                   hParamSet[:verticalDatum] = hDatum
                   hRefSystem[:systemParameterSet] = hParamSet
                   return hRefSystem

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_geodetic.rb

@@ -0,0 +1,95 @@
+# unpack spatial reference system ellipsoid
+# Reader - ADIwg JSON to internal data structure
+
+# History:
+# 	Stan Smith 2017-10-23 original script
+
+require_relative 'module_identifier'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module MdJson
+
+            module Geodetic
+
+               def self.unpack(hGeodetic, responseObj)
+
+                  # return nil object if input is empty
+                  if hGeodetic.empty?
+                     responseObj[:readerExecutionMessages] << 'Geodetic object is empty'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intGeodetic = intMetadataClass.newGeodetic
+
+                  # geodetic - datum identifier {identifier}
+                  if hGeodetic.has_key?('datumIdentifier')
+                     unless hGeodetic['datumIdentifier'].empty?
+                        hReturn = Identifier.unpack(hGeodetic['datumIdentifier'], responseObj)
+                        unless hReturn.nil?
+                           intGeodetic[:datumIdentifier] = hReturn
+                        end
+                     end
+                  end
+
+                  # geodetic - datum name
+                  if hGeodetic.has_key?('datumName')
+                     if hGeodetic['datumName'] != ''
+                        intGeodetic[:datumName] = hGeodetic['datumName']
+                     end
+                  end
+
+                  # geodetic - ellipsoid identifier {identifier}
+                  if hGeodetic.has_key?('ellipsoidIdentifier')
+                     unless hGeodetic['ellipsoidIdentifier'].empty?
+                        hReturn = Identifier.unpack(hGeodetic['ellipsoidIdentifier'], responseObj)
+                        unless hReturn.nil?
+                           intGeodetic[:ellipsoidIdentifier] = hReturn
+                        end
+                     end
+                  end
+
+                  # geodetic - ellipsoid name (required)
+                  if hGeodetic.has_key?('ellipsoidName')
+                     intGeodetic[:ellipsoidName] = hGeodetic['ellipsoidName']
+                  end
+                  if intGeodetic[:ellipsoidName].nil? || intGeodetic[:ellipsoidName] == ''
+                     responseObj[:readerExecutionMessages] << 'Ellipsoid name is missing'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
+
+                  # geodetic - semi-major axis
+                  if hGeodetic.has_key?('semiMajorAxis')
+                     if hGeodetic['semiMajorAxis'] != ''
+                        intGeodetic[:semiMajorAxis] = hGeodetic['semiMajorAxis']
+                     end
+                  end
+
+                  # geodetic - axis units
+                  if hGeodetic.has_key?('axisUnits')
+                     if hGeodetic['axisUnits'] != ''
+                        intGeodetic[:axisUnits] = hGeodetic['axisUnits']
+                     end
+                  end
+
+                  # geodetic - denominator of flattening ratio
+                  if hGeodetic.has_key?('denominatorOfFlatteningRatio')
+                     if hGeodetic['denominatorOfFlatteningRatio'] != ''
+                        intGeodetic[:denominatorOfFlatteningRatio] = hGeodetic['denominatorOfFlatteningRatio']
+                     end
+                  end
+
+                  return intGeodetic
+               end
+
+            end
+
+         end
+      end
+   end
+end

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

@@ -71,20 +71,7 @@ module ADIWG
                      end
                   end
 
-                  # if keywordType is 'isoTopicCategory'
-                  # resourceInfo.topicCategory [] << keyword
-                  topicArray = []
-                  if hKeyword.has_key?('keywordType')
-                     if hKeyword['keywordType'] == 'isoTopicCategory'
-                        hKeyword['keyword'].each do |hItem|
-                           unless hItem.empty?
-                              topicArray << hItem['keyword']
-                           end
-                        end
-                     end
-                  end
-
-                  return intKeyword, topicArray
+                  return intKeyword
 
                end
 

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_projectionParameters.rb

@@ -37,20 +37,41 @@ module ADIWG
                      end
                   end
 
-                  # projection parameters - projection name (required)
-                  if hProjection.has_key?('projectionName')
-                     intProjection[:projectionName] = hProjection['projectionName']
+                  # projection parameters - grid system
+                  if hProjection.has_key?('gridSystem')
+                     if hProjection['gridSystem'] != ''
+                        intProjection[:gridSystem] = hProjection['gridSystem']
+                     end
+                  end
+
+                  # projection parameters - grid system name
+                  if hProjection.has_key?('gridSystemName')
+                     if hProjection['gridSystemName'] != ''
+                        intProjection[:gridSystemName] = hProjection['gridSystemName']
+                     end
                   end
-                  if intProjection[:projectionName].nil? || intProjection[:projectionName] == ''
-                     responseObj[:readerExecutionMessages] << 'Projection name is missing'
+
+                  # projection parameters - projection (required)
+                  if hProjection.has_key?('projection')
+                     intProjection[:projection] = hProjection['projection']
+                  end
+                  if intProjection[:projection].nil? || intProjection[:projection] == ''
+                     responseObj[:readerExecutionMessages] << 'Spatial Reference Projection is missing'
                      responseObj[:readerExecutionPass] = false
                      return nil
                   end
 
+                  # projection parameters - projection name
+                  if hProjection.has_key?('projectionName')
+                     if hProjection['projectionName'] != ''
+                        intProjection[:projectionName] = hProjection['projectionName']
+                     end
+                  end
+
                   # projection parameters - zone
-                  if hProjection.has_key?('zone')
-                     if hProjection['zone'] != ''
-                        intProjection[:zone] = hProjection['zone']
+                  if hProjection.has_key?('gridZone')
+                     if hProjection['gridZone'] != ''
+                        intProjection[:gridZone] = hProjection['gridZone']
                      end
                   end
 

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_referenceSystemParameters.rb

@@ -5,7 +5,7 @@
 # 	Stan Smith 2017-10-23 original script
 
 require_relative 'module_projectionParameters'
-require_relative 'module_ellipsoid'
+require_relative 'module_geodetic'
 require_relative 'module_verticalDatum'
 
 module ADIWG
@@ -39,11 +39,11 @@ module ADIWG
                   end
 
                   # reference system parameters - ellipsoid parameters
-                  if hParams.has_key?('ellipsoid')
-                     unless hParams['ellipsoid'].empty?
-                        hReturn = Ellipsoid.unpack(hParams['ellipsoid'], responseObj)
+                  if hParams.has_key?('geodetic')
+                     unless hParams['geodetic'].empty?
+                        hReturn = Geodetic.unpack(hParams['geodetic'], responseObj)
                         unless hReturn.nil?
-                           intParamSet[:ellipsoid] = hReturn
+                           intParamSet[:geodetic] = hReturn
                         end
                      end
                   end

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_resourceInfo.rb

@@ -6,6 +6,7 @@
 #                    ... topic category is now handled as keyword list
 #  Stan Smith 2016-11-01 original script
 
+require 'adiwg/mdtranslator/internal/internal_metadata_obj'
 require_relative 'module_resourceType'
 require_relative 'module_citation'
 require_relative 'module_timePeriod'
@@ -139,8 +140,20 @@ module ADIWG
                   # resource information - topic category (deprecated)
                   if hResInfo.has_key?('topicCategory')
                      unless hResInfo['topicCategory'].empty?
+                        # move topicCategories to keywordObject
+                        hKeyword = {}
+                        hKeyword['keyword'] = []
+                        hKeyword['keywordType'] = 'isoTopicCategory'
+                        hResInfo['topicCategory'].each do |keyword|
+                           hKeywordObj = {}
+                           hKeywordObj['keyword'] = keyword
+                           hKeyword['keyword'] << hKeywordObj
+                        end
+                        hReturn = Keyword.unpack(hKeyword, responseObj)
+                        unless hReturn.nil?
+                           intResInfo[:keywords] << hReturn[0]
+                        end
                         responseObj[:readerExecutionMessages] << 'TopicCategory is deprecated, use keyword type isoTopicCategory instead'
-                        responseObj[:readerExecutionPass] = false
                      end
                   end
 
@@ -274,8 +287,7 @@ module ADIWG
                      aItems.each do |item|
                         hReturn = Keyword.unpack(item, responseObj)
                         unless hReturn.nil?
-                           intResInfo[:keywords] << hReturn[0]
-                           intResInfo[:topicCategories] = intResInfo[:topicCategories] | hReturn[1]
+                           intResInfo[:keywords] << hReturn
                         end
                      end
                   end

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_spatialReference.rb

@@ -2,6 +2,7 @@
 # Reader - ADIwg JSON to internal data structure
 
 # History:
+#  Stan Smith 2018-01-10 added reference system WKT
 #  Stan Smith 2017-10-23 added reference system parameter set
 #  Stan Smith 2016-10-16 refactored for mdJson 2.0
 #  Stan Smith 2015-07-14 refactored to remove global namespace constants
@@ -32,10 +33,13 @@ module ADIWG
                   intMetadataClass = InternalMetadata.new
                   intSpatialRef = intMetadataClass.newSpatialReferenceSystem
 
+                  haveSystem = false
+
                   # spatial reference system - type
                   if hSpatialRef.has_key?('referenceSystemType')
                      if hSpatialRef['referenceSystemType'] != ''
                         intSpatialRef[:systemType] = hSpatialRef['referenceSystemType']
+                        haveSystem = true
                      end
                   end
 
@@ -46,10 +50,19 @@ module ADIWG
                         hReturn = Identifier.unpack(hObject, responseObj)
                         unless hReturn.nil?
                            intSpatialRef[:systemIdentifier] = hReturn
+                           haveSystem = true
                         end
                      end
                   end
 
+                  # spatial reference system - wkt
+                  if hSpatialRef.has_key?('referenceSystemWKT')
+                     if hSpatialRef['referenceSystemWKT'] != ''
+                        intSpatialRef[:systemWKT] = hSpatialRef['referenceSystemWKT']
+                        haveSystem = true
+                     end
+                  end
+
                   # spatial reference system - reference system parameters {referenceSystemParameterSet}
                   if hSpatialRef.has_key?('referenceSystemParameterSet')
                      hObject = hSpatialRef['referenceSystemParameterSet']
@@ -57,14 +70,13 @@ module ADIWG
                         hReturn = ReferenceSystemParameters.unpack(hObject, responseObj)
                         unless hReturn.nil?
                            intSpatialRef[:systemParameterSet] = hReturn
+                           haveSystem = true
                         end
                      end
                   end
 
-                  if intSpatialRef[:systemType].nil? &&
-                     intSpatialRef[:systemIdentifier].empty? &&
-                     intSpatialRef[:systemParameterSet].empty?
-                     responseObj[:readerExecutionMessages] << 'Spatial Reference System must declare reference system type, identifier, or parameter set'
+                  unless haveSystem
+                     responseObj[:readerExecutionMessages] << 'Spatial Reference System must declare reference system type, identifier, WKT, or parameter set'
                      responseObj[:readerExecutionPass] = false
                      return nil
                   end

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_verticalDatum.rb

@@ -26,7 +26,7 @@ module ADIWG
                   intMetadataClass = InternalMetadata.new
                   intDatum = intMetadataClass.newVerticalDatum
 
-                  # vertical datum - identifier {identifier} (required)
+                  # vertical datum - identifier {identifier}
                   if hDatum.has_key?('datumIdentifier')
                      unless hDatum['datumIdentifier'].empty?
                         hReturn = Identifier.unpack(hDatum['datumIdentifier'], responseObj)
@@ -35,21 +35,16 @@ module ADIWG
                         end
                      end
                   end
-                  if intDatum[:datumIdentifier].empty?
-                     responseObj[:readerExecutionMessages] << 'Vertical Datum Identifier  is missing'
-                     responseObj[:readerExecutionPass] = false
-                     return nil
+
+                  # vertical datum - datum name
+                  if hDatum.has_key?('datumName')
+                     intDatum[:datumName] = hDatum['datumName']
                   end
 
-                  # vertical datum - encoding method (required)
+                  # vertical datum - encoding method
                   if hDatum.has_key?('encodingMethod')
                      intDatum[:encodingMethod] = hDatum['encodingMethod']
                   end
-                  if intDatum[:encodingMethod].nil? || intDatum[:encodingMethod] == ''
-                     responseObj[:readerExecutionMessages] << 'Vertical Datum Encoding Method is missing'
-                     responseObj[:readerExecutionPass] = false
-                     return nil
-                  end
 
                   # vertical datum - is depth system {Boolean} (required)
                   if hDatum.has_key?('isDepthSystem')
@@ -58,25 +53,15 @@ module ADIWG
                      end
                   end
 
-                  # vertical datum - vertical resolution (required)
+                  # vertical datum - vertical resolution
                   if hDatum.has_key?('verticalResolution')
                      intDatum[:verticalResolution] = hDatum['verticalResolution']
                   end
-                  if intDatum[:verticalResolution].nil? || intDatum[:verticalResolution] == ''
-                     responseObj[:readerExecutionMessages] << 'Vertical Resolution is missing'
-                     responseObj[:readerExecutionPass] = false
-                     return nil
-                  end
 
-                  # vertical datum - unit of measure (required)
+                  # vertical datum - unit of measure
                   if hDatum.has_key?('unitOfMeasure')
                      intDatum[:unitOfMeasure] = hDatum['unitOfMeasure']
                   end
-                  if intDatum[:unitOfMeasure].nil? || intDatum[:unitOfMeasure] == ''
-                     responseObj[:readerExecutionMessages] << 'Unit of Measure is missing'
-                     responseObj[:readerExecutionPass] = false
-                     return nil
-                  end
 
                   return intDatum
                end