adiwg-mdtranslator 2.14.2 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f936bf8f803d1d897ab81cedb72b01cef62c2f04
-  data.tar.gz: 0eb58340f8b1c05bb16b609ef7a52cf33bd9011e
+  metadata.gz: 4c28a9de2c4b82b2f0b46f4de13a87b8de286d98
+  data.tar.gz: af96ef12d442a941918a23842bd74aa027d0d1a2
 SHA512:
-  metadata.gz: 78b572ef52d9a6ea5582aea779711e88d0d912fe8b41038aff7dc417b6f85fc1a5fd3b802366e36dd6c355926826595db530b9d005cf5c6b4b344d066e7a15e0
-  data.tar.gz: b3d11275d81beeeeaa13dc63d72b2229ca9cf0f300a29f80b2d304cdf2acc63b589b979c916cc89fc87e47761568b80697079e46f4547088d90941241d4fc9ef
+  metadata.gz: f428c56a2f93748c0482746b31278bbacd995080416a6c28e3aa195c1ca16b30a02a73ee3a1a1b7e45037f8f4fa28ee0db3735dc630903af85a6cedf58253ad4
+  data.tar.gz: 1a8b0cc95da21914bab8eae81d2b9f55b962984cc583e76fc49472ca8c14b1b0d3d9b0e3d16ef9f1c3b27986eadd954edc78e341b25228eb7a73de85e1f4f7b9

data/.travis.yml

@@ -3,9 +3,9 @@ sudo: false
 language: ruby
 before_install: 'gem install bundler'
 rvm:
-  - "2.3"
   - "2.4"
   - "2.5"
+  - "2.6"
   - jruby-head
   - ruby-head
 matrix:

data/CHANGELOG.md

@@ -1,7 +1,25 @@
 # Change Log
 
-## [v2.14.0](https://github.com/adiwg/mdTranslator/tree/v2.14.0)
+## [v2.15.0](https://github.com/adiwg/mdTranslator/tree/v2.15.0)
 
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.14.2...v2.15.0)
+
+**Implemented enhancements:**
+
+- Add writer for ISO 19115-1 [\#207](https://github.com/adiwg/mdTranslator/issues/207)
+- Add ISO 19115-3 \(1\) Support [\#209](https://github.com/adiwg/mdTranslator/pull/209) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.14.2](https://github.com/adiwg/mdTranslator/tree/v2.14.2) (2018-11-02)
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.14.1...v2.14.2)
+
+## [v2.14.1](https://github.com/adiwg/mdTranslator/tree/v2.14.1) (2018-11-01)
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.14.0...v2.14.1)
+
+**Merged pull requests:**
+
+- Fix issue with empty verticalDatum objects [\#205](https://github.com/adiwg/mdTranslator/pull/205) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.14.0](https://github.com/adiwg/mdTranslator/tree/v2.14.0) (2018-10-31)
 [Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.13.3...v2.14.0)
 
 **Closed issues:**
@@ -106,6 +124,7 @@
 
 - Minor bug fixes [\#182](https://github.com/adiwg/mdTranslator/pull/182) ([stansmith907](https://github.com/stansmith907))
 - mdTranslator version 2.9.0 [\#181](https://github.com/adiwg/mdTranslator/pull/181) ([stansmith907](https://github.com/stansmith907))
+- Remove repository name from harvest set tag in sbJson writer.  [\#151](https://github.com/adiwg/mdTranslator/pull/151) ([stansmith907](https://github.com/stansmith907))
 
 ## [v2.9.1](https://github.com/adiwg/mdTranslator/tree/v2.9.1) (2018-02-03)
 [Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.9.0...v2.9.1)
@@ -216,10 +235,6 @@
 ## [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)
 

data/Rakefile

@@ -11,6 +11,7 @@ Rake::TestTask.new do |t|
       'test/writers/fgdc/tc*.rb',
       'test/writers/html/tc*.rb',
       'test/writers/iso19110/tc*.rb',
+      'test/writers/iso19115-1/tc*.rb',
       'test/writers/iso19115-2/tc*.rb',
       'test/writers/mdJson/tc*.rb',
       'test/writers/sbJson/tc*.rb',
@@ -28,6 +29,7 @@ task :default => :test
    # 'test/writers/fgdc/tc*.rb',
    # 'test/writers/html/tc*.rb',
    # 'test/writers/iso19110/tc*.rb',
+   # 'test/writers/iso19115-1/tc*.rb',
    # 'test/writers/iso19115-2/tc*.rb',
    # 'test/writers/mdJson/tc*.rb',
    # 'test/writers/sbJson/tc*.rb',

data/adiwg-mdtranslator.gemspec

@@ -1,6 +1,7 @@
 # coding: utf-8
 # History
 #  Stan Smith 2017-05-16 remove rgeo 0.5 support
+#  Stan Smith 2019-03-19 migrated to version 2 bundler
 
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -24,7 +25,7 @@ Gem::Specification.new do |spec|
 
    spec.required_ruby_version = '>= 2.3'
 
-   spec.add_development_dependency "bundler", "~> 1"
+   spec.add_development_dependency "bundler", "~> 2"
    spec.add_development_dependency "rake", "~> 10"
    spec.add_development_dependency "minitest", "~> 5"
 

data/lib/adiwg/mdtranslator.rb

@@ -26,6 +26,7 @@
 # 	Stan Smith 2014-07-02 original script
 
 # required by readers and writers
+require 'adiwg/mdtranslator/internal/module_dateTimeFun'
 require 'adiwg/mdtranslator/version'
 require 'adiwg/mdtranslator/readers/mdReaders'
 require 'adiwg/mdtranslator/writers/mdWriters'

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

@@ -0,0 +1,26 @@
+# codelist methods
+# for ADIwg readers and writers
+
+# History:
+# 	Stan Smith 2019-03-22 original script
+
+require 'adiwg-mdcodes'
+
+module CodelistFun
+
+   def self.validateItem(codeList, codeName)
+
+      # get requested codelist from the adiwg-mdcodes gem
+      mdCodelist = ADIWG::Mdcodes.getCodelistDetail(codeList)
+
+      aCodes = mdCodelist['codelist']
+
+      # search the codelist for a matching codeName
+      aCodes.each do |hCode|
+         return true if hCode['codeName'] == codeName
+      end
+      return false
+
+   end
+
+end

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

@@ -76,6 +76,9 @@ module AdiwgCoordinates
          unpackGeometry(hGeo, aNorthings, aEastings)
       end
 
+      # return if no coordinates found in geographic object(s)
+      return {} if aNorthings.empty? || aEastings.empty?
+
       # find most north/south points
       north = aNorthings.max
       south = aNorthings.min

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

@@ -3,8 +3,8 @@
 
 # History:
 #  Stan Smith 2018-02-20 added tests for valid date and time formats
-# 	Stan Smith 2013-09-26 original script
 # 	Stan Smith 2013-12-06 added support for fractional seconds
+# 	Stan Smith 2013-09-26 original script
 
 require 'date'
 

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

@@ -6,7 +6,6 @@
 
 require 'date'
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
-require 'adiwg/mdtranslator/internal/module_dateTimeFun'
 require_relative 'module_fgdc'
 require_relative 'module_dateTime'
 

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

@@ -7,7 +7,6 @@
 
 require 'date'
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
-require 'adiwg/mdtranslator/internal/module_dateTimeFun'
 require_relative 'module_fgdc'
 
 module ADIWG

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

@@ -222,7 +222,7 @@ module ADIWG
                   nodeName = xKeywords.xpath('.').first.name
                   if nodeName == 'methodid'
                      hKeyword = intMetadataClass.newKeyword
-                     hKeyword[:keywordType] = 'method'
+                     hKeyword[:keywordType] = 'methodology'
 
                      # theme bio.1.1 (methkt) - lineage method keyword thesaurus {citation}
                      thesaurus = xKeywords.xpath('./methkt').text

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

@@ -2,6 +2,7 @@
 # unpack fgdc taxonomy system
 
 # History:
+#  Stan Smith 2019-05-17 fixed, changed idref output from identifier to citation
 #  Stan Smith 2017-09-20 original script
 
 require 'nokogiri'
@@ -64,10 +65,7 @@ module ADIWG
                      axTaxRef.each do |xTaxRef|
                         hCitation = Citation.unpack(xTaxRef, hResponseObj)
                         unless hCitation.nil?
-                           hIdentifier = intMetadataClass.newIdentifier
-                           hIdentifier[:identifier] = 'none'
-                           hIdentifier[:citation] = hCitation
-                           hTaxonomy[:idReferences] << hIdentifier
+                           hTaxonomy[:idReferences] << hCitation
                         end
                      end
                   end

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

@@ -105,7 +105,6 @@ module ADIWG
                      end
                   end
 
-                  # TODO need outContext
                   # contact - address [address]
                   if hContact.has_key?('address')
                      aItems = hContact['address']

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

@@ -5,8 +5,6 @@
 #  Stan Smith 2018-06-18 refactored error and warning messaging
 #  Stan Smith 2016-10-12 original script
 
-require 'adiwg/mdtranslator/internal/module_dateTimeFun'
-
 module ADIWG
    module Mdtranslator
       module Readers

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

@@ -9,8 +9,6 @@
 #  Stan Smith 2015-07-14 refactored to remove global namespace constants
 # 	Stan Smith 2013-12-11 original script
 
-require 'adiwg/mdtranslator/internal/module_dateTimeFun'
-
 module ADIWG
    module Mdtranslator
       module Readers

data/lib/adiwg/mdtranslator/readers/sbJson/modules/module_provenance.rb

@@ -5,7 +5,6 @@
 #   Stan Smith 2016-06-20 original script
 
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
-require 'adiwg/mdtranslator/internal/module_dateTimeFun'
 
 module ADIWG
    module Mdtranslator

data/lib/adiwg/mdtranslator/version.rb

@@ -1,7 +1,8 @@
 # adiwg mdTranslator
 
 # version 2 history
-# 2.14.2 2018-11-1  fix fgdc reader error messages
+# 2.15.0 2019-05-15 added ISO 19115-3(1) writer
+# 2.14.2 2018-11-02 changed keywordType from 'method' to 'methodology' for FGDC reader/writer
 # 2.14.1 2018-10-31 add fix for empty verticalDatum in fgdc and iso 19115_2 writers
 # 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
@@ -103,7 +104,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.14.2"
+      VERSION = "2.15.0"
    end
 end
 

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

@@ -5,7 +5,6 @@
 #  Stan Smith 2018-02-26 refactored error and warning messaging
 #  Stan Smith 2018-01-24 original script
 
-require 'adiwg/mdtranslator/internal/module_dateTimeFun'
 require_relative '../fgdc_writer'
 require_relative 'class_dataDomain'
 

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

@@ -5,7 +5,6 @@
 #  Stan Smith 2018-02-26 refactored error and warning messaging
 #  Stan Smith 2017-11-17 original script
 
-require 'adiwg/mdtranslator/internal/module_dateTimeFun'
 require_relative '../fgdc_writer'
 require_relative 'class_series'
 require_relative 'class_publisher'

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

@@ -6,7 +6,6 @@
 #  Stan Smith 2018-01-19 convert ISO date formats to FGDC
 #  Stan Smith 2017-11-23 original script
 
-require 'adiwg/mdtranslator/internal/module_dateTimeFun'
 require_relative '../fgdc_writer'
 
 module ADIWG

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

@@ -6,7 +6,6 @@
 #  Stan Smith 2018-01-19 convert ISO date formats to FGDC
 #  Stan Smith 2017-11-23 original script
 
-require 'adiwg/mdtranslator/internal/module_dateTimeFun'
 require_relative '../fgdc_writer'
 
 module ADIWG

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

@@ -34,7 +34,7 @@ module ADIWG
                   haveMethod = true unless hLineage[:lineageCitation].empty?
                   aKeywords = hIntObj[:metadata][:resourceInfo][:keywords]
                   aKeywords.each do |hKeyword|
-                     if hKeyword[:keywordType] == 'method'
+                     if %w(method methodology).include?(hKeyword[:keywordType])
                         haveMethod = true
                      end
                   end

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

@@ -26,7 +26,7 @@ module ADIWG
                   haveMethod = false
                   aKeywords.each do |hKeySet|
                      type = hKeySet[:keywordType]
-                     if type == 'method'
+                     if type == 'method' || type == 'methodology'
                         aKeywords = hKeySet[:keywords]
                         hThesaurus = hKeySet[:thesaurus]
                         thesaurusName = nil

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

@@ -5,7 +5,6 @@
 #  Stan Smith 2018-03-19 refactored error and warning messaging
 #  Stan Smith 2017-12-18 original script
 
-require 'adiwg/mdtranslator/internal/module_dateTimeFun'
 require_relative '../fgdc_writer'
 require_relative 'class_contact'
 

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

@@ -6,7 +6,6 @@
 #  Stan Smith 2018-01-31 original script
 
 require_relative '../fgdc_writer'
-require 'adiwg/mdtranslator/internal/module_dateTimeFun'
 
 module ADIWG
    module Mdtranslator

data/lib/adiwg/mdtranslator/writers/html/sections/html_taxonomy.rb

@@ -8,7 +8,6 @@
 # 	Stan Smith 2015-03-25 original script
 
 require_relative 'html_citation'
-require_relative 'html_identifier'
 require_relative 'html_responsibility'
 require_relative 'html_taxonomyClass'
 
@@ -27,7 +26,6 @@ module ADIWG
 
                   # classes used
                   citationClass = Html_Citation.new(@html)
-                  identifierClass = Html_Identifier.new(@html)
                   responsibilityClass = Html_Responsibility.new(@html)
                   taxonomicClass = Html_TaxonomyClass.new(@html)
 
@@ -94,7 +92,7 @@ module ADIWG
                   # taxonomy - identification references
                   hTaxonomy[:idReferences].each do |hReference|
                      @html.details do
-                        @html.summary('Non-Authoritative Reference', {'class' => 'h5'})
+                        @html.summary('Non-Authoritative Identification Reference', {'class' => 'h5'})
                         @html.section(:class => 'block') do
                            citationClass.writeHtml(hReference)
                         end

data/lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_additionalDocument.rb

@@ -0,0 +1,48 @@
+# ISO <<Class>> MD_AssociatedResource
+# 19115-1 writer output in XML
+
+# History:
+# 	Stan Smith 2019-04-22 original script
+
+require_relative 'class_citation'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Iso19115_1
+
+            class AdditionalDocument
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_1
+               end
+
+               def writeXML(hAdditionalDoc, inContext = nil)
+
+                  # classes used
+                  citationClass = CI_Citation.new(@xml, @hResponseObj)
+
+                  outContext = 'additional document'
+                  outContext = inContext + ' additional document' unless inContext.nil?
+
+                  # additional document - resource type [] {MD_ScopeCode} - not used by ISO
+
+                  # additional document - additional documentation [] {CI_Citation}
+                  aDocs = hAdditionalDoc[:citation]
+                  aDocs.each do |hCitation|
+                     unless hCitation.empty?
+                        @xml.tag!('mri:additionalDocumentation') do
+                           citationClass.writeXML(hCitation, outContext)
+                        end
+                     end
+                  end
+
+               end # writeXML
+            end # AdditionalDocument class
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_address.rb

@@ -0,0 +1,90 @@
+# ISO <<Class>> CI_Address
+# 19115-1 writer output in XML
+
+# History:
+# 	Stan Smith 2019-03-18 original script
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Iso19115_1
+
+            class CI_Address
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+               end
+
+               def writeXML(hAddress)
+                  
+                  @xml.tag!('cit:CI_Address') do
+
+
+                     unless hAddress.nil?
+
+                        # address - address type (not used by ISO 19115-1)
+
+                        # address - description (not used by ISO 19115-1)
+
+                        # address - delivery points []
+                        aDeliveryPoints = hAddress[:deliveryPoints]
+                        aDeliveryPoints.each do |myPoint|
+                           @xml.tag!('cit:deliveryPoint') do
+                              @xml.tag!('gco:CharacterString', myPoint)
+                           end
+                        end
+                        if aDeliveryPoints.empty? && @hResponseObj[:writerShowTags]
+                           @xml.tag!('cit:deliveryPoint')
+                        end
+
+                        # address - city
+                        unless hAddress[:city].nil?
+                           @xml.tag!('cit:city') do
+                              @xml.tag!('gco:CharacterString', hAddress[:city])
+                           end
+                        end
+                        if hAddress[:city].nil? && @hResponseObj[:writerShowTags]
+                           @xml.tag!('cit:city')
+                        end
+
+                        # address - administrative area
+                        unless hAddress[:adminArea].nil?
+                           @xml.tag!('cit:administrativeArea') do
+                              @xml.tag!('gco:CharacterString', hAddress[:adminArea])
+                           end
+                        end
+                        if hAddress[:adminArea].nil? && @hResponseObj[:writerShowTags]
+                           @xml.tag!('cit:administrativeArea')
+                        end
+
+                        # address - postal code
+                        unless hAddress[:postalCode].nil?
+                           @xml.tag!('cit:postalCode') do
+                              @xml.tag!('gco:CharacterString', hAddress[:postalCode])
+                           end
+                        end
+                        if hAddress[:postalCode].nil? && @hResponseObj[:writerShowTags]
+                           @xml.tag!('cit:postalCode')
+                        end
+
+                        # address - country
+                        unless hAddress[:country].nil?
+                           @xml.tag!('cit:country') do
+                              @xml.tag!('gco:CharacterString', hAddress[:country])
+                           end
+                        end
+                        if hAddress[:country].nil? && @hResponseObj[:writerShowTags]
+                           @xml.tag!('cit:country')
+                        end
+
+                     end
+
+                  end # CI_Address tag
+               end # writeXML
+            end # CI_Address class
+
+         end
+      end
+   end
+end