adiwg-mdtranslator 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95997a263659c300096fdde23a9b106fc0087077
-  data.tar.gz: 2c5744f3015d572bbf3cd42b61edd658351c6120
+  metadata.gz: f63c2f64b279e4dbd888fe4af191291d692440e9
+  data.tar.gz: 37fdda4ca201df46a93d611d8ef3d639cfc684d2
 SHA512:
-  metadata.gz: b367d5f133db2bc2927e0a729028bcf04680bbdc6fbf101c5705a7643ae7b6452b474f1d4bc8d994bef4c82e6e9f63f8f0d1c8245cadd3af5f1764590d98a18d
-  data.tar.gz: d0746f77b488309360f28bfb1b3131eefc3b77b3b2a2a162889511facd5e073113a2cf3bc4541708ae41f2655b8ff53b1255b5920eab4a4286417ee39207a7a5
+  metadata.gz: 9bb5674e9a1e307c07826358dcde39452219c9b415e2cb8b4c4873340863b8802f10d38c29964cf9dc77ae90f0dce3457b2769fba833e85a958743fc00b477e1
+  data.tar.gz: 90e071925c75844fe2203b6177ffc752e91bae66e4f35502c47a4908d8e2a1eefeff68023f49a67153f7cbc52d858c5f92f8c2704618739845e6ae0eed4857d8

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Change Log
 
-## [v2.6.1](https://github.com/adiwg/mdTranslator/tree/v2.6.1)
+## [v2.7.0](https://github.com/adiwg/mdTranslator/tree/v2.7.0)
 
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.6.1...v2.7.0)
+
+**Merged pull requests:**
+
+- Add basic FGDC writer [\#169](https://github.com/adiwg/mdTranslator/pull/169) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.6.1](https://github.com/adiwg/mdTranslator/tree/v2.6.1) (2017-12-05)
 [Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.6.0...v2.6.1)
 
 **Implemented enhancements:**

data/adiwg-mdtranslator.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
    spec.add_runtime_dependency "thor", "~> 0.19"
    spec.add_runtime_dependency "uuidtools", "~> 2.1"
    spec.add_runtime_dependency "json-schema", "~> 2.7"
-   spec.add_runtime_dependency "adiwg-mdjson_schemas", ">= 2.3.2"
+   spec.add_runtime_dependency "adiwg-mdjson_schemas", ">= 2.4.1"
    spec.add_runtime_dependency "adiwg-mdcodes", "~> 2.3.2"
    spec.add_runtime_dependency "jbuilder", "~> 2.5"
    spec.add_runtime_dependency "kramdown", "~> 1.13"

data/lib/adiwg/mdtranslator/internal/internal_metadata_obj.rb

@@ -666,6 +666,7 @@ class InternalMetadata
 
    def newDataSource
       {
+         sourceId: nil,
          description: nil,
          sourceCitation: {},
          metadataCitation: [],
@@ -789,8 +790,8 @@ class InternalMetadata
          domainId: nil,
          minValue: nil,
          maxValue: nil,
-         rangeOfValues: [],
-         timePeriodOfValues: []
+         valueRange: [],
+         timePeriod: []
       }
    end
 

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

@@ -2,7 +2,7 @@
 # unpack fgdc entity attribute
 
 # History:
-#  Stan Smith 2017-10-30 added timePeriodOfValues
+#  Stan Smith 2017-10-30 added timePeriod
 #  Stan Smith 2017-09-06 original script
 
 require 'nokogiri'
@@ -100,8 +100,8 @@ module ADIWG
                   axBegin = xAttribute.xpath('./begdatea')
                   # entity attribute 5.1.2.5 (begdatea) - beginning date of attribute values
                   # entity attribute 5.1.2.6 (enddatea) - ending date of attribute values
-                  # -> dataDictionary.entities.attributes.timePeriodOfValues.startDateTime
-                  # -> dataDictionary.entities.attributes.timePeriodOfValues.endDateTime
+                  # -> dataDictionary.entities.attributes.timePeriod.startDateTime
+                  # -> dataDictionary.entities.attributes.timePeriod.endDateTime
                   axBegin.each_with_index do |xBegin, index|
                      beginDate = xBegin.text
                      unless beginDate.empty?
@@ -116,7 +116,7 @@ module ADIWG
                            hTimePeriod[:endDateTime] = hDateTime
                         end
                         hTimePeriod[:description] = 'attribute date range'
-                        hAttribute[:timePeriodOfValues] << hTimePeriod
+                        hAttribute[:timePeriod] << hTimePeriod
                      end
                   end
 

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

@@ -181,7 +181,7 @@ module ADIWG
                   @contacts = @intObj[:contacts]
                end
 
-               # get internal object for test modules
+               # get internal object
                def self.get_intObj
                   return @intObj
                end

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

@@ -60,14 +60,17 @@ module ADIWG
                   xTimePeriod = xIdInfo.xpath('./timeperd')
                   unless xTimePeriod.empty?
 
+                     # timeInfo currentness
+                     current = xTimePeriod.xpath('./current').text
+
                      # time period for single date, multi-date, and date range {resource timePeriod}
                      hTimePeriod = TimePeriod.unpack(xTimePeriod, hResponseObj)
                      hResourceInfo[:timePeriod] = hTimePeriod unless hTimePeriod.nil?
+                     hResourceInfo[:timePeriod][:description] = current
 
                      # time period multi-date also placed in temporalExtent
                      axMultiple = xTimePeriod.xpath('./timeinfo/mdattim/sngdate')
                      unless axMultiple.empty?
-                        current = xTimePeriod.xpath('./current').text
                         hExtent = intMetadataClass.newExtent
                         hExtent[:description] = 'FGDC resource time period for multiple date/times/geological age'
                         axMultiple.each do |xDateTime|
@@ -129,6 +132,8 @@ module ADIWG
                   hConstraint[:type] = 'legal'
                   hLegal = intMetadataClass.newLegalConstraint
 
+                  hLegal[:accessCodes] << accessCon unless accessCon.empty?
+                  hLegal[:useCodes] << useCon unless useCon.empty?
                   hLegal[:otherCons] << accessCon unless accessCon.empty?
                   hLegal[:otherCons] << useCon unless useCon.empty?
                   unless hLegal[:otherCons].empty?
@@ -147,7 +152,7 @@ module ADIWG
                   end
 
                   # identification information 1.10 (browse) - browse graphic []
-                  axBrowse = xIdInfo.xpath('./browse')
+                  axBrowse = xIdInfo.xpath('//browse')
                   unless axBrowse.empty?
                      axBrowse.each do |xBrowse|
                         browseName = xBrowse.xpath('./browsen').text

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

@@ -2,6 +2,7 @@
 # unpack fgdc keyword
 
 # History:
+#  Stan Smith 2017-12-19 add lineage method keywords
 #  Stan Smith 2017-08-24 original script
 
 require 'nokogiri'
@@ -171,7 +172,7 @@ module ADIWG
                   end
 
                   # keywords bio (keywtax) - taxonomy keywords {keyword}
-                  nodeName = xKeywords.xpath('./*').first.name
+                  nodeName = xKeywords.xpath('.').first.name
                   if nodeName == 'keywtax'
                      hKeyword = intMetadataClass.newKeyword
                      hKeyword[:keywordType] = 'taxon'
@@ -203,6 +204,39 @@ module ADIWG
 
                   end
 
+                  # keywords bio (methodid) - lineage method keywords {keyword}
+                  nodeName = xKeywords.xpath('.').first.name
+                  if nodeName == 'methodid'
+                     hKeyword = intMetadataClass.newKeyword
+                     hKeyword[:keywordType] = 'method'
+
+                     # theme bio.1.1 (methkt) - lineage method keyword thesaurus {citation}
+                     thesaurus = xKeywords.xpath('./methkt').text
+                     unless thesaurus.empty?
+                        hCitation = intMetadataClass.newCitation
+                        hCitation[:title] = thesaurus
+                        hKeyword[:thesaurus] = hCitation
+                     end
+
+                     # theme keyword bio.1.2 (methkey) - lineage method keywords {keywordObject}
+                     axKeywords = xKeywords.xpath('./methkey')
+                     unless axKeywords.empty?
+                        axKeywords.each do |xKeyword|
+                           keyword = xKeyword.text
+                           unless keyword.empty?
+                              hKeywordObj = intMetadataClass.newKeywordObject
+                              hKeywordObj[:keyword] = keyword
+                              hKeyword[:keywords] << hKeywordObj
+                           end
+                        end
+                     end
+
+                     unless hKeyword.empty?
+                        aKeywords << hKeyword
+                     end
+
+                  end
+
                   return aKeywords
 
                end

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

@@ -2,10 +2,12 @@
 # unpack fgdc lineage
 
 # History:
+#  Stan Smith 2017-12-19 add bio methodology
 #  Stan Smith 2017-08-28 original script
 
 require 'nokogiri'
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
+require_relative 'module_methodology'
 require_relative 'module_source'
 require_relative 'module_process'
 
@@ -16,7 +18,7 @@ module ADIWG
 
             module Lineage
 
-               def self.unpack(xLineage, hResourceInfo, hResponseObj)
+               def self.unpack(xLineage, hResponseObj)
 
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
@@ -25,11 +27,17 @@ module ADIWG
                   # data quality 2.5 (lineage) - lineage
                   unless xLineage.empty?
 
+                     # lineage bio (method) - methodology []
+                     axMethods = xLineage.xpath('./method')
+                     unless axMethods.empty?
+                        Method.unpack(hLineage, axMethods, hResponseObj)
+                     end
+
                      # lineage 2.5.1 (srcinfo) - source information []
                      axSource = xLineage.xpath('./srcinfo')
                      unless axSource.empty?
                         axSource.each do |xSource|
-                           hSource = Source.unpack(xSource, hResourceInfo[:spatialResolutions], hResponseObj)
+                           hSource = Source.unpack(xSource, hResponseObj)
                            hLineage[:dataSources] << hSource
                         end
                      end

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

@@ -0,0 +1,69 @@
+# Reader - fgdc to internal data structure
+# unpack fgdc methodology
+
+# History:
+#  Stan Smith 2017-12-19 original script
+
+require 'nokogiri'
+require_relative 'module_fgdc'
+require_relative 'module_keyword'
+require_relative 'module_citation'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module Fgdc
+
+            module Method
+
+               def self.unpack(hLineage, axMethods, hResponseObj)
+
+                  statement = ''
+                  intObj = Fgdc.get_intObj
+                  hResourceInfo = intObj[:metadata][:resourceInfo]
+
+                  axMethods.each do |xMethod|
+
+                     # methodology bio (methtype) - method type (not supported)
+
+                     # methodology bio (methodid) - method identifier [] {keyword}
+                     axKeywords = xMethod.xpath('./methodid')
+                     unless axKeywords.empty?
+                        axKeywords.each do |xKeyword|
+                           Keyword.unpack(xKeyword, hResourceInfo, hResponseObj)
+                        end
+                     end
+
+                     # methodology bio (methdesc) - method description
+                     description = xMethod.xpath('./methdesc').text
+                     unless description.empty?
+                        statement += description + '; '
+                     end
+
+                     # methodology bio (methcite) - method citation [] {citation}
+                     axCitations = xMethod.xpath('./methcite')
+                     unless axCitations.empty?
+                        axCitations.each do |xCitation|
+                           hReturn = Citation.unpack(xCitation, hResponseObj)
+                           unless hReturn.nil?
+                              hLineage[:lineageCitation] << hReturn
+                           end
+                        end
+                     end
+
+                  end
+
+                  unless statement.empty?
+                     statement.chomp!('; ')
+                     hLineage[:statement] = statement
+                  end
+
+                  return hLineage
+
+               end
+            end
+
+         end
+      end
+   end
+end

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

@@ -35,11 +35,9 @@ module ADIWG
                         usedSrc = xUsed.text
                         unless usedSrc.empty?
                            hLineage[:dataSources].each do |hSource|
-                              unless hSource[:sourceCitation].empty?
-                                 hSource[:sourceCitation][:alternateTitles].each do |altTitle|
-                                    if usedSrc == altTitle
-                                       hProcess[:stepSources] << hSource
-                                    end
+                              unless hSource[:sourceId].nil?
+                                 if usedSrc == hSource[:sourceId]
+                                    hProcess[:stepSources] << hSource
                                  end
                               end
                            end
@@ -67,11 +65,9 @@ module ADIWG
                         prodSrc = xProduct.text
                         unless prodSrc.empty?
                            hLineage[:dataSources].each do |hSource|
-                              unless hSource[:sourceCitation].empty?
-                                 hSource[:sourceCitation][:alternateTitles].each do |altTitle|
-                                    if prodSrc == altTitle
-                                       hProcess[:stepProducts] << hSource
-                                    end
+                              unless hSource[:sourceId].nil?
+                                 if prodSrc == hSource[:sourceId]
+                                    hProcess[:stepProducts] << hSource
                                  end
                               end
                            end

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

@@ -17,8 +17,6 @@ module ADIWG
 
                def self.unpack(xDataQual, hMetadata, hResponseObj)
 
-                  hResourceInfo = hMetadata[:resourceInfo]
-
                   # data quality 2.1 (attracc) - attribute accuracy (not implemented)
 
                   # data quality 2.2 (logic) - logical consistency (not implemented)
@@ -30,12 +28,14 @@ module ADIWG
                   # data quality 2.5 (lineage) - lineage
                   xLineage = xDataQual.xpath('./lineage')
                   unless xLineage.empty?
-                     hLineage = Lineage.unpack(xLineage, hResourceInfo, hResponseObj)
+                     hLineage = Lineage.unpack(xLineage, hResponseObj)
                      unless hLineage.nil?
                         hMetadata[:lineageInfo] << hLineage
                      end
                   end
 
+                  # data quality 2.6 (cloud) - cloud cover (not implemented)
+
                   return hMetadata
 
                end

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

@@ -30,11 +30,11 @@ module ADIWG
                      axRanges.each do |xRange|
 
                         hRange = intMetadataClass.newValueRange
-                        hAttribute[:rangeOfValues] << hRange
+                        hAttribute[:valueRange] << hRange
 
                         # entity attribute 5.1.2.4.2.1 (rdommin) - range minimum
                         # -> dataDictionary.entities.attributes.minValue
-                        # -> dataDictionary.entities.attributes.rangeOfValues.minRangeValue
+                        # -> dataDictionary.entities.attributes.valueRange.minRangeValue
                         min = xRange.xpath('./rdommin').text
                         unless min.empty?
                            hRange[:minRangeValue] = min
@@ -52,7 +52,7 @@ module ADIWG
 
                         # entity attribute 5.1.2.4.2.2 (rdommax) - range maximum
                         # -> dataDictionary.entities.attributes.maxValue
-                        # -> dataDictionary.entities.attributes.rangeOfValues.maxRangeValue
+                        # -> dataDictionary.entities.attributes.valueRange.maxRangeValue
                         max = xRange.xpath('./rdommax').text
                         unless max.empty?
                            hRange[:maxRangeValue] = max

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

@@ -30,7 +30,7 @@ module ADIWG
                      hGridInfo[:cellGeometry] = cellGeometry.downcase
                   end
 
-                  # -> make number of dimensions from total occurrence of 3.4.2-4
+                  # -> compute number of dimensions from total occurrence of 3.4.2-4
                   hGridInfo[:numberOfDimensions] = 0
 
                   # raster object 3.4.2 (rowcount) - row count

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

@@ -16,7 +16,7 @@ module ADIWG
 
             module Source
 
-               def self.unpack(xSource, aSpatialResolutions, hResponseObj)
+               def self.unpack(xSource, hResponseObj)
 
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
@@ -34,7 +34,7 @@ module ADIWG
                   unless scale.empty?
                      hResolution = intMetadataClass.newSpatialResolution
                      hResolution[:scaleFactor] = scale.to_i
-                     aSpatialResolutions << hResolution
+                     hSource[:spatialResolution] = hResolution
                   end
 
                   # source 2.5.1.3 (typesrc) - type of source media
@@ -60,9 +60,9 @@ module ADIWG
                   end
 
                   # source 2.5.1.5 (srccitea) - source citation abbreviation
-                  citationAbb = xSource.xpath('./srccitea').text
-                  unless citationAbb.empty?
-                     hSource[:sourceCitation][:alternateTitles] << citationAbb
+                  sourceAbb = xSource.xpath('./srccitea').text
+                  unless sourceAbb.empty?
+                     hSource[:sourceId] = sourceAbb
                   end
 
                   # source 2.5.1.6 (srccontr) - source contribution

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

@@ -22,13 +22,15 @@ module ADIWG
                   intMetadataClass = InternalMetadata.new
 
                   # spatial organization 3.1 (indspref) - indirect spatial reference
-                  # -> resourceInfo.spatialReferenceSystems.spatialReferenceSystem.systemIdentifier.identifier per NOAA
+                  # -> resourceInfo.spatialReferenceSystems.systemIdentifier.identifier per NOAA
                   # -> however definitions are not close
                   indirect = xSpatialOrg.xpath('./indspref').text
                   unless indirect.empty?
                      hSystem = intMetadataClass.newSpatialReferenceSystem
                      hIdentifier = intMetadataClass.newIdentifier
-                     hIdentifier[:identifier] = indirect
+                     hIdentifier[:identifier] = 'indirect'
+                     hIdentifier[:namespace] = 'FGDC'
+                     hIdentifier[:description] = indirect
                      hSystem[:systemIdentifier] = hIdentifier
                      hResourceInfo[:spatialReferenceSystems] << hSystem
                   end
@@ -40,13 +42,13 @@ module ADIWG
                   # -> raster = grid do 3.4
                   direct = xSpatialOrg.xpath('./direct').text
                   unless direct.empty?
-                     type = 'vector' if direct == 'Point'
+                     type = 'point' if direct == 'Point'
                      type = 'vector' if direct == 'Vector'
                      type = 'grid' if direct == 'Raster'
                      hResourceInfo[:spatialRepresentationTypes] << type
 
                      # spatial organization 3.3 (ptvctinfo) - point and vector object
-                     if type == 'vector'
+                     if type == 'vector' || type == 'point'
                         xPtVec = xSpatialOrg.xpath('./ptvctinf')
                         unless xPtVec.empty?
                            PointVector.unpack(xPtVec, hResourceInfo, hResponseObj)