adiwg-mdtranslator 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 237525902d612d3bf3f8c5a81c373a789d27b9c8
-  data.tar.gz: caa5edd6722337501c2698e0ea7ee4a61b0eccea
+  metadata.gz: 95997a263659c300096fdde23a9b106fc0087077
+  data.tar.gz: 2c5744f3015d572bbf3cd42b61edd658351c6120
 SHA512:
-  metadata.gz: 79a9d0abadec138c139b287b3e306033eee12b9d0467b1ee0ce3e010a121f1aff03b88e4e715f05147ea48e58c277eea536631e88142f430eace7f6e6a37779a
-  data.tar.gz: c459062d8d426ac181db0cc1f279811d5567e773c9f1bec809c3487e96920fcb11dad897343a60411ee8f7de31ea2986924953f09a295cf485c7e48bbc65e7e8
+  metadata.gz: b367d5f133db2bc2927e0a729028bcf04680bbdc6fbf101c5705a7643ae7b6452b474f1d4bc8d994bef4c82e6e9f63f8f0d1c8245cadd3af5f1764590d98a18d
+  data.tar.gz: d0746f77b488309360f28bfb1b3131eefc3b77b3b2a2a162889511facd5e073113a2cf3bc4541708ae41f2655b8ff53b1255b5920eab4a4286417ee39207a7a5

data/CHANGELOG.md

@@ -1,7 +1,29 @@
 # Change Log
 
-## [v2.6.0](https://github.com/adiwg/mdTranslator/tree/v2.6.0) (2017-11-10)
+## [v2.6.1](https://github.com/adiwg/mdTranslator/tree/v2.6.1)
 
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.6.0...v2.6.1)
+
+**Implemented enhancements:**
+
+- Include citation.onlineResource and metadataOnlineResource in webLinks [\#165](https://github.com/adiwg/mdTranslator/issues/165)
+
+**Fixed bugs:**
+
+- sbJSON identifier objects are not unique [\#162](https://github.com/adiwg/mdTranslator/issues/162)
+- Metadata identifier is not written to sbJSON [\#160](https://github.com/adiwg/mdTranslator/issues/160)
+
+**Closed issues:**
+
+- add 'Agreement Number' to sbJson budget facet [\#166](https://github.com/adiwg/mdTranslator/issues/166)
+- handle 80 character keyword length in sbJson writer [\#164](https://github.com/adiwg/mdTranslator/issues/164)
+- sbJson reader should not import short abstract [\#163](https://github.com/adiwg/mdTranslator/issues/163)
+
+**Merged pull requests:**
+
+- Patches and enhancements to sbJson reader and writer [\#167](https://github.com/adiwg/mdTranslator/pull/167) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.6.0](https://github.com/adiwg/mdTranslator/tree/v2.6.0) (2017-11-11)
 [Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.5.0...v2.6.0)
 
 **Fixed bugs:**

data/Rakefile

@@ -12,6 +12,7 @@ Rake::TestTask.new do |t|
 		'test/writers/mdJson/tc*.rb',
 		'test/writers/sbJson/tc*.rb',
 		'test/writers/html/tc*.rb',
+		'test/writers/fgdc/tc*.rb',
 		'test/translator/tc*.rb'
 	]
 	t.verbose = true

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

@@ -2,6 +2,7 @@
 # unpack fgdc contact
 
 # History:
+#  Stan Smith 2017-11-27 add support for 'memberOfOrgs'
 #  Stan Smith 2017-08-25 original script
 
 require 'nokogiri'
@@ -24,6 +25,8 @@ module ADIWG
                   contactType = nil
                   personName = ''
                   orgName = ''
+                  personId = nil
+                  orgId = nil
                   xContactInfo = xContact.xpath('./cntinfo')
                   unless xContactInfo.empty?
 
@@ -60,6 +63,13 @@ module ADIWG
                         hContact = Fgdc.get_contact_by_id(personId) if contactType == 'person'
                         hContact = Fgdc.get_contact_by_id(orgId) if contactType == 'organization'
 
+                        # contact - member of organization
+                        if contactType == 'person'
+                           unless orgId.nil?
+                              hContact[:memberOfOrgs] << orgId
+                           end
+                        end
+
                         # contact 10.3 (cntpos) - contact position
                         position = xContactInfo.xpath('./cntpos').text
                         if contactType == 'person'

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

@@ -21,7 +21,7 @@ module ADIWG
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
 
-                  # kewords 1.6.1 (theme) - thematic keywords {keyword}
+                  # keywords 1.6.1 (theme) - thematic keywords {keyword}
                   axTheme = xKeywords.xpath('./theme')
                   unless axTheme.empty?
                      axTheme.each do |xTheme|
@@ -50,7 +50,7 @@ module ADIWG
                         end
 
                         # if keyword thesaurus is 'ISO 19115 Topic Category'
-                        # convert to ISO topic categories
+                        # also convert to ISO topic categories
                         if hKeyword[:thesaurus][:title] == 'ISO 19115 Topic Category'
                            hKeyword[:keywords].each do |hKeyObj|
                               hResourceInfo[:topicCategories] << hKeyObj[:keyword]
@@ -65,7 +65,7 @@ module ADIWG
                      end
                   end
 
-                  # kewords 1.6.2 (place) - place keywords {keyword}
+                  # keywords 1.6.2 (place) - place keywords {keyword}
                   axPlace = xKeywords.xpath('./place')
                   unless axPlace.empty?
                      axPlace.each do |xPlace|
@@ -100,7 +100,7 @@ module ADIWG
                      end
                   end
 
-                  # kewords 1.6.3 (stratum) - stratum keywords {keyword}
+                  # keywords 1.6.3 (stratum) - stratum keywords {keyword}
                   axStratum = xKeywords.xpath('./stratum')
                   unless axStratum.empty?
                      axStratum.each do |xStratum|
@@ -135,7 +135,7 @@ module ADIWG
                      end
                   end
 
-                  # kewords 1.6.4 (temporal) - temporal keywords {keyword}
+                  # keywords 1.6.4 (temporal) - temporal keywords {keyword}
                   axTemporal = xKeywords.xpath('./temporal')
                   unless axTemporal.empty?
                      axTemporal.each do |xTemporal|
@@ -170,7 +170,7 @@ module ADIWG
                      end
                   end
 
-                  # kewords bio (keywtax) - taxonomy keywords {keyword}
+                  # keywords bio (keywtax) - taxonomy keywords {keyword}
                   nodeName = xKeywords.xpath('./*').first.name
                   if nodeName == 'keywtax'
                      hKeyword = intMetadataClass.newKeyword

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

@@ -2,6 +2,7 @@
 # unpack fgdc spatial domain
 
 # History:
+#  Stan Smith 2017-11-25 fix: allows multiple bounding polygons
 #  Stan Smith 2017-08-22 original script
 
 require 'nokogiri'
@@ -59,14 +60,15 @@ module ADIWG
 
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
-                  hExtent = intMetadataClass.newExtent
-                  hGeoExtent = intMetadataClass.newGeographicExtent
-                  hExtent[:geographicExtents] << hGeoExtent
+                  hIntExtent = intMetadataClass.newExtent
+                  hIntGeoExtent = intMetadataClass.newGeographicExtent
+                  hIntExtent[:geographicExtents] << hIntGeoExtent
+                  hIntExtent[:description] = 'FGDC spatial domain'
 
                   # spatial domain bio (descgeog) - geographic description
                   description = xDomain.xpath('./descgeog').text
                   unless description.empty?
-                     hGeoExtent[:description] = description
+                     hIntGeoExtent[:description] = description
                   end
 
                   # spatial domain 1.5.1 (bounding) - bounding box
@@ -101,103 +103,115 @@ module ADIWG
 
                      end
 
-                     hGeoExtent[:boundingBox] = hBbox
+                     hIntGeoExtent[:boundingBox] = hBbox
                   end
 
-                  # spatial domain 1.5.2 (dsgpoly) - data set geographic polygon
-                  xPoly = xDomain.xpath('./dsgpoly')
-                  unless xPoly.empty?
-
-                     polygon = []
-
-                     # polygon 1.5.2.1 (dsgpolyo) - polygon outer ring
-                     xOring = xPoly.xpath('./dsgpolyo')
-                     unless xOring.empty?
-
-                        # outer ring 1.5.2.1.1 (grngpoin) - g ring point
-                        # outer ring 1.5.2.1.2 (gring) - g ring
-                        # outer ring must be counterclockwise
-                        aOutCoords = process_polygon(xOring)
-                        unless aOutCoords.empty?
-                           if AdiwgCoordinates.is_polygon_clockwise(aOutCoords)
-                              aOutCoords.reverse!
+                  # spatial domain 1.5.2 (dsgpoly) - data set geographic polygon []
+                  axPoly = xDomain.xpath('//dsgpoly')
+                  unless axPoly.empty?
+
+                     # start new feature collection
+                     hIntCollect = intMetadataClass.newFeatureCollection
+                     hIntCollect[:type] = 'FeatureCollection'
+                     hCollection = {
+                        'type' => 'FeatureCollection',
+                        'features' => []
+                     }
+
+                     axPoly.each do |xPoly|
+
+                        # place the polygon in a feature
+                        polygon = []
+
+                        # polygon 1.5.2.1 (dsgpolyo) - polygon outer ring
+                        xOring = xPoly.xpath('./dsgpolyo')
+                        unless xOring.empty?
+
+                           # outer ring 1.5.2.1.1 (grngpoin) - g ring point
+                           # outer ring 1.5.2.1.2 (gring) - g ring
+                           # outer ring must be counterclockwise
+                           aOutCoords = process_polygon(xOring)
+                           unless aOutCoords.empty?
+                              if AdiwgCoordinates.is_polygon_clockwise(aOutCoords)
+                                 aOutCoords.reverse!
+                              end
+                              polygon << aOutCoords
                            end
-                           polygon << aOutCoords
-                        end
 
-                        # first ring must be outer
-                        # only process if already have outer ring
-                        # polygon 1.5.2.2 (dsgpolyx) - polygon exclusion ring []
-                        axXring = xPoly.xpath('./dsgpolyx')
-                        axXring.each do |xRing|
-
-                           # exclusion ring 1.5.2.2.1 (grngpoin) - g ring point
-                           # exclusion ring 1.5.2.2.2 (gring) - g ring
-                           # exclusion ring must be clockwise
-                           aInCoords = process_polygon(xRing)
-                           unless aInCoords.empty?
-                              unless AdiwgCoordinates.is_polygon_clockwise(aInCoords)
-                                 aInCoords.reverse!
+                           # first ring must be outer
+                           # only process if already have outer ring
+                           # polygon 1.5.2.2 (dsgpolyx) - polygon exclusion ring []
+                           axXring = xPoly.xpath('./dsgpolyx')
+                           unless axXring.empty?
+                              axXring.each do |xRing|
+
+                                 # exclusion ring 1.5.2.2.1 (grngpoin) - g ring point
+                                 # exclusion ring 1.5.2.2.2 (gring) - g ring
+                                 # exclusion ring must be clockwise
+                                 aInCoords = process_polygon(xRing)
+                                 unless aInCoords.empty?
+                                    unless AdiwgCoordinates.is_polygon_clockwise(aInCoords)
+                                       aInCoords.reverse!
+                                    end
+                                    polygon << aInCoords
+                                 end
+
                               end
-                              polygon << aInCoords
                            end
 
                         end
-                     end
 
-                     unless polygon.empty?
-
-                        # make geoJson FeatureCollection from polygon
-                        hGeometry = {
-                           'type' => 'Polygon',
-                           'coordinates' => polygon
-                        }
-                        hFeature = {
-                           'type' => 'Feature',
-                           'geometry' => hGeometry,
-                           'properties' => {
-                              'description' => 'FGDC bounding polygon'
+                        unless polygon.empty?
+
+                           # make geoJson FeatureCollection from polygon
+                           hGeometry = {
+                              'type' => 'Polygon',
+                              'coordinates' => polygon
+                           }
+                           hFeature = {
+                              'type' => 'Feature',
+                              'geometry' => hGeometry,
+                              'properties' => {
+                                 'description' => 'FGDC bounding polygon'
+                              }
                            }
-                        }
-                        hCollection = {
-                           'type' => 'FeatureCollection',
-                           'features' => [hFeature]
-                        }
-                        geoJson = hCollection
-
-                        # make internal geometries from polygon
-                        hIntGeo = intMetadataClass.newGeometryObject
-                        hIntGeo[:type] = 'Polygon'
-                        hIntGeo[:coordinates] = polygon
-                        hIntGeo[:nativeGeoJson] = hGeometry
-
-                        hIntProps = intMetadataClass.newGeometryProperties
-                        hIntProps[:description] = 'FGDC bounding polygon'
-
-                        hIntFeature = intMetadataClass.newGeometryFeature
-                        hIntFeature[:type] = 'Feature'
-                        hIntFeature[:geometryObject] = hIntGeo
-                        hIntFeature[:nativeGeoJson] = hFeature
-                        hIntFeature[:properties] = hIntProps
-
-                        hIntCollect = intMetadataClass.newFeatureCollection
-                        hIntCollect[:type] = 'FeatureCollection'
-                        hIntCollect[:features] << hIntFeature
-                        hIntCollect[:nativeGeoJson] = hCollection
-
-                        hGeoExtent[:geographicElements] << hIntCollect
-                        hGeoExtent[:nativeGeoJson] << geoJson
-
-                        hExtent[:description] = 'FGDC spatial domain'
+                           hCollection['features'] << hFeature
+
+                           # make internal geometry object from polygon
+                           hIntGeo = intMetadataClass.newGeometryObject
+                           hIntGeo[:type] = 'Polygon'
+                           hIntGeo[:coordinates] = polygon
+                           hIntGeo[:nativeGeoJson] = hGeometry
+
+                           # make internal geometry feature from geometry object
+                           hIntFeature = intMetadataClass.newGeometryFeature
+                           hIntFeature[:type] = 'Feature'
+                           hIntFeature[:geometryObject] = hIntGeo
+                           hIntFeature[:nativeGeoJson] = hFeature
+
+                           # add properties to geometry feature
+                           hIntProps = intMetadataClass.newGeometryProperties
+                           hIntProps[:description] = 'FGDC bounding polygon'
+                           hIntFeature[:properties] = hIntProps
+
+                           # place feature into collection
+                           # the collection nativeGeoJson is rewritten each pass
+                           hIntCollect[:features] << hIntFeature
+                           hIntCollect[:nativeGeoJson] = hCollection
 
+                        end
                      end
-                  end
 
-                  return hExtent
+                     # place collection into geographic extent
+                     hIntGeoExtent[:geographicElements] << hIntCollect
+                     hIntGeoExtent[:nativeGeoJson] << hIntCollect[:nativeGeoJson]
 
-               end
+                  end
+
+                  return hIntExtent
 
-            end
+               end # unpack
+            end # SpatialDomain
 
          end
       end

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

@@ -65,6 +65,9 @@ module ADIWG
                      end
 
                      # time period 9.2 (mdattim) - multiple date times
+                     # -> place into timePeriod since mdJson does not handle multi-date
+                     # -> did not put multi-date in temporalExtent since it would be
+                     # -> difficult to return it to the same context
                      xMulti = xTimeInfo.xpath('./mdattim')
                      unless xMulti.empty?
 

data/lib/adiwg/mdtranslator/readers/fgdc/readme.md

@@ -16,3 +16,7 @@ Standards that are now encouraged for use.
 
 The FGDC CSDGM format standard is fully documented on the 
 [Content Standard for Digital Geospatial Metadata page](https://www.fgdc.gov/metadata/csdgm-standard).
+
+This FGDC reader extends the FGDC standard by added the Biological Data Profile 
+FGDC-STD-001.1-1999 as defined by the U.S. Geological Survey National Biological
+Information Infrastructure (NBII).