adiwg-mdtranslator 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d8f9dcd1aef3c375a17c1695eed301fb9f80fdf
-  data.tar.gz: e560fadd2c76252c9967ddc7fb2efcbdf0c3c471
+  metadata.gz: b01bd71de44e1d9934de048dbbc7d5114008ffc4
+  data.tar.gz: 52e0b337ed813cea08aaea1a9937b57adbde5425
 SHA512:
-  metadata.gz: ebc60b53f0aefadcabf3288413bd761d79af4553e151581ba0f238b3d09a28b74f774474cae89dfbdf5ca1e750efebeae3e583740d5a5f1f1909fb51c17105a9
-  data.tar.gz: da2f0bc3ac197cfffdb664b9d192a842df407bf103ec5bc28c3c49a4204cefbf400ee2ef2bac0637fc65cafda3d8266150b1476f3e531f03e11651815a5009f1
+  metadata.gz: b2850af4c2cd5a3f7c0e58aa6f263d012e0bd1a60d4d5ecacbbea72d676059c147698c340d0b727df7c48a4bafd9e7c27259a81e1e081c871ed55f5afc18a1d6
+  data.tar.gz: ecf8b2296690191018fe639eb3d5695bbf06e61072fafb4fae76a89ef6c8710c227595ccb974873a1c92d84b47694f42e38d870be753ea5facfc9d4e9bc8fc10

data/CHANGELOG.md

@@ -1,7 +1,64 @@
 # Change Log
 
-## [v2.2.0](https://github.com/adiwg/mdTranslator/tree/v2.2.0)
+## [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:**
+
+- sbJSON association mapping error [\#149](https://github.com/adiwg/mdTranslator/issues/149)
+- sbJson reader execution fail tests [\#146](https://github.com/adiwg/mdTranslator/issues/146)
+
+**Closed issues:**
+
+- fgdc ISO 19115 Topic Category [\#123](https://github.com/adiwg/mdTranslator/issues/123)
+
+**Merged pull requests:**
+
+- Fix issue of invalid/incomplete sbJson records terminating import [\#148](https://github.com/adiwg/mdTranslator/pull/148) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.3.2](https://github.com/adiwg/mdTranslator/tree/v2.3.2) (2017-09-15)
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.3.1...v2.3.2)
+
+**Implemented enhancements:**
+
+- sbJson add all contacts as citation responsible parties [\#138](https://github.com/adiwg/mdTranslator/issues/138)
+- sbJSON data.gov [\#83](https://github.com/adiwg/mdTranslator/issues/83)
+
+**Fixed bugs:**
+
+- sbJSON itemLink associationType not translated [\#137](https://github.com/adiwg/mdTranslator/issues/137)
+- Too many identifiers created when reading itemLinks from ScienceBase [\#126](https://github.com/adiwg/mdTranslator/issues/126)
+- sbJSON data.gov [\#83](https://github.com/adiwg/mdTranslator/issues/83)
+
+**Closed issues:**
+
+- sbJson 2.0 relatedItems [\#81](https://github.com/adiwg/mdTranslator/issues/81)
+
+**Merged pull requests:**
+
+- Minor patches and enhancements [\#139](https://github.com/adiwg/mdTranslator/pull/139) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.3.1](https://github.com/adiwg/mdTranslator/tree/v2.3.1) (2017-09-14)
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.3.0...v2.3.1)
+
+**Fixed bugs:**
+
+- nil error in HTML writer \(allocation\) [\#135](https://github.com/adiwg/mdTranslator/issues/135)
+- GeoJSON for geographicElement is parsed as a string or not at all [\#133](https://github.com/adiwg/mdTranslator/issues/133)
+
+**Merged pull requests:**
+
+- Minor bug fixes and patches [\#136](https://github.com/adiwg/mdTranslator/pull/136) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.3.0](https://github.com/adiwg/mdTranslator/tree/v2.3.0) (2017-09-12)
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.2.0...v2.3.0)
+
+**Merged pull requests:**
+
+- Add FGDC CSDGM 1998 reader [\#131](https://github.com/adiwg/mdTranslator/pull/131) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.2.0](https://github.com/adiwg/mdTranslator/tree/v2.2.0) (2017-08-31)
 [Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.1.2...v2.2.0)
 
 **Fixed bugs:**

data/adiwg-mdtranslator.gemspec

@@ -33,8 +33,8 @@ 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"
-   spec.add_runtime_dependency "adiwg-mdcodes", "~> 2.3"
+   spec.add_runtime_dependency "adiwg-mdjson_schemas", ">= 2.3.2"
+   spec.add_runtime_dependency "adiwg-mdcodes", "~> 2.3.2"
    spec.add_runtime_dependency "jbuilder", "~> 2.5"
    spec.add_runtime_dependency "kramdown", "~> 1.13"
    spec.add_runtime_dependency "coderay", "~> 1.1"

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

@@ -2,6 +2,8 @@
 
 # History:
 # version 2
+#  Stan Smith 2017-09-28 add altitude to bounding box for fgdc
+#  Stan Smith 2017-09-28 add description to geographicExtent for fgdc
 #  Stan Smith 2017-04-22 removed 'intObj = ' from new object definitions
 #  Stan Smith 2017-02-15 added newResourceType
 #  Stan Smith 2017-02-09 added newMetadataRepository
@@ -447,6 +449,7 @@ class InternalMetadata
 
    def newGeographicExtent
       {
+         description: nil,
          containsData: true,
          identifier: {},
          boundingBox: {},
@@ -461,7 +464,10 @@ class InternalMetadata
          westLongitude: nil,
          eastLongitude: nil,
          southLatitude: nil,
-         northLatitude: nil
+         northLatitude: nil,
+         minimumAltitude: nil,
+         maximumAltitude: nil,
+         unitsOfAltitude: nil
       }
    end
 
@@ -773,7 +779,56 @@ class InternalMetadata
    def newSpatialReferenceSystem
       {
          systemType: nil,
-         systemIdentifier: {}
+         systemIdentifier: {},
+         systemParameters: {}
+      }
+   end
+
+   def newReferenceSystemParameters
+      {
+         projection: {},
+         ellipsoid: {},
+         datumIdentifier: {}
+      }
+   end
+
+   def newProjection
+      {
+         projectionIdentifier: {},
+         zone: nil,
+         standardParallel1: nil,
+         standardParallel2: nil,
+         longitudeOfCentralMeridian: nil,
+         latitudeOfProjectionOrigin: nil,
+         falseEasting: nil,
+         falseNorthing: nil,
+         falseEastingNorthingUnits: nil,
+         scaleFactorAtEquator: nil,
+         heightOfProspectivePointAboveSurface: nil,
+         longitudeOfProjectionCenter: nil,
+         latitudeOfProjectionCenter: nil,
+         scaleFactorAtCenterLine: nil,
+         straightVerticalLongitudeFromPole: nil,
+         scaleFactorAtProjectionOrigin: nil,
+         azimuthAngle: nil,
+         azimuthMeasurePointLongitude: nil,
+         obliqueLinePoint: []
+      }
+   end
+
+   def newObliqueLinePoint
+      {
+         azimuthLineLatitude: nil,
+         azimuthLineLongitude: nil
+      }
+   end
+
+   def newEllipsoid
+      {
+         ellipsoidIdentifier: {},
+         semiMajorAxis: nil,
+         axisUnits: nil,
+         denominatorOfFlatteningRatio: nil
       }
    end
 
@@ -781,6 +836,7 @@ class InternalMetadata
       {
          scaleFactor: nil,
          measure: {},
+         geographicMeasure: {},
          levelOfDetail: nil
       }
    end
@@ -793,6 +849,14 @@ class InternalMetadata
       }
    end
 
+   def newGeographicMeasure
+      {
+         latitudeMeasure: nil,
+         longitudeMeasure: nil,
+         unitOfMeasure: nil
+      }
+   end
+
    def newSpatialRepresentation
       {
          gridRepresentation: {},

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

@@ -13,6 +13,7 @@ require_relative 'module_spatialDomain'
 require_relative 'module_keyword'
 require_relative 'module_contact'
 require_relative 'module_security'
+require_relative 'module_taxonomy'
 
 module ADIWG
    module Mdtranslator
@@ -116,6 +117,12 @@ module ADIWG
                      Keyword.unpack(xKeywords, hResourceInfo, hResponseObj)
                   end
 
+                  # identification information bio (taxonomy) - taxonomic information
+                  xTaxonomy = xIdInfo.xpath('./taxonomy')
+                  unless xTaxonomy.empty?
+                     Taxonomy.unpack(xTaxonomy, hResourceInfo, hResponseObj)
+                  end
+
                   # identification information 1.7 (accconst) - access constraints
                   # identification information 1.8 (useconst) - use constraints
                   accessCon = xIdInfo.xpath('./accconst').text

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

@@ -72,7 +72,7 @@ module ADIWG
                         hKeyword = intMetadataClass.newKeyword
                         hKeyword[:keywordType] = 'place'
 
-                        # theme keyword 1.6.2.1 placekt) - place keyword thesaurus {citation}
+                        # theme keyword 1.6.2.1 (placekt) - place keyword thesaurus {citation}
                         thesaurus = xPlace.xpath('./placekt').text
                         unless thesaurus.empty?
                            hCitation = intMetadataClass.newCitation
@@ -107,7 +107,7 @@ module ADIWG
                         hKeyword = intMetadataClass.newKeyword
                         hKeyword[:keywordType] = 'stratum'
 
-                        # theme keyword 1.6.3.1 stratkt) - stratum keyword thesaurus {citation}
+                        # theme keyword 1.6.3.1 (stratkt) - stratum keyword thesaurus {citation}
                         thesaurus = xStratum.xpath('./stratkt').text
                         unless thesaurus.empty?
                            hCitation = intMetadataClass.newCitation
@@ -142,7 +142,7 @@ module ADIWG
                         hKeyword = intMetadataClass.newKeyword
                         hKeyword[:keywordType] = 'temporal'
 
-                        # theme keyword 1.6.4.1 tempkt) - temporal keyword thesaurus {citation}
+                        # theme keyword 1.6.4.1 (tempkt) - temporal keyword thesaurus {citation}
                         thesaurus = xTemporal.xpath('./tempkt').text
                         unless thesaurus.empty?
                            hCitation = intMetadataClass.newCitation
@@ -170,6 +170,39 @@ module ADIWG
                      end
                   end
 
+                  # kewords bio (keywtax) - taxonomy keywords {keyword}
+                  nodeName = xKeywords.xpath('./*').first.name
+                  if nodeName == 'keywtax'
+                     hKeyword = intMetadataClass.newKeyword
+                     hKeyword[:keywordType] = 'taxon'
+
+                     # theme bio.1.1 (taxonkt) - taxonomy keyword thesaurus {citation}
+                     thesaurus = xKeywords.xpath('./taxonkt').text
+                     unless thesaurus.empty?
+                        hCitation = intMetadataClass.newCitation
+                        hCitation[:title] = thesaurus
+                        hKeyword[:thesaurus] = hCitation
+                     end
+
+                     # theme keyword bio.1.2 (taxonkey) - taxonomy keyword keywords {keywordObject}
+                     axKeywords = xKeywords.xpath('./taxonkey')
+                     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_spatialDomain.rb

@@ -63,6 +63,12 @@ module ADIWG
                   hGeoExtent = intMetadataClass.newGeographicExtent
                   hExtent[:geographicExtents] << hGeoExtent
 
+                  # spatial domain bio (descgeog) - geographic description
+                  description = xDomain.xpath('./descgeog').text
+                  unless description.empty?
+                     hGeoExtent[:description] = description
+                  end
+
                   # spatial domain 1.5.1 (bounding) - bounding box
                   xBbox = xDomain.xpath('./bounding')
                   unless xBbox.empty?
@@ -80,6 +86,21 @@ module ADIWG
                      # bounding box 1.5.1.4 (southbc) - south coordinate
                      hBbox[:southLatitude] = xBbox.xpath('./southbc').text.to_f
 
+                     # bounding box bio (boundalt) - altitude
+                     xAltitude = xBbox.xpath('./boundalt')
+                     unless xAltitude.empty?
+
+                        # bounding box bio (altmin) - minimum altitude
+                        hBbox[:minimumAltitude] = xAltitude.xpath('./altmin').text.to_f
+
+                        # bounding box bio (altmax) - maximum altitude
+                        hBbox[:maximumAltitude] = xAltitude.xpath('./altmax').text.to_f
+
+                        # bounding box bio (altunit) - altitude unit of measure
+                        hBbox[:unitsOfAltitude] = xAltitude.xpath('./altunit').text
+
+                     end
+
                      hGeoExtent[:boundingBox] = hBbox
                   end
 

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

@@ -0,0 +1,70 @@
+# Reader - fgdc to internal data structure
+# unpack fgdc taxonomy classification
+
+# History:
+#  Stan Smith 2017-09-21 original script
+
+require 'nokogiri'
+require 'adiwg/mdtranslator/internal/internal_metadata_obj'
+require_relative 'module_taxonClass'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module Fgdc
+
+            module TaxonClass
+
+               def self.unpack(xTaxonClass, hResponseObj)
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  hTaxonClass = intMetadataClass.newTaxonClass
+
+                  # taxonomy bio.4.1 (taxonrn) - taxon rank name
+                  # -> resourceInfo.taxonomy.taxonClass.taxonRank
+                  rankName = xTaxonClass.xpath('./taxonrn').text
+                  unless rankName.empty?
+                     hTaxonClass[:taxonRank] = rankName
+                  end
+
+                  # taxonomy bio.4.2 (taxonrv) - taxon rank value
+                  # -> resourceInfo.taxonomy.taxonClass.taxonValue
+                  rankValue = xTaxonClass.xpath('./taxonrv').text
+                  unless rankValue.empty?
+                     hTaxonClass[:taxonValue] = rankValue
+                  end
+
+                  # taxonomy bio.4.3 (common) - taxon common name []
+                  # -> resourceInfo.taxonomy.taxonClass.commonNames
+                  axCommonNames = xTaxonClass.xpath('./common')
+                  unless axCommonNames.empty?
+                     axCommonNames.each do |xCommon|
+                        common = xCommon.text
+                        unless common.empty?
+                           hTaxonClass[:commonNames] << common
+                        end
+                     end
+                  end
+
+                  # taxonomy bio.4.4 (taxoncl) - taxonomic classification []
+                  # -> resourceInfo.taxonomy.taxonClass.taxonClass
+                  axSubClass = xTaxonClass.xpath('./taxoncl')
+                  unless axSubClass.empty?
+                     axSubClass.each do |xSubClass|
+                        hClass = TaxonClass.unpack(xSubClass, hResponseObj)
+                        unless hClass.nil?
+                           hTaxonClass[:subClasses] << hClass
+                        end
+                     end
+                  end
+
+                  return hTaxonClass
+
+               end
+            end
+
+         end
+      end
+   end
+end

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

@@ -0,0 +1,132 @@
+# Reader - fgdc to internal data structure
+# unpack fgdc taxonomy system
+
+# History:
+#  Stan Smith 2017-09-20 original script
+
+require 'nokogiri'
+require 'adiwg/mdtranslator/internal/internal_metadata_obj'
+require_relative 'module_citation'
+require_relative 'module_contact'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module Fgdc
+
+            module TaxonSystem
+
+               def self.unpack(xSystem, hTaxonomy, hResponseObj)
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+
+                  # taxonomy bio.2.1 (classsys) - taxonomic classification authority []
+                  # -> resourceInfo.taxonomy.taxonSystem
+                  axTaxClass = xSystem.xpath('./classsys')
+                  unless axTaxClass.empty?
+                     axTaxClass.each do |xTaxClass|
+
+                        hTaxonSystem = intMetadataClass.newTaxonSystem
+
+                        # taxonomy bio.2.1.1 (classcit) - taxonomic classification citation {citation}
+                        # -> resourceInfo.taxonomy.taxonSystem.citation
+                        xCitation = xTaxClass.xpath('./classcit')
+                        unless xCitation.empty?
+                           hCitation = Citation.unpack(xCitation, hResponseObj)
+                           unless hCitation.nil?
+                              hTaxonSystem[:citation] = hCitation
+                           end
+                        end
+
+                        # taxonomy bio.2.1.2 (classmod) - taxonomic classification modifications
+                        # -> resourceInfo.taxonomy.taxonSystem.modifications
+                        modifications = xTaxClass.xpath('./classmod').text
+                        unless modifications.empty?
+                           hTaxonSystem[:modifications] = modifications
+                        end
+
+                        hTaxonomy[:taxonSystem] << hTaxonSystem
+
+                     end
+                  end
+
+                  # taxonomy bio.2.2 (idref) - taxonomic identification reference [] {citation}
+                  # -> resourceInfo.taxonomy.idReferences.citation
+                  axTaxRef = xSystem.xpath('./idref')
+                  unless axTaxRef.empty?
+                     axTaxRef.each do |xTaxRef|
+                        hCitation = Citation.unpack(xTaxRef, hResponseObj)
+                        unless hCitation.nil?
+                           hTaxonomy[:idReferences] << hCitation
+                        end
+                     end
+                  end
+
+                  # taxonomy bio.2.3 (ider) - taxonomic identifier [] {contact}
+                  # -> resourceInfo.taxonomy.observers.responsibility
+                  axObserver = xSystem.xpath('./ider')
+                  unless axObserver.empty?
+                     axObserver.each do |xObserver|
+                        hResponsibility = Contact.unpack(xObserver, hResponseObj)
+                        unless hResponsibility.nil?
+                           hResponsibility[:roleName] = 'observer'
+                           hTaxonomy[:observers] << hResponsibility
+                        end
+                     end
+                  end
+
+                  # taxonomy bio.2.4 (taxonpro) - taxonomic procedures
+                  # -> resourceInfo.taxonomy.idProcedure
+                  procedures = xSystem.xpath('./taxonpro').text
+                  unless procedures.empty?
+                     hTaxonomy[:idProcedure] = procedures
+                  end
+
+                  # taxonomy bio.2.5 (taxoncom) - taxonomic completeness
+                  # -> resourceInfo.taxonomy.idCompleteness
+                  completeness = xSystem.xpath('./taxoncom').text
+                  unless completeness.empty?
+                     hTaxonomy[:idCompleteness] = completeness
+                  end
+
+                  # taxonomy bio.2.6 (vouchers) - vouchers []
+                  # -> resourceInfo.taxonomy.vouchers
+                  axVoucher = xSystem.xpath('./vouchers')
+                  unless axVoucher.empty?
+                     axVoucher.each do |xVoucher|
+
+                        hVoucher = intMetadataClass.newTaxonVoucher
+
+                        # taxonomy bio.2.6.1 (specimen) - specimen
+                        # -> resourceInfo.taxonomy.vouchers.specimen
+                        specimen = xVoucher.xpath('./specimen').text
+                        unless specimen.empty?
+                           hVoucher[:specimen] = specimen
+                        end
+
+                        # taxonomy bio.2.6.2 (reposit) - repository {contact}
+                        # -> resourceInfo.taxonomy.vouchers.repository
+                        xRepository = xVoucher.xpath('./reposit')
+                        unless xRepository.empty?
+                           hResponsibility = Contact.unpack(xRepository, hResponseObj)
+                           unless hResponsibility.nil?
+                              hResponsibility[:roleName] = 'curator'
+                              hVoucher[:repository] = hResponsibility
+                           end
+                        end
+
+                        hTaxonomy[:vouchers] << hVoucher
+
+                     end
+                  end
+
+                  return hTaxonomy
+
+               end
+            end
+
+         end
+      end
+   end
+end