adiwg-mdtranslator 2.13.3 → 2.14.0

data/lib/adiwg/mdtranslator/readers/mdJson/mdJson_reader_messages_eng.yml

@@ -141,7 +141,13 @@ messageList:
    - {id: 301, message: "funding must have either an allocation or timePeriod"}
 
    - {id: 310, message: "geodetic object is empty"}
-   - {id: 311, message: "geodetic ellipsoid name is missing"}
+   - {id: 311, message: "geodetic datum name is deprecated, use datumIdentifier.identifier"}
+   - {id: 312, message: "geodetic ellipsoid name is deprecated, use ellipsoidIdentifier.identifier"}
+   - {id: 313, message: "geodetic datum added new datumIdentifier object"}
+   - {id: 314, message: "geodetic ellipsoid added new ellipsoidIdentifier object"}
+   - {id: 315, message: "geodetic datum name was moved to datumIdentifier.identifier"}
+   - {id: 316, message: "geodetic ellipsoid name was moved to ellipsoidIdentifier.identifier"}
+   - {id: 317, message: "geodetic ellipsoid must have an ellipsoidIdentifier or an ellipsoidIdentifier plus all other elements"}
 
    - {id: 320, message: "geographic extent object is empty"}
    - {id: 321, message: "geographic extent must have at least one description, identifier, bounding box, or geographic element"}
@@ -266,7 +272,7 @@ messageList:
    - {id: 641, message: "process step description is missing"}
 
    - {id: 650, message: "projection parameters object is empty"}
-   - {id: 651, message: "projection parameters projection code is missing"}
+   - {id: 651, message: "projection identifier is missing"}
 
    - {id: 660, message: "reference system parameter set is empty"}
    - {id: 661, message: "reference system parameter set must have at least one projection, geodetic, or vertical datum"}
@@ -281,7 +287,7 @@ messageList:
    - {id: 684, message: "resource status is missing"}
    - {id: 685, message: "topicCategory is deprecated, items were moved to keywords, keywordType 'isoTopicCategory'"}
    - {id: 686, message: "resource point-of-contact is missing"}
-   - {id: 687, message: "taxonomy is now an array, the single taxonomy object was deprecated"}
+   - {id: 687, message: "taxonomy is an array, use of taxonomy object has been deprecated"}
    - {id: 688, message: "resource default locale is missing"}
 
    - {id: 690, message: "resource type object is empty"}
@@ -332,8 +338,11 @@ messageList:
 
    - {id: 830, message: "taxonomy object is empty"}
    - {id: 831, message: "taxonomic classification system object is missing"}
-   - {id: 832, message: "taxonomic identification procedure is missing"}
    - {id: 833, message: "taxonomic classification is missing"}
+   - {id: 834, message: "taxonomic classification is an array, use of taxonomic classification object is deprecated"}
+   - {id: 835, message: "taxonomic identification reference as an identifier is deprecated, use citation"}
+   - {id: 836, message: "taxonomic identification reference authority was substituted for citation"}
+   - {id: 837, message: "taxonomic identification reference authority is empty or missing"}
 
    - {id: 840, message: "temporal extent object is empty"}
    - {id: 841, message: "temporal extent must have a time period or time instant"}
@@ -365,7 +374,11 @@ messageList:
    - {id: 911, message: "vector representation must have a topology level or vector object"}
 
    - {id: 920, message: "vertical datum object is empty"}
-   - {id: 921, message: "vertical datum must have an identifier or all other elements"}
+   - {id: 921, message: "vertical datum must have a datumIdentifier"}
+   - {id: 922, message: "vertical datumName is deprecated, use datumIdentifier.identifier"}
+   - {id: 923, message: "vertical datumName was moved to datumIdentifier.identifier"}
+   - {id: 924, message: "vertical datum must have a datumIdentifier or a datumIdentifier plus all other elements"}
+   - {id: 925, message: "vertical datum added new datumIdentifier object"}
 
    - {id: 930, message: "vertical extent object is empty"}
    - {id: 931, message: "vertical extent minimum value is missing"}
@@ -375,3 +388,5 @@ messageList:
    - {id: 940, message: "voucher object is empty"}
    - {id: 941, message: "voucher specimen is missing"}
    - {id: 942, message: "voucher repository is missing"}
+
+   - {id: 950, message: "local projection object is empty"}

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

@@ -2,6 +2,7 @@
 # Reader - ADIwg JSON to internal data structure
 
 # History:
+#  Stan Smith 2018-09-26 deprecated datumName and ellipseName
 #  Stan Smith 2018-06-19 refactored error and warning messaging
 # 	Stan Smith 2017-10-23 original script
 
@@ -41,10 +42,18 @@ module ADIWG
                      end
                   end
 
-                  # geodetic - datum name
+                  # TODO remove when mdJson version 3
+                  # geodetic - datum name (deprecated), move to datumIdentifier
+                  # skip datumName if identifier is already present
                   if hGeodetic.has_key?('datumName')
                      unless hGeodetic['datumName'] == ''
-                        intGeodetic[:datumName] = hGeodetic['datumName']
+                        @MessagePath.issueWarning(311, responseObj, inContext)
+                        if intGeodetic[:datumIdentifier].empty?
+                           intGeodetic[:datumIdentifier] = intMetadataClass.newIdentifier
+                           intGeodetic[:datumIdentifier][:identifier] = hGeodetic['datumName']
+                           @MessagePath.issueNotice(313, responseObj, inContext)
+                           @MessagePath.issueNotice(315, responseObj, inContext)
+                        end
                      end
                   end
 
@@ -58,25 +67,36 @@ module ADIWG
                      end
                   end
 
-                  # geodetic - ellipsoid name (required)
+                  # TODO remove when mdJson version 3
+                  # geodetic - ellipsoid name (deprecated), move to ellipsoidIdentifier
+                  # skip ellipsoidName if identifier is already present
                   if hGeodetic.has_key?('ellipsoidName')
-                     intGeodetic[:ellipsoidName] = hGeodetic['ellipsoidName']
-                  end
-                  if intGeodetic[:ellipsoidName].nil? || intGeodetic[:ellipsoidName] == ''
-                     @MessagePath.issueError(311, responseObj, inContext)
+                     unless hGeodetic['ellipsoidName'] == ''
+                        @MessagePath.issueWarning(312, responseObj, inContext)
+                        if intGeodetic[:ellipsoidIdentifier].empty?
+                           intGeodetic[:ellipsoidIdentifier] = intMetadataClass.newIdentifier
+                           intGeodetic[:ellipsoidIdentifier][:identifier] = hGeodetic['ellipsoidName']
+                           @MessagePath.issueNotice(314, responseObj, inContext)
+                           @MessagePath.issueNotice(316, responseObj, inContext)
+                        end
+                     end
                   end
 
+                  haveOthers = 0
+
                   # geodetic - semi-major axis
                   if hGeodetic.has_key?('semiMajorAxis')
                      unless hGeodetic['semiMajorAxis'] == ''
                         intGeodetic[:semiMajorAxis] = hGeodetic['semiMajorAxis']
+                        haveOthers += 1
                      end
                   end
 
                   # geodetic - axis units
                   if hGeodetic.has_key?('axisUnits')
-                     unless['axisUnits'] == ''
+                     unless hGeodetic['axisUnits'] == ''
                         intGeodetic[:axisUnits] = hGeodetic['axisUnits']
+                        haveOthers += 1
                      end
                   end
 
@@ -84,10 +104,23 @@ module ADIWG
                   if hGeodetic.has_key?('denominatorOfFlatteningRatio')
                      unless hGeodetic['denominatorOfFlatteningRatio'] == ''
                         intGeodetic[:denominatorOfFlatteningRatio] = hGeodetic['denominatorOfFlatteningRatio']
+                        haveOthers += 1
+                     end
+                  end
+
+                  # error messages
+                  if intGeodetic[:ellipsoidIdentifier].empty?
+                     unless haveOthers == 0
+                        @MessagePath.issueError(317, responseObj, inContext)
+                     end
+                  else
+                     unless haveOthers == 0 || haveOthers == 3
+                        @MessagePath.issueError(317, responseObj, inContext)
                      end
                   end
 
                   return intGeodetic
+
                end
 
             end

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

@@ -0,0 +1,57 @@
+# unpack spatial reference system parameter oblique line point
+# Reader - ADIwg JSON to internal data structure
+
+# History:
+#  Stan Smith 2018-10-08 original script
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module MdJson
+
+            module LocalProjection
+
+               def self.unpack(hLocal, responseObj, inContext = nil)
+
+                  @MessagePath = ADIWG::Mdtranslator::Readers::MdJson::MdJson
+
+                  # return nil object if input is empty
+                  if hLocal.empty?
+                     @MessagePath.issueWarning(950, responseObj, inContext)
+                     return nil
+                  end
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intLocal = intMetadataClass.newLocal
+
+                  # local projection - fixed to earth (required) {boolean default = true}
+                  if hLocal.has_key?('fixedToEarth')
+                     if hLocal['fixedToEarth'] === false
+                        intLocal[:fixedToEarth] = false
+                     end
+                  end
+
+                  # local projection - description
+                  if hLocal.has_key?('description')
+                     unless hLocal['description'] == ''
+                        intLocal[:description] = hLocal['description']
+                     end
+                  end
+
+                  # local projection - georeference
+                  if hLocal.has_key?('georeference')
+                     unless hLocal['georeference'] == ''
+                        intLocal[:georeference] = hLocal['georeference']
+                     end
+                  end
+
+                  return intLocal
+               end
+
+            end
+
+         end
+      end
+   end
+end

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

@@ -27,18 +27,18 @@ module ADIWG
                   intLinePoint = intMetadataClass.newObliqueLinePoint
 
                   # oblique line point - azimuth line latitude (required)
-                  if hLinePt.has_key?('azimuthLineLatitude')
-                     intLinePoint[:azimuthLineLatitude] = hLinePt['azimuthLineLatitude']
+                  if hLinePt.has_key?('obliqueLineLatitude')
+                     intLinePoint[:obliqueLineLatitude] = hLinePt['obliqueLineLatitude']
                   end
-                  if intLinePoint[:azimuthLineLatitude].nil? || intLinePoint[:azimuthLineLatitude] == ''
+                  if intLinePoint[:obliqueLineLatitude].nil? || intLinePoint[:obliqueLineLatitude] == ''
                      @MessagePath.issueError(591, responseObj, inContext)
                   end
 
                   # oblique line point - azimuth line longitude (required)
-                  if hLinePt.has_key?('azimuthLineLongitude')
-                     intLinePoint[:azimuthLineLongitude] = hLinePt['azimuthLineLongitude']
+                  if hLinePt.has_key?('obliqueLineLongitude')
+                     intLinePoint[:obliqueLineLongitude] = hLinePt['obliqueLineLongitude']
                   end
-                  if intLinePoint[:azimuthLineLongitude].nil? || intLinePoint[:azimuthLineLongitude] == ''
+                  if intLinePoint[:obliqueLineLongitude].nil? || intLinePoint[:obliqueLineLongitude] == ''
                      @MessagePath.issueError(592, responseObj, inContext)
                   end
 

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

@@ -2,11 +2,13 @@
 # Reader - ADIwg JSON to internal data structure
 
 # History:
+#  Stan Smith 2018-10-08 refactor mdJson projection object
 #  Stan Smith 2018-06-22 refactored error and warning messaging
 # 	Stan Smith 2017-10-23 original script
 
 require_relative 'module_identifier'
 require_relative 'module_obliqueLinePoint'
+require_relative 'module_localProjection'
 
 module ADIWG
    module Mdtranslator
@@ -30,44 +32,42 @@ module ADIWG
                   intProjection = intMetadataClass.newProjection
 
                   outContext = 'projection parameters'
-                  outContext = inContext + ' > ' + outContext unless inContext.nil?
+                  outContext = inContext + ' ' + outContext unless inContext.nil?
 
-                  # projection parameters - projection identifier {identifier}
+                  # projection parameters - projection identifier {identifier} (required)
+                  # add name to identifier object
                   if hProjection.has_key?('projectionIdentifier')
                      unless hProjection['projectionIdentifier'].empty?
-                        hReturn = Identifier.unpack(hProjection['projectionIdentifier'], responseObj, outContext)
+                        hProjectionId = hProjection['projectionIdentifier']
+                        hReturn = Identifier.unpack(hProjectionId, responseObj, outContext)
                         unless hReturn.nil?
+                           if hProjectionId.has_key?('name')
+                              unless hProjectionId['name'] == ''
+                                 hReturn[:name] = hProjectionId['name']
+                              end
+                           end
                            intProjection[:projectionIdentifier] = hReturn
                         end
                      end
                   end
-
-                  # projection parameters - grid system
-                  if hProjection.has_key?('gridSystem')
-                     unless hProjection['gridSystem'] == ''
-                        intProjection[:gridSystem] = hProjection['gridSystem']
-                     end
-                  end
-
-                  # projection parameters - grid system name
-                  if hProjection.has_key?('gridSystemName')
-                     unless hProjection['gridSystemName'] == ''
-                        intProjection[:gridSystemName] = hProjection['gridSystemName']
-                     end
-                  end
-
-                  # projection parameters - projection (required)
-                  if hProjection.has_key?('projection')
-                     intProjection[:projection] = hProjection['projection']
-                  end
-                  if intProjection[:projection].nil? || intProjection[:projection] == ''
+                  if intProjection[:projectionIdentifier].empty?
                      @MessagePath.issueError(651, responseObj, inContext)
                   end
 
-                  # projection parameters - projection name
-                  if hProjection.has_key?('projectionName')
-                     unless hProjection['projectionName'] == ''
-                        intProjection[:projectionName] = hProjection['projectionName']
+                  # projection parameters - grid system identifier {identifier}
+                  # add name to identifier object
+                  if hProjection.has_key?('gridIdentifier')
+                     unless hProjection['gridIdentifier'].empty?
+                        hGridSystemId = hProjection['gridIdentifier']
+                        hReturn = Identifier.unpack(hProjection['gridIdentifier'], responseObj, outContext)
+                        unless hReturn.nil?
+                           if hGridSystemId.has_key?('name')
+                              unless hGridSystemId['name'] == ''
+                                 hReturn[:name] = hGridSystemId['name']
+                              end
+                           end
+                           intProjection[:gridIdentifier] = hReturn
+                        end
                      end
                   end
 
@@ -137,7 +137,8 @@ module ADIWG
                   # projection parameters - height of prospective point above surface
                   if hProjection.has_key?('heightOfProspectivePointAboveSurface')
                      unless hProjection['heightOfProspectivePointAboveSurface'] == ''
-                        intProjection[:heightOfProspectivePointAboveSurface] = hProjection['heightOfProspectivePointAboveSurface'].to_f
+                        intProjection[:heightOfProspectivePointAboveSurface] =
+                           hProjection['heightOfProspectivePointAboveSurface']
                      end
                   end
 
@@ -222,31 +223,13 @@ module ADIWG
                      end
                   end
 
-                  # projection parameters - local planar description
-                  if hProjection.has_key?('localPlanarDescription')
-                     unless hProjection['localPlanarDescription'] == ''
-                        intProjection[:localPlanarDescription] = hProjection['localPlanarDescription']
-                     end
-                  end
-
-                  # projection parameters - local planar georeference
-                  if hProjection.has_key?('localPlanarGeoreference')
-                     unless hProjection['localPlanarGeoreference'] == ''
-                        intProjection[:localPlanarGeoreference] = hProjection['localPlanarGeoreference']
-                     end
-                  end
-
-                  # projection parameters - other projection description
-                  if hProjection.has_key?('otherProjectionDescription')
-                     unless hProjection['otherProjectionDescription'] == ''
-                        intProjection[:otherProjectionDescription] = hProjection['otherProjectionDescription']
-                     end
-                  end
-
-                  # projection parameters - other grid description
-                  if hProjection.has_key?('otherGridDescription')
-                     unless hProjection['otherGridDescription'] == ''
-                        intProjection[:otherGridDescription] = hProjection['otherGridDescription']
+                  # projection parameters - local projection [] {local}
+                  if hProjection.has_key?('local')
+                     unless hProjection['local'].empty?
+                        hReturn = LocalProjection.unpack(hProjection['local'], responseObj, outContext)
+                        unless hReturn.nil?
+                           intProjection[:local] = hReturn
+                        end
                      end
                   end
 

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

@@ -31,7 +31,7 @@ module ADIWG
                   intParamSet = intMetadataClass.newReferenceSystemParameterSet
 
                   outContext = 'reference system parameter set'
-                  outContext = inContext + ' > ' + outContext unless inContext.nil?
+                  outContext = inContext + ' ' + outContext unless inContext.nil?
 
                   haveParams = false
 

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

@@ -2,11 +2,14 @@
 # Reader - ADIwg JSON to internal data structure
 
 # History:
+#  Stan Smith 2018-10-27 change identification reference to citation
+#  Stan Smith 2018-10-27 identification procedure no longer required
+#  Stan Smith 2018-10-19 refactor taxonomic classification as array
 #  Stan Smith 2018-06-26 refactored error and warning messaging
 #  Stan Smith 2016-10-22 original script
 
 require_relative 'module_taxonomicSystem'
-require_relative 'module_identifier'
+require_relative 'module_citation'
 require_relative 'module_responsibleParty'
 require_relative 'module_voucher'
 require_relative 'module_taxonomicClassification'
@@ -53,12 +56,29 @@ module ADIWG
                      end
                   end
 
-                  # taxonomy - identification reference [{identifier}]
+                  # taxonomy - identification reference [{citation}]
+                  # identification reference as an identifier is now deprecated
                   if hTaxonomy.has_key?('identificationReference')
                      aItems = hTaxonomy['identificationReference']
                      aItems.each do |hItem|
                         unless hItem.empty?
-                           hReturn = Identifier.unpack(hItem, responseObj)
+                           if hItem.has_key?('identifier')
+                              @MessagePath.issueNotice(835, responseObj)
+                              if hItem.has_key?('authority')
+                                 hCitation = hItem['authority']
+                                 @MessagePath.issueNotice(836, responseObj)
+                                 if hCitation.empty?
+                                    @MessagePath.issueNotice(837, responseObj)
+                                    break
+                                 end
+                              else
+                                 @MessagePath.issueNotice(837, responseObj)
+                                 break
+                              end
+                           else
+                              hCitation = hItem
+                           end
+                           hReturn = Citation.unpack(hCitation, responseObj)
                            unless hReturn.nil?
                               intTaxonomy[:idReferences] << hReturn
                            end
@@ -77,15 +97,12 @@ module ADIWG
                      end
                   end
 
-                  # taxonomy - identification procedure (required)
+                  # taxonomy - identification procedure
                   if hTaxonomy.has_key?('identificationProcedure')
                      unless hTaxonomy['identificationProcedure'] == ''
                         intTaxonomy[:idProcedure] = hTaxonomy['identificationProcedure']
                      end
                   end
-                  if intTaxonomy[:idProcedure].nil? || intTaxonomy[:idProcedure] == ''
-                     @MessagePath.issueError(832, responseObj)
-                  end
 
                   # taxonomy - identification completeness
                   if hTaxonomy.has_key?('identificationCompleteness')
@@ -105,17 +122,26 @@ module ADIWG
                      end
                   end
 
-                  # taxonomy - taxonomic classification {taxonomicClassification} (required)
+                  # taxonomy - taxonomic classification [] {taxonomicClassification} (required)
+                  # support deprecated taxonomicClassification{}
                   if hTaxonomy.has_key?('taxonomicClassification')
-                     item = hTaxonomy['taxonomicClassification']
-                     unless item.empty?
-                        hReturn = TaxonomicClassification.unpack(item, responseObj)
+                     aItems = hTaxonomy['taxonomicClassification']
+                     if aItems.is_a?(Array)
+                        aItems.each do |item|
+                           hReturn = TaxonomicClassification.unpack(item, responseObj)
+                           unless hReturn.nil?
+                              intTaxonomy[:taxonClasses] << hReturn
+                           end
+                        end
+                     else
+                        hReturn = TaxonomicClassification.unpack(aItems, responseObj)
                         unless hReturn.nil?
-                           intTaxonomy[:taxonClass] = hReturn
+                           intTaxonomy[:taxonClasses] << hReturn
                         end
+                        @MessagePath.issueNotice(834, responseObj)
                      end
                   end
-                  if intTaxonomy[:taxonClass].empty?
+                  if intTaxonomy[:taxonClasses].empty?
                      @MessagePath.issueError(833, responseObj)
                   end
 

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

@@ -2,6 +2,7 @@
 # Reader - ADIwg JSON to internal data structure
 
 # History:
+#  Stan Smith 2018-09-26 datumName is deprecated, use datumIdentifier.identifier
 #  Stan Smith 2018-06-27 refactored error and warning messaging
 # 	Stan Smith 2017-10-23 original script
 
@@ -31,7 +32,7 @@ module ADIWG
                   outContext = 'vertical datum'
                   outContext = inContext + ' > ' + outContext unless inContext.nil?
 
-                  # vertical datum - identifier {identifier}
+                  # vertical datum - identifier {identifier} (required)
                   if hDatum.has_key?('datumIdentifier')
                      unless hDatum['datumIdentifier'].empty?
                         hReturn = Identifier.unpack(hDatum['datumIdentifier'], responseObj, outContext)
@@ -40,17 +41,27 @@ module ADIWG
                         end
                      end
                   end
+                  if intDatum[:datumIdentifier].empty?
+                     @MessagePath.issueError(921, responseObj, inContext)
+                  end
 
-                  haveOthers  = 0
-
-                  # vertical datum - datum name
+                  # TODO remove when mdJson version 3
+                  # vertical datum - datum name (deprecated), move to datumIdentifier
+                  # skip datumName if identifier is already present
                   if hDatum.has_key?('datumName')
                      unless hDatum['datumName'] == ''
-                        intDatum[:datumName] = hDatum['datumName']
-                        haveOthers += 1
+                        @MessagePath.issueWarning(922, responseObj, inContext)
+                        if intDatum[:datumIdentifier].empty?
+                           intDatum[:datumIdentifier] = intMetadataClass.newIdentifier
+                           intDatum[:datumIdentifier][:identifier] = hDatum['datumName']
+                           @MessagePath.issueNotice(925, responseObj, inContext)
+                           @MessagePath.issueNotice(923, responseObj, inContext)
+                        end
                      end
                   end
 
+                  haveOthers  = 0
+
                   # vertical datum - encoding method
                   if hDatum.has_key?('encodingMethod')
                      unless hDatum['encodingMethod'] == ''
@@ -83,11 +94,12 @@ module ADIWG
                   end
 
                   # error messages
-                  if intDatum[:datumIdentifier].empty? && haveOthers != 4
-                     @MessagePath.issueError(921, responseObj, inContext)
+                  unless haveOthers == 0 || haveOthers == 3
+                     @MessagePath.issueError(924, responseObj, inContext)
                   end
 
                   return intDatum
+
                end
 
             end

data/lib/adiwg/mdtranslator/version.rb

@@ -1,6 +1,16 @@
 # adiwg mdTranslator
 
 # version 2 history
+# 2.14.0 2018-10-27 refactor taxonomy for multiple taxonomic classifications
+# 2.14.0 2018-10-27 refactor taxonomy for identification reference as citation
+# 2.14.0 2018-10-27 refactor taxonomy for identification procedures not required
+# 2.14.0 2018-10-27 refactor spatial reference for reorganized parameter set
+# 2.13.4 2018-09-28 add budget sourceId and recipientId to sbJSON contacts list
+# 2.13.4 2018-09-26 deprecated ellipsoidName from geodetic, use ellipsoidIdentifier
+# 2.13.4 2018-09-26 deprecated datumName from geodetic, use datumIdentifier
+# 2.13.4 2018-09-26 deprecated datumName from verticalDatum object, use datumIdentifier
+# 2.13.4 2018-09-26 change azimuthLineLongitude to obliqueLineLongitude
+# 2.13.4 2018-09-26 change azimuthLineLatitude to obliqueLineLatitude
 # 2.13.3 2018-09-06 bug fix #201 change crossReference processing to an array
 # 2.13.3 2018-09-05 bug fix #202 skip responsibility contacts in associatedResource for sbJson
 # 2.13.2 2018-07-31 fix timeInterval check to allow real and integer
@@ -91,7 +101,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.13.3"
+      VERSION = "2.14.0"
    end
 end
 

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_geodeticReference.rb

@@ -2,6 +2,7 @@
 # FGDC CSDGM writer output in XML
 
 # History:
+#  Stan Smith 2018-09-27 deprecated datumName and ellipsoidName
 #  Stan Smith 2018-03-18 refactored error and warning messaging
 #  Stan Smith 2018-01-15 original script
 
@@ -20,21 +21,21 @@ module ADIWG
                   @NameSpace = ADIWG::Mdtranslator::Writers::Fgdc
                end
 
-               def writeXML(hGeodetic)
+               def writeXML(hGeodetic, inContext = nil)
 
                   # geodetic reference system 4.1.4.1 (horizdn) - horizontal datum name
-                  unless hGeodetic[:datumName].nil?
-                     @xml.tag!('horizdn', hGeodetic[:datumName])
+                  unless hGeodetic[:datumIdentifier].empty?
+                     @xml.tag!('horizdn', hGeodetic[:datumIdentifier][:identifier])
                   end
-                  if hGeodetic[:datumName].nil? && @hResponseObj[:writerShowTags]
+                  if hGeodetic[:datumIdentifier].empty? && @hResponseObj[:writerShowTags]
                      @xml.tag!('horizdn')
                   end
 
                   # geodetic reference system 4.1.4.2 (ellips) - ellipsoid name (required)
-                  unless hGeodetic[:ellipsoidName].nil?
-                     @xml.tag!('ellips', hGeodetic[:ellipsoidName])
+                  unless hGeodetic[:ellipsoidIdentifier].empty?
+                     @xml.tag!('ellips', hGeodetic[:ellipsoidIdentifier][:identifier])
                   end
-                  if hGeodetic[:ellipsoidName].nil?
+                  if hGeodetic[:ellipsoidIdentifier].nil?
                      @NameSpace.issueWarning(150, 'ellips')
                   end
 

data/lib/adiwg/mdtranslator/writers/fgdc/classes/class_geographicResolution.rb

@@ -20,7 +20,7 @@ module ADIWG
                   @NameSpace = ADIWG::Mdtranslator::Writers::Fgdc
                end
 
-               def writeXML(hGeoRes)
+               def writeXML(hGeoRes, inContext = nil)
                   
                   # horizontal reference 4.1.1 (geograph) - geographic resolution