adiwg-mdtranslator 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20d12fe84ddfccbe18ea8ee3a2d4c28aedc471fd
-  data.tar.gz: 47d8c57d4668555bcf4b15ca67099675a9a8e9f4
+  metadata.gz: 8f08c8cabea92742e77f01c30ae68550da7a583d
+  data.tar.gz: 8963e33ca95184476f15d4c8e94834b3466c9c08
 SHA512:
-  metadata.gz: a3b11672f637c332273913e9d88005b88427c98cec0dc5d96275ec6f6823f5ceaffd0a1940988a14829ccec53476d19d6936fe68f65fde25af8dbc8e2a9d127f
-  data.tar.gz: d00a5b73bd938e76f396e996eca3ddf0a555b3cdb806950f50d8d29e127ce292a40dcb646721643cb1b64019f65603d00724a337780575a5e666c16de6ea0fd4
+  metadata.gz: '09dd47945d0989ceaa90dbc46a435af71f4d1f36ce8d54f5e81d02ed57d64ee8a9c75af7dcbded016f9b47fd72b2bf7181c7479a3f06905911051f5b047c866f'
+  data.tar.gz: 85cba08c6d6dadae7eb549cca69a08d3a2323924ebae6ce4b8faca4483f182484c25b4f5301f855bb21694b5de2868610435c3e4bfad4a9fae7af5ef018eebe3

data/CHANGELOG.md

@@ -1,7 +1,57 @@
 # Change Log
 
-## [v2.3.3](https://github.com/adiwg/mdTranslator/tree/v2.3.3) (2017-10-11)
+## [v2.5.0](https://github.com/adiwg/mdTranslator/tree/v2.5.0) (2017-11-06)
+
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.4.0...v2.5.0)
+
+**Fixed bugs:**
+
+- Tests failing with seed 30538 [\#157](https://github.com/adiwg/mdTranslator/issues/157)
+- sbJSON writer should only write parentId with proper namespace [\#154](https://github.com/adiwg/mdTranslator/issues/154)
+
+**Closed issues:**
+
+- fgdc spatial reference - resolution [\#147](https://github.com/adiwg/mdTranslator/issues/147)
+- fgdc bio ASCII file format [\#143](https://github.com/adiwg/mdTranslator/issues/143)
+- fgdc bio bounding box altitude [\#140](https://github.com/adiwg/mdTranslator/issues/140)
+- fgdc entity-attribute multiple domain definitions [\#130](https://github.com/adiwg/mdTranslator/issues/130)
+- fgdc entity-attribute information not supported by mdJson/mdTranslator [\#129](https://github.com/adiwg/mdTranslator/issues/129)
+- fgdc spatial reference information [\#127](https://github.com/adiwg/mdTranslator/issues/127)
+- fgdc lineage source datasets [\#122](https://github.com/adiwg/mdTranslator/issues/122)
+- fgdc bio Spatial Domain geographic description [\#115](https://github.com/adiwg/mdTranslator/issues/115)
+
+**Merged pull requests:**
+
+- Add test to verify mdJson reader version is compatible with schema version [\#159](https://github.com/adiwg/mdTranslator/pull/159) ([stansmith907](https://github.com/stansmith907))
+- Fix computation of federal fiscal year in sbJson budget writer [\#156](https://github.com/adiwg/mdTranslator/pull/156) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.4.0](https://github.com/adiwg/mdTranslator/tree/v2.4.0) (2017-10-25)
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.3.5...v2.4.0)
+
+**Fixed bugs:**
 
+- Error in html writer when topologyLevel is null [\#152](https://github.com/adiwg/mdTranslator/issues/152)
+- Harvest Set tag for sbJSON should include the title only [\#150](https://github.com/adiwg/mdTranslator/issues/150)
+
+**Merged pull requests:**
+
+- Fix bug that returns first identifier as parentId when no SB namespace is found [\#155](https://github.com/adiwg/mdTranslator/pull/155) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.3.5](https://github.com/adiwg/mdTranslator/tree/v2.3.5) (2017-10-18)
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.3.4...v2.3.5)
+
+**Merged pull requests:**
+
+- Trap missing topology level in html writer vectorRepresentation modul… [\#153](https://github.com/adiwg/mdTranslator/pull/153) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.3.4](https://github.com/adiwg/mdTranslator/tree/v2.3.4) (2017-10-13)
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.3.3...v2.3.4)
+
+**Merged pull requests:**
+
+- Remove repository name from harvest set tag in sbJson writer.  [\#151](https://github.com/adiwg/mdTranslator/pull/151) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.3.3](https://github.com/adiwg/mdTranslator/tree/v2.3.3) (2017-10-11)
 [Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.3.2...v2.3.3)
 
 **Fixed bugs:**

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

@@ -546,11 +546,23 @@ class InternalMetadata
          periodNames: [],
          startDateTime: {},
          endDateTime: {},
+         startGeologicAge: {},
+         endGeologicAge: {},
          timeInterval: {},
          duration: {}
       }
    end
 
+   def newGeologicAge
+      {
+         ageTimeScale: nil,
+         ageEstimate: nil,
+         ageUncertainty: nil,
+         ageExplanation: nil,
+         ageReference: []
+      }
+   end
+
    def newDuration
       {
          years: nil,
@@ -718,6 +730,7 @@ class InternalMetadata
          domainName: nil,
          domainCode: nil,
          domainDescription: nil,
+         domainReference: {},
          domainItems: []
       }
    end
@@ -737,10 +750,14 @@ class InternalMetadata
          entityCode: nil,
          entityAlias: [],
          entityDefinition: nil,
+         entityReferences: [],
          primaryKey: [],
          indexes: [],
          attributes: [],
-         foreignKeys: []
+         foreignKeys: [],
+         fieldSeparatorCharacter: nil,
+         numberOfHeaderLines: nil,
+         quoteCharacter: nil
       }
    end
 
@@ -758,13 +775,27 @@ class InternalMetadata
          attributeCode: nil,
          attributeAlias: [],
          attributeDefinition: nil,
+         attributeReference: {},
          dataType: nil,
          allowNull: false,
          allowMany: false,
          unitOfMeasure: nil,
+         measureResolution: nil,
+         isCaseSensitive: false,
+         fieldWidth: nil,
+         missingValue: nil,
          domainId: nil,
          minValue: nil,
-         maxValue: nil
+         maxValue: nil,
+         rangeOfValues: [],
+         timePeriodOfValues: []
+      }
+   end
+
+   def newValueRange
+      {
+         minRangeValue: nil,
+         maxRangeValue: nil
       }
    end
 

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

@@ -2,13 +2,15 @@
 # unpack fgdc entity attribute
 
 # History:
+#  Stan Smith 2017-10-30 added timePeriodOfValues
 #  Stan Smith 2017-09-06 original script
 
-require 'uuidtools'
 require 'nokogiri'
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
 require_relative 'module_enumerated'
 require_relative 'module_range'
+require_relative 'module_codeSet'
+require_relative 'module_dateTime'
 
 module ADIWG
    module Mdtranslator
@@ -39,56 +41,84 @@ module ADIWG
                   end
 
                   # entity attribute 5.1.2.3 (attrdefs) - attribute definition source
-                  # -> not mapped
+                  # -> dataDictionary.entities.attributes.attributeReference.title
+                  reference = xAttribute.xpath('./attrdefs').text
+                  unless reference.empty?
+                     hCitation = intMetadataClass.newCitation
+                     hCitation[:title] = reference
+                     hAttribute[:attributeReference] = hCitation
+                  end
 
                   # entity attribute 5.1.2.4 (attrdomv) - attribute domain value
                   axDomain = xAttribute.xpath('./attrdomv')
                   unless axDomain.empty?
-                     hDomain = intMetadataClass.newDictionaryDomain
-                     hDomain[:domainId] = UUIDTools::UUID.random_create.to_s
-                     hDomain[:domainCode] = code
-                     hDomain[:domainDescription] = 'FGDC enumerated domain'
-
-                     axDomain.each do |xDomain|
-
-                        # entity attribute 5.1.2.4.1 (edom) - enumerated domain
-                        xEnumeration = xDomain.xpath('./edom')
-                        unless xEnumeration.empty?
-                           hItem = Enumerated.unpack(xEnumeration, hResponseObj)
-                           hDomain[:domainItems] << hItem
-                        end
 
-                        # entity attribute 5.1.2.4.2 (rdom) - range domain
-                        xRange = xDomain.xpath('./rdom')
-                        unless xRange.empty?
-                           Range.unpack(xRange, hAttribute, hResponseObj)
+                     # entity attribute 5.1.2.4.1 (edom) - enumerated domain
+                     unless axDomain.empty?
+                        hDomain = Enumerated.unpack(axDomain, code, hResponseObj)
+                        unless hDomain.nil?
+                           hDictionary[:domains] << hDomain
                         end
+                     end
 
-                        # entity attribute 5.1.2.4.3 (codesetd) - codeset domain
-
-                           # entity attribute 5.1.2.4.3.1 (codesetn) - codeset name
-                           # -> not mapped
-
-                           # entity attribute 5.1.2.4.3.2 (codesets) - codeset source
-                           # -> not mapped
-
-                        # entity attribute 5.1.2.4.4 (udom) - unrepresentable domain
-                        # -> not mapped
+                     # entity attribute 5.1.2.4.2 (rdom) - range domain
+                     unless axDomain.empty?
+                        Range.unpack(axDomain, hAttribute, hResponseObj)
+                     end
 
+                     # entity attribute 5.1.2.4.3 (codesetd) - codeset domain
+                     unless axDomain.empty?
+                        aDomains = CodeSet.unpack(axDomain, code, hResponseObj)
+                        hDictionary[:domains].concat aDomains
                      end
 
-                     unless hDomain[:domainItems].empty?
-                        hAttribute[:domainId] = hDomain[:domainId]
-                        hDictionary[:domains] << hDomain
+                     # entity attribute 5.1.2.4.4 (udom) - unrepresentable domain
+                     # -> dataDictionary.domains.domainDescription
+                     axUnRep = axDomain.xpath('./udom')
+                     axUnRep.each do |xUnRep|
+                        unRep = xUnRep.text
+                        unless unRep.empty?
+                           hDomain = intMetadataClass.newDictionaryDomain
+                           hDomain[:domainId] = UUIDTools::UUID.random_create.to_s
+                           hDomain[:domainName] = code
+                           hDomain[:domainCode] = code
+                           hDomain[:domainDescription] = unRep
+                           hDictionary[:domains] << hDomain
+                        end
                      end
 
                   end
 
-                  # entity attribute 5.1.2.5 (begdatea) - beginning date of attribute values
-                  # -> not mapped
+                  # add domainId to attribute
+                  # fgdc allows multiple domain definitions
+                  # mdJson allows only one domain definition for an attribute
+                  # take the first, if this is a problem the user will need to fix in the editor
+                  unless hDictionary[:domains].empty?
+                     hAttribute[:domainId] = hDictionary[:domains][0][:domainId]
+                  end
 
+                  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
-                  # -> not mapped
+                  # -> dataDictionary.entities.attributes.timePeriodOfValues.startDateTime
+                  # -> dataDictionary.entities.attributes.timePeriodOfValues.endDateTime
+                  axBegin.each_with_index do |xBegin, index|
+                     beginDate = xBegin.text
+                     unless beginDate.empty?
+                        hTimePeriod = intMetadataClass.newTimePeriod
+                        hDateTime = DateTime.unpack(beginDate, nil, hResponseObj)
+                        unless hDateTime.nil?
+                           hTimePeriod[:startDateTime] = hDateTime
+                        end
+                        endDate = xAttribute.xpath("./enddatea[#{index+1}]").text
+                        hDateTime = DateTime.unpack(endDate, nil, hResponseObj)
+                        unless hDateTime.nil?
+                           hTimePeriod[:endDateTime] = hDateTime
+                        end
+                        hTimePeriod[:description] = 'attribute date range'
+                        hAttribute[:timePeriodOfValues] << hTimePeriod
+                     end
+                  end
 
                   # entity attribute 5.1.2.7 (attrvai) - attribute value accuracy information
 
@@ -98,6 +128,9 @@ module ADIWG
                   # entity attribute 5.1.2.7.2 (attrvae) - attribute value accuracy explanation
                   # -> not mapped
 
+                  # entity attribute 5.1.2.8 (attrmfrq) - attribute measurement frequency
+                  # -> not mapped; same as resource maintenance but at attribute level
+
                   hAttribute
 
                end

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

@@ -0,0 +1,66 @@
+# Reader - fgdc to internal data structure
+# unpack fgdc entity codeSet domain
+
+# History:
+#  Stan Smith 2017-10-31 original script
+
+require 'uuidtools'
+require 'nokogiri'
+require 'adiwg/mdtranslator/internal/internal_metadata_obj'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module Fgdc
+
+            module CodeSet
+
+               def self.unpack(axDomains, code, hResponseObj)
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+
+                  aDomains = []
+
+                  axCodeSets = axDomains.xpath('./codesetd')
+                  unless axCodeSets.empty?
+                     axCodeSets.each do |xCodeSet|
+
+                        hDomain = intMetadataClass.newDictionaryDomain
+                        hDomain[:domainId] = UUIDTools::UUID.random_create.to_s
+                        hDomain[:domainCode] = code
+                        hDomain[:domainDescription] = 'FGDC codeSet domain'
+
+
+                        # entity attribute 5.1.2.4.3.1 (codesetn) - codeset name
+                        # -> dataDictionary.domains.commonName
+                        name = xCodeSet.xpath('./codesetn').text
+                        unless name.empty?
+                           hDomain[:domainName] = name
+                        end
+
+                        # entity attribute 5.1.2.4.3.2 (codesets) - codeset source {citation}
+                        # -> dataDictionary.domains.domainReference.title
+                        hCitation = intMetadataClass.newCitation
+                        title = xCodeSet.xpath('./codesets').text
+                        unless title.empty?
+                           hCitation[:title] = title
+                           hDomain[:domainReference] = hCitation
+                        end
+
+                        aDomains << hDomain
+
+                     end
+
+                  end
+
+                  return aDomains
+
+               end
+
+            end
+
+         end
+      end
+   end
+end

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

@@ -47,7 +47,13 @@ module ADIWG
                      end
 
                      # entity attribute 5.1.1.3 (enttypds) - entity definition source
-                     # -> not mapped
+                     # -> dataDictionary.entities.entityReference.title
+                     reference = xEntity.xpath('./enttypds').text
+                     unless reference.empty?
+                        hCitation = intMetadataClass.newCitation
+                        hCitation[:title] = reference
+                        hEntity[:entityReferences] << hCitation
+                     end
 
                      # entity attribute 5.1.2 (attr) - characteristics of an attribute
                      axAttribute = xDetail.xpath('./attr')

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

@@ -31,7 +31,16 @@ module ADIWG
                   end
 
                   # entity attribute 5.2.2 (eadetcit) - entity attribute detail citation []
-                  # -> not mapped
+                  # -> dataDictionary.entities.entityReference.title
+                  axReference = xOverview.xpath('./eadetcit')
+                  axReference.each do |xReference|
+                     reference = xReference.text
+                     unless reference.empty?
+                        hCitation = intMetadataClass.newCitation
+                        hCitation[:title] = reference
+                        hEntity[:entityReferences] << hCitation
+                     end
+                  end
 
                   return hEntity
 

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

@@ -4,6 +4,7 @@
 # History:
 #  Stan Smith 2017-09-06 original script
 
+require 'uuidtools'
 require 'nokogiri'
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
 
@@ -14,31 +15,49 @@ module ADIWG
 
             module Enumerated
 
-               def self.unpack(xEnumeration, hResponseObj)
+               def self.unpack(axDomains, code, hResponseObj)
 
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
-                  hItem = intMetadataClass.newDomainItem
-
-                  # entity attribute 5.1.2.4.1.1 (edomv) - enumerated domain value
-                  # -> dataDictionary.domainItems.itemValue
-                  value = xEnumeration.xpath('./edomv').text
-                  unless value.empty?
-                     hItem[:itemName] = value
-                     hItem[:itemValue] = value
-                  end
 
-                  # entity attribute 5.1.2.4.1.2 (edomvd) - enumerated domain value definition
-                  # -> dataDictionary.domainItems.itemDefinition
-                  definition = xEnumeration.xpath('./edomvd').text
-                  unless definition.empty?
-                     hItem[:itemDefinition] = definition
-                  end
+                  hDomain = intMetadataClass.newDictionaryDomain
+                  hDomain[:domainId] = UUIDTools::UUID.random_create.to_s
+                  hDomain[:domainName] = code
+                  hDomain[:domainCode] = code
+                  hDomain[:domainDescription] = 'FGDC enumerated domain'
+
+                  axValues = axDomains.xpath('./edom')
+                  unless axValues.empty?
+                     axValues.each do |xValue|
+                        hItem = intMetadataClass.newDomainItem
+
+                        # entity attribute 5.1.2.4.1.1 (edomv) - enumerated domain value
+                        # -> dataDictionary.domainItems.itemValue
+                        value = xValue.xpath('./edomv').text
+                        unless value.empty?
+                           hItem[:itemName] = value
+                           hItem[:itemValue] = value
+                        end
+
+                        # entity attribute 5.1.2.4.1.2 (edomvd) - enumerated domain value definition
+                        # -> dataDictionary.domainItems.itemDefinition
+                        definition = xValue.xpath('./edomvd').text
+                        unless definition.empty?
+                           hItem[:itemDefinition] = definition
+                        end
 
-                  # entity attribute 5.1.2.4.1.3 (edomvds) - enumerated domain value definition source
-                  # -> not mapped
+                        # entity attribute 5.1.2.4.1.3 (edomvds) - enumerated domain value definition source
+                        # -> not mapped
+
+                        hDomain[:domainItems] << hItem
+
+                     end
+
+                     return hDomain
+
+                  end
 
-                  return hItem
+                  return nil
 
                end