adiwg-mdtranslator 2.10.0 → 2.12.0.pre

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_dataIdentification.rb

@@ -2,6 +2,7 @@
 # 19115-2 writer output in XML
 
 # History:
+#  Stan Smith 2018-04-06 changed taxonomy to an array
 #  Stan Smith 2018-01-05 deprecated topicCategory[]
 #  Stan Smith 2018-01-05 get topics from keywords where type='isoTopicCategory'
 #  Stan Smith 2016-12-13 refactored for mdTranslator/mdJson 2.0
@@ -252,16 +253,22 @@ module ADIWG
                         @xml.tag!('gmd:aggregationInfo')
                      end
 
-                     # data identification - taxonomy
-                     hTaxonomy = hData[:taxonomy]
-                     unless hTaxonomy.empty?
-                        @xml.tag!('gmd:taxonomy') do
-                           taxClass.writeXML(hTaxonomy)
+                     # data identification - taxonomy (first)
+                     unless hData[:taxonomy].empty?
+                        hTaxonomy = hData[:taxonomy][0]
+                        unless hTaxonomy.empty?
+                           @xml.tag!('gmd:taxonomy') do
+                              taxClass.writeXML(hTaxonomy)
+                           end
                         end
                      end
-                     if hTaxonomy.empty? && @hResponseObj[:writerShowTags]
+                     if hData[:taxonomy].empty? && @hResponseObj[:writerShowTags]
                         @xml.tag!('gmd:taxonomy')
                      end
+                     if hData[:taxonomy].length > 1
+                        # - {id: 186, message: "multiple taxonomic structures were specified, CSDGM allows for only one"}
+                        # - {id: 187, message: "the first taxonomic structure was written to the metadata record"}
+                     end
 
                      # data identification - spatial representation type []
                      aSpatialType = hData[:spatialRepresentationTypes]

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_extension.rb

@@ -100,7 +100,7 @@ module ADIWG
                                     s = hExtension[:dataType]
                                     unless s.nil?
                                         @xml.tag!('gmd:dataType') do
-                                            codelistClass.writeXML('gmd', 'iso_dataType',s)
+                                            codelistClass.writeXML('gmd', 'iso_entityType',s)
                                         end
                                     end
                                     if s.nil?

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_allocation.rb

@@ -1,10 +1,12 @@
 # mdJson 2.0 writer - allocation
 
 # History:
+#  Stan Smith 2018-03-31 added responsibleParties []
 #  Stan Smith 2017-08-31 refactored for mdJson schema 2.3
 #  Stan Smith 2017-03-20 original script
 
 require 'jbuilder'
+require_relative 'mdJson_responsibleParty'
 require_relative 'mdJson_onlineResource'
 
 module ADIWG
@@ -24,6 +26,7 @@ module ADIWG
                      json.currency hAllocation[:currency]
                      json.sourceId hAllocation[:sourceId]
                      json.recipientId hAllocation[:recipientId]
+                     json.responsibleParty @Namespace.json_map(hAllocation[:responsibleParties], ResponsibleParty)
                      json.matching hAllocation[:matching]
                      json.onlineResource @Namespace.json_map(hAllocation[:onlineResources], OnlineResource)
                      json.comment hAllocation[:comment]

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_resourceInfo.rb

@@ -1,9 +1,10 @@
 # mdJson 2.0 writer - resource information
 
 # History:
-#   Stan Smith 2017-05-16 deprecated topicCategory
-#   Stan Smith 2017-03-11 refactored for mdJson/mdTranslator 2.0
-#   Josh Bradley original script
+#  Stan Smith 2018-04-06 changed taxonomy to an array
+#  Stan Smith 2017-05-16 deprecated topicCategory
+#  Stan Smith 2017-03-11 refactored for mdJson/mdTranslator 2.0
+#  Josh Bradley original script
 
 require 'jbuilder'
 require_relative 'mdJson_resourceType'
@@ -52,7 +53,7 @@ module ADIWG
                      json.temporalResolution @Namespace.json_map(hResInfo[:temporalResolutions], Duration)
                      json.extent @Namespace.json_map(hResInfo[:extents], Extent)
                      json.coverageDescription @Namespace.json_map(hResInfo[:coverageDescriptions], CoverageDescription)
-                     json.taxonomy Taxonomy.build(hResInfo[:taxonomy]) unless hResInfo[:taxonomy].empty?
+                     json.taxonomy @Namespace.json_map(hResInfo[:taxonomy], Taxonomy)
                      json.graphicOverview @Namespace.json_map(hResInfo[:graphicOverviews], GraphicOverview)
                      json.resourceFormat @Namespace.json_map(hResInfo[:resourceFormats], Format)
                      json.keyword @Namespace.json_map(hResInfo[:keywords], Keyword)

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_taxonomicClassification.rb

@@ -1,8 +1,10 @@
 # mdJson 2.0 writer - taxonomic classification
 
 # History:
-#   Stan Smith 2017-03-17 refactored for mdJson/mdTranslator 2.0
-#   Josh Bradley original script
+#  Stan Smith 2018-04-06 renamed taxonomicRank to taxonomicLevel
+#  Stan Smith 2018-04-06 renamed latinName to taxonomicName
+#  Stan Smith 2017-03-17 refactored for mdJson/mdTranslator 2.0
+#  Josh Bradley original script
 
 require 'jbuilder'
 require_relative 'mdJson_taxonomicClassification'
@@ -20,8 +22,8 @@ module ADIWG
 
                   Jbuilder.new do |json|
                      json.taxonomicSystemId hTaxon[:taxonId]
-                     json.taxonomicRank hTaxon[:taxonRank]
-                     json.latinName hTaxon[:taxonValue]
+                     json.taxonomicLevel hTaxon[:taxonRank]
+                     json.taxonomicName hTaxon[:taxonValue]
                      json.commonName hTaxon[:commonNames] unless hTaxon[:commonNames].empty?
                      json.subClassification @Namespace.json_map(hTaxon[:subClasses], TaxonomicClassification)
                   end

data/lib/adiwg/mdtranslator_cli.rb

@@ -2,6 +2,7 @@
 # ADIwg mdTranslator - Thor CLI for mdtranslator
 
 # History:
+#  Stan Smith 2018-04-07 add 'fgdc' option to reader and writer enum list
 #  Stan Smith 2018-02-26 add 'forceValid' parameter
 #  Stan Smith 2017-04-21 removed inline CSS option
 #  Stan Smith 2015-07-17 added method_options to provide custom CSS
@@ -32,14 +33,23 @@ force output metadata to meet standard, add personalized CSS to headers to HTML
 and to choose the level of validation for mdJson input files.
    LONGDESC
    # define cli options
-   method_option :reader, :aliases => '-r', :desc => 'Reader to read your input metadata file', :enum => %w{mdJson sbJson}, :required => true
-   method_option :writer, :aliases => '-w', :desc => 'Writer to create your output metadata file, leave blank to validate input only', :enum => %w{iso19115_2 iso19110 html mdJson sbJson}
-   method_option :validate, :aliases => '-v', :desc => 'Specify level of validation to be performed', :enum => %w{none normal strict}, :default => 'normal'
-   method_option :forceValid, :aliases => '-f', :desc => 'Insert tags for required elements missing from input', :type => :boolean, :default => true
-   method_option :showAllTags, :aliases => '-s', :desc => 'Include tags for unused attributes', :type => :boolean, :default => false
-   method_option :messages, :aliases => '-m', :desc => 'On error return messages as formatted text or json object', :enum => %w{json text}, :default => 'text'
-   method_option :returnObject, :aliases => '-o', :desc => 'Return full JSON object generated by translator', :type => :boolean, :default => false
-   method_option :cssLink, :desc => 'Fully qualified link to a CSS file to customize HTML writer output', :type => :string
+   method_option :reader, :aliases => '-r', :desc => 'Reader to read your input metadata file',
+                 :enum => %w{mdJson sbJson fgdc}, :required => true
+   method_option :writer, :aliases => '-w',
+                 :desc => 'Writer to create your output metadata file, leave blank to validate input only',
+                 :enum => %w{iso19115_2 iso19110 html mdJson sbJson fgdc}
+   method_option :validate, :aliases => '-v', :desc => 'Specify level of validation to be performed',
+                 :enum => %w{none normal strict}, :default => 'normal'
+   method_option :forceValid, :aliases => '-f', :desc => 'Insert tags for required elements missing from input',
+                 :type => :boolean, :default => true
+   method_option :showAllTags, :aliases => '-s', :desc => 'Include tags for unused attributes',
+                 :type => :boolean, :default => false
+   method_option :messages, :aliases => '-m', :desc => 'On error return messages as formatted text or json object',
+                 :enum => %w{json text}, :default => 'text'
+   method_option :returnObject, :aliases => '-o', :desc => 'Return full JSON object generated by translator',
+                 :type => :boolean, :default => false
+   method_option :cssLink, :desc => 'Fully qualified link to a CSS file to customize HTML writer output',
+                 :type => :string
 
    # accept command and options
    def translate(file)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.12.0.pre
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,14 +143,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -329,6 +329,7 @@ files:
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_citation.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_constraint.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_contact.rb
+- lib/adiwg/mdtranslator/readers/mdJson/modules/module_contactPostprocess.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_coordinateResolution.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_coverageDescription.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_dataDictionary.rb
@@ -466,8 +467,7 @@ files:
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_keyword.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_lineage.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_localSystem.rb
-- lib/adiwg/mdtranslator/writers/fgdc/classes/class_mapCoordinateInfo.rb
-- lib/adiwg/mdtranslator/writers/fgdc/classes/class_mapProjection.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_mapProjectionTags.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_metadataInfo.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_method.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_methodKeywords.rb
@@ -475,6 +475,10 @@ files:
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_onlineOption.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_orderProcess.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_phone.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_planarGrid.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_planarInfo.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_planarLocal.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_planarMap.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_planarReference.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_process.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_publisher.rb
@@ -494,6 +498,7 @@ files:
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_transferInfo.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_verticalDatum.rb
 - lib/adiwg/mdtranslator/writers/fgdc/fgdc_writer.rb
+- lib/adiwg/mdtranslator/writers/fgdc/fgdc_writer_messages_eng.yml
 - lib/adiwg/mdtranslator/writers/fgdc/readme.md
 - lib/adiwg/mdtranslator/writers/fgdc/version.rb
 - lib/adiwg/mdtranslator/writers/html/html_writer.rb
@@ -615,6 +620,7 @@ files:
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_series.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_unitsOfMeasure.rb
 - lib/adiwg/mdtranslator/writers/iso19110/iso19110_writer.rb
+- lib/adiwg/mdtranslator/writers/iso19110/iso19110_writer_messages_eng.yml
 - lib/adiwg/mdtranslator/writers/iso19110/readme.md
 - lib/adiwg/mdtranslator/writers/iso19110/version.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_address.rb
@@ -842,9 +848,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8

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

@@ -1,167 +0,0 @@
-# FGDC <<Class>> SpatialReference
-# FGDC CSDGM writer output in XML
-
-# History:
-#  Stan Smith 2018-01-12 original script
-
-module ADIWG
-   module Mdtranslator
-      module Writers
-         module Fgdc
-
-            class CoordinateInformation
-
-               def initialize(xml, hResponseObj)
-                  @xml = xml
-                  @hResponseObj = hResponseObj
-               end
-
-               def writeXML(aRepTypes, aResolutions)
-
-                  haveCInfo = false
-                  haveCInfo = true unless aRepTypes.empty?
-                  aResolutions.each do |hResolution|
-                     haveCInfo = true if hResolution[:coordinateResolution]
-                     haveCInfo = true if hResolution[:bearingDistanceResolution]
-                  end
-                  unitOfMeasure = nil
-
-                  # coordinate information 4.1.2.4 (planci) - planar coordinate information
-                  if haveCInfo
-                     @xml.tag!('planar') do
-                        @xml.tag!('planci') do
-
-                           # coordinate information 4.1.2.4.1 (plance) - planar coordinate encoding method (required)
-                           # <- spatialRepresentationTypes[].first
-                           unless aRepTypes.empty?
-                              @xml.tag!('plance', aRepTypes[0])
-                           end
-                           if aRepTypes.empty?
-                              @hResponseObj[:writerPass] = false
-                              @hResponseObj[:writerMessages] << 'Planar Coordinate Information is missing encoding method'
-                           end
-
-                           # <- spatialResolutions[] look for coordinateResolution and bearingDistanceResolution
-                           # take first encountered, only one is permitted from file
-                           aResolutions.each do |hResolution|
-                              unless hResolution[:coordinateResolution].empty?
-                                 hCoordRes = hResolution[:coordinateResolution]
-
-                                 # coordinate information 4.1.2.4.2 (coordrep) - coordinate representation
-                                 @xml.tag!('coordrep') do
-
-                                    # coordinate information 4.1.2.4.2.1 (absres) - abscissa resolution (required)
-                                    unless hCoordRes[:abscissaResolutionX].nil?
-                                       @xml.tag!('absres', hCoordRes[:abscissaResolutionX].to_f)
-                                    end
-                                    if hCoordRes[:abscissaResolutionX].nil?
-                                       @hResponseObj[:writerPass] = false
-                                       @hResponseObj[:writerMessages] << 'Coordinate Representation is missing abscissa resolution'
-                                    end
-
-                                    # coordinate information 4.1.2.4.2.2 (ordres) - ordinate resolution (required)
-                                    unless hCoordRes[:ordinateResolutionY].nil?
-                                       @xml.tag!('ordres', hCoordRes[:ordinateResolutionY].to_f)
-                                    end
-                                    if hCoordRes[:ordinateResolutionY].nil?
-                                       @hResponseObj[:writerPass] = false
-                                       @hResponseObj[:writerMessages] << 'Coordinate Representation is missing ordinate resolution'
-                                    end
-
-                                    # coordinate information 4.1.2.4.4 (plandu) - distance unit of measure (required)
-                                    unless hCoordRes[:unitOfMeasure].nil?
-                                       unitOfMeasure = hCoordRes[:unitOfMeasure]
-                                    end
-                                    if hCoordRes[:unitOfMeasure].nil?
-                                       @hResponseObj[:writerPass] = false
-                                       @hResponseObj[:writerMessages] << 'Bearing-Distance Representation is missing planar distance units'
-                                    end
-
-                                 end
-                                 break
-                              end
-
-                              unless hResolution[:bearingDistanceResolution].empty?
-                                 hBearRes = hResolution[:bearingDistanceResolution]
-
-                                 # coordinate information 4.1.2.4.3 (distbrep) - bearing and distance representation
-                                 @xml.tag!('distbrep') do
-
-                                    # coordinate information 4.1.2.4.3.1 (distres) - distance resolution (required)
-                                    unless hBearRes[:distanceResolution].nil?
-                                       @xml.tag!('distres', hBearRes[:distanceResolution].to_f)
-                                    end
-                                    if hBearRes[:distanceResolution].nil?
-                                       @hResponseObj[:writerPass] = false
-                                       @hResponseObj[:writerMessages] << 'Bearing-Distance Representation is missing distance resolution'
-                                    end
-
-                                    # coordinate information 4.1.2.4.3.2 (bearres) - bearing resolution (required)
-                                    unless hBearRes[:bearingResolution].nil?
-                                       @xml.tag!('bearres', hBearRes[:bearingResolution])
-                                    end
-                                    if hBearRes[:bearingResolution].nil?
-                                       @hResponseObj[:writerPass] = false
-                                       @hResponseObj[:writerMessages] << 'Bearing-Distance Representation is missing bearing resolution'
-                                    end
-
-                                    # coordinate information 4.1.2.4.3.3 (bearunit) - bearing units of measure (required)
-                                    unless hBearRes[:bearingUnitOfMeasure].nil?
-                                       @xml.tag!('bearunit', hBearRes[:bearingUnitOfMeasure])
-                                    end
-                                    if hBearRes[:bearingUnitOfMeasure].nil?
-                                       @hResponseObj[:writerPass] = false
-                                       @hResponseObj[:writerMessages] << 'Bearing-Distance Representation is missing bearing units'
-                                    end
-
-                                    # coordinate information 4.1.2.4.3.4 (bearrefd) - bearing units of measure (required)
-                                    unless hBearRes[:bearingReferenceDirection].nil?
-                                       @xml.tag!('bearrefd', hBearRes[:bearingReferenceDirection])
-                                    end
-                                    if hBearRes[:bearingReferenceDirection].nil?
-                                       @hResponseObj[:writerPass] = false
-                                       @hResponseObj[:writerMessages] << 'Bearing-Distance Representation is missing bearing reference direction'
-                                    end
-
-                                    # coordinate information 4.1.2.4.3.5 (bearrefm) - bearing reference meridian (required)
-                                    unless hBearRes[:bearingReferenceMeridian].nil?
-                                       @xml.tag!('bearrefm', hBearRes[:bearingReferenceMeridian])
-                                    end
-                                    if hBearRes[:bearingReferenceMeridian].nil?
-                                       @hResponseObj[:writerPass] = false
-                                       @hResponseObj[:writerMessages] << 'Bearing-Distance Representation is missing bearing reference meridian'
-                                    end
-
-                                    # coordinate information 4.1.2.4.4 (plandu) - distance unit of measure (required)
-                                    unless hBearRes[:distanceUnitOfMeasure].nil?
-                                       unitOfMeasure = hBearRes[:distanceUnitOfMeasure]
-                                    end
-                                    if hBearRes[:distanceUnitOfMeasure].nil?
-                                       @hResponseObj[:writerPass] = false
-                                       @hResponseObj[:writerMessages] << 'Bearing-Distance Representation is missing planar distance units'
-                                    end
-
-                                 end
-                                 break
-
-                              end
-                           end
-
-                           # planar distance units 4.1.2.4.4 (plandu) - (required)
-                           # value and error messages handled in above code
-                           # just write it out here
-                           unless unitOfMeasure.nil?
-                              @xml.tag!('plandu', unitOfMeasure)
-                           end
-
-                        end
-                     end
-                  end
-
-               end # writeXML
-            end # CoordinateInformation
-
-         end
-      end
-   end
-end