adiwg-mdtranslator 2.16.1 → 2.18.0rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5648f5e66d246d037e252f21ab96b678acd191582beac5faed22ce1b335d7922
-  data.tar.gz: f0125ed07e0fdfebfbc25b52ebb3144865d863713d09a37d171159fbeb86c6a8
+  metadata.gz: ecb7704090196204491ef42a0817dd4e9980188e3e63852d61cb7f0406b57f80
+  data.tar.gz: 396c316ebdabbbe7acccf9deacbc45cd662799bb379e2a97389ecf546d04477d
 SHA512:
-  metadata.gz: 0d7255a476ebf2e7d3dd60795693523b04f37dd9887ff1fbdee97eb67b5a4954532aa4925f993c64325f19b75e75d19a5226294310b025a9483ea4dd9848a109
-  data.tar.gz: 57d9fdf2c382e1ddf057faea4666c949c54915e7962b45820f5bd0486e8fd1f21274748aeb272a689d56423bc9734d540ddea423f9af061872f0639dd85203a5
+  metadata.gz: 69eb88558f05db637609abe2047853a6517ce0a5ee7e85e2ad9c7fd679d52cde0d3fd4af206a73bb2ebd9cafde309e97e10dc49f02bc0e0ab0a076cfa9fc6fcb
+  data.tar.gz: 806fcca0134b19ea6da6619eb60c1480f73ef0f4323c847d51165fd5b377741b4ce48248f57a92276d4c6a7f6c24882ea554cc95efe6eaf0cb72f9c46af2ca7d

data/CHANGELOG.md

@@ -1,7 +1,27 @@
 # Change Log
 
-## [v2.15.0](https://github.com/adiwg/mdTranslator/tree/v2.15.0)
+## [v2.17.1](https://github.com/adiwg/mdTranslator/tree/v2.17.1)
 
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.16.1...v2.17.1)
+
+**Closed issues:**
+
+- Enumerated Value lists Description written to the ISO 19110 output? [\#218](https://github.com/adiwg/mdTranslator/issues/218)
+- Support applicationProfile and protocolRequest in onlineResource [\#215](https://github.com/adiwg/mdTranslator/issues/215)
+
+**Merged pull requests:**
+
+- Dev [\#219](https://github.com/adiwg/mdTranslator/pull/219) ([jlblcc](https://github.com/jlblcc))
+- Add support for LE\_ProcessStep and LE\_Source [\#217](https://github.com/adiwg/mdTranslator/pull/217) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.16.1](https://github.com/adiwg/mdTranslator/tree/v2.16.1) (2019-09-24)
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.15.0...v2.16.1)
+
+**Merged pull requests:**
+
+- Data Dictionary support for 19115-1 [\#216](https://github.com/adiwg/mdTranslator/pull/216) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.15.0](https://github.com/adiwg/mdTranslator/tree/v2.15.0) (2019-05-17)
 [Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.14.2...v2.15.0)
 
 **Implemented enhancements:**
@@ -9,6 +29,10 @@
 - 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))
 
+**Merged pull requests:**
+
+- Fix issue with FGDC taxonomy reader [\#211](https://github.com/adiwg/mdTranslator/pull/211) ([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)
 
@@ -124,7 +148,6 @@
 
 - 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)
@@ -235,6 +258,10 @@
 ## [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

@@ -26,6 +26,7 @@ Rake::TestTask.new do |t|
       'test/translator/tc*.rb'
    ]
    t.verbose = true
+   t.warning = false
 end
 
 desc 'Run tests'

data/adiwg-mdtranslator.gemspec

@@ -34,7 +34,7 @@ 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.7"
+   spec.add_runtime_dependency "adiwg-mdjson_schemas", "2.8.0.pre.beta2"
    spec.add_runtime_dependency "adiwg-mdcodes", "~> 2.8"
    spec.add_runtime_dependency "jbuilder", "~> 2.5"
    spec.add_runtime_dependency "kramdown", "~> 1.13"

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

@@ -303,6 +303,7 @@ class InternalMetadata
          contactId: nil,
          isOrganization: false,
          name: nil,
+         externalIdentifier: [],
          positionName: nil,
          memberOfOrgs: [],
          logos: [],
@@ -497,6 +498,7 @@ class InternalMetadata
          numberOfValues: nil,
          standardDeviation: nil,
          bitsPerValue: nil,
+         rangeElementDescription: [],
          boundMin: nil,
          boundMax: nil,
          boundUnits: nil,
@@ -958,7 +960,7 @@ class InternalMetadata
    def newProcessing
       {
          identifier: {},
-         softwareReferences: [],
+         softwareReference: {},
          procedureDescription: nil,
          documentation: [],
          runtimeParameters: nil,
@@ -973,11 +975,10 @@ class InternalMetadata
          rationale: nil,
          timePeriod: {},
          processors: [],
-         references: [],
          stepSources: [],
          stepProducts: [],
+         references: [],
          scope: {},
-         output: [],
          processingInformation: {},
          reports: []
       }
@@ -1179,6 +1180,7 @@ class InternalMetadata
 
    def newGridInfo
       {
+         scope: [],
          numberOfDimensions: nil,
          dimension: [],
          cellGeometry: nil,
@@ -1198,6 +1200,7 @@ class InternalMetadata
 
    def newVectorInfo
       {
+         scope: [],
          topologyLevel: nil,
          vectorObject: []
       }
@@ -1212,6 +1215,7 @@ class InternalMetadata
 
    def newGeorectifiedInfo
       {
+         scope: [],
          gridRepresentation: {},
          checkPointAvailable: false,
          checkPointDescription: nil,
@@ -1225,6 +1229,7 @@ class InternalMetadata
 
    def newGeoreferenceableInfo
       {
+         scope: [],
          gridRepresentation: {},
          controlPointAvailable: false,
          orientationParameterAvailable: false,

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

@@ -59,6 +59,7 @@ module ADIWG
                   end
 
                   # entity attribute 5.1.2.4 (attrdomv) - attribute domain value (required)
+                  domainLength = hDictionary[:domains].length
                   axDomain = xAttribute.xpath('./attrdomv')
                   unless axDomain.empty?
 
@@ -104,9 +105,12 @@ module ADIWG
                   # 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
+                  # take the first domain that is assigned to the attribute,
+                  # if this is a problem the user will need to fix in the editor
                   unless hDictionary[:domains].empty?
-                     hAttribute[:domainId] = hDictionary[:domains][0][:domainId]
+                    if hDictionary[:domains].length > domainLength
+                      hAttribute[:domainId] = hDictionary[:domains][domainLength][:domainId]
+                    end
                   end
 
                   axBegin = xAttribute.xpath('./begdatea')

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

@@ -6,6 +6,8 @@
 # 	Stan Smith 2016-10-18 original script
 
 require_relative 'module_identifier'
+require_relative 'module_rangeElementDescription'
+
 
 module ADIWG
    module Mdtranslator
@@ -101,6 +103,16 @@ module ADIWG
                      end
                   end
 
+                  if hAttribute.has_key?('rangeElementDescription')
+                     unless hAttribute['rangeElementDescription'].nil?
+                        intAttGroup[:rangeElementDescription] = []
+
+                        hAttribute['rangeElementDescription'].each do |item|
+                           intAttGroup[:rangeElementDescription] << RangeElementDescription.unpack(item, responseObj, outContext)
+                        end
+                     end
+                  end
+
                   # attribute group - offset
                   if hAttribute.has_key?('offset')
                      unless hAttribute['offset'] == ''

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

@@ -9,6 +9,7 @@ require_relative 'module_onlineResource'
 require_relative 'module_phone'
 require_relative 'module_address'
 require_relative 'module_graphic'
+require_relative 'module_identifier'
 
 module ADIWG
    module Mdtranslator
@@ -42,6 +43,16 @@ module ADIWG
                      @MessagePath.issueError(101, responseObj)
                   end
 
+                  if hContact.has_key?('externalIdentifier')
+                     aItems = hContact['externalIdentifier']
+                     aItems.each do |item|
+                        hReturn = Identifier.unpack(item, responseObj, outContext)
+                        unless hReturn.nil?
+                           intContact[:externalIdentifier] << hReturn
+                        end
+                     end
+                  end
+
                   # contact - is organization (required)
                   if hContact.has_key?('isOrganization')
                      if hContact['isOrganization'] === true

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

@@ -104,6 +104,15 @@ module ADIWG
                      end
                   end
 
+                  if hGeoRec.has_key?('scope')
+                     hGeoRec['scope'].each do |item|
+                        scope = Scope.unpack(item, responseObj, inContext)
+                        unless scope.nil?
+                           intGeoRec[:scope] << scope
+                        end
+                     end
+                  end
+
                   return intGeoRec
 
                end

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

@@ -88,6 +88,15 @@ module ADIWG
                      end
                   end
 
+                  if hGeoRef.has_key?('scope')
+                     hGeoRef['scope'].each do |item|
+                        scope = Scope.unpack(item, responseObj, inContext)
+                        unless scope.nil?
+                           intGeoRef[:scope] << scope
+                        end
+                     end
+                  end
+
                   return intGeoRef
 
                end

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

@@ -6,6 +6,7 @@
 # 	Stan Smith 2016-10-19 original script
 
 require_relative 'module_dimension'
+require_relative 'module_scope'
 
 module ADIWG
    module Mdtranslator
@@ -71,6 +72,15 @@ module ADIWG
                      end
                   end
 
+                  if hGrid.has_key?('scope')
+                     hGrid['scope'].each do |item|
+                        scope = Scope.unpack(item, responseObj, outContext)
+                        unless scope.nil?
+                           intGrid[:scope] << scope
+                        end
+                     end
+                  end
+
                   return intGrid
 
                end

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

@@ -110,7 +110,7 @@ module ADIWG
                      end
                   end
 
-                  # process step - step products [] {source}
+                  # process step LE 'output' - step products [] {source}
                   if hProcStep.has_key?('stepProduct')
                      aSources = hProcStep['stepProduct']
                      aSources.each do |item|
@@ -132,18 +132,7 @@ module ADIWG
                      end
                   end
 
-                  # process step - output [] {source}
-                  if hProcStep.has_key?('output')
-                     aSources = hProcStep['output']
-                     aSources.each do |item|
-                        hSource = Source.unpack(item, responseObj, outContext)
-                        unless hSource.nil?
-                           intProcStep[:output] << hSource
-                        end
-                     end
-                  end
-
-                  # process step - processing information {processing}
+                  # process step LE - processing information {processing}
                   if hProcStep.has_key?('processingInformation')
                      unless hProcStep['processingInformation'].empty?
                         hReturn = Processing.unpack(hProcStep['processingInformation'], responseObj, outContext)
@@ -153,7 +142,7 @@ module ADIWG
                      end
                   end
 
-                  # process step - report [] {processReport}
+                  # process step LE - report [] {processReport}
                   if hProcStep.has_key?('report')
                      aReports = hProcStep['report']
                      aReports.each do |item|

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

@@ -47,11 +47,10 @@ module ADIWG
 
                   # processing - software reference
                   if hProcessing.has_key?('softwareReference')
-                     aCitation = hProcessing['softwareReference']
-                     aCitation.each do |item|
-                        hCitation = Citation.unpack(item, responseObj, outContext)
-                        unless hCitation.nil?
-                           intProcessing[:softwareReferences] << hCitation
+                     unless hProcessing['softwareReference'].empty?
+                        hReturn = Citation.unpack(hProcessing['softwareReference'], responseObj, outContext)
+                        unless hReturn.nil?
+                           intProcessing[:softwareReference] = hReturn
                         end
                      end
                   end

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

@@ -0,0 +1,38 @@
+# unpack range element description
+
+module ADIWG
+  module Mdtranslator
+    module Readers
+      module MdJson
+
+        module RangeElementDescription
+
+          def self.unpack(hRangeElementDescription, responseObj, inContext = nil)
+            @MessagePath = ADIWG::Mdtranslator::Readers::MdJson::MdJson
+
+            outContext = 'range element description'
+            outContext = inContext + ' > ' + outContext unless inContext.nil?
+
+            intRangeElementDescription = {}
+
+            if hRangeElementDescription.has_key?('name')
+              intRangeElementDescription[:name] = hRangeElementDescription['name']
+            end
+
+            if hRangeElementDescription.has_key?('definition')
+              intRangeElementDescription[:definition] = hRangeElementDescription['definition']
+            end
+
+            if hRangeElementDescription.has_key?('rangeElements')
+              intRangeElementDescription[:rangeElements] = hRangeElementDescription['rangeElements']
+            end
+
+            return intRangeElementDescription
+
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -6,6 +6,7 @@
 # 	Stan Smith 2016-10-19 original script
 
 require_relative 'module_vectorObject'
+require_relative 'module_scope'
 
 module ADIWG
    module Mdtranslator
@@ -52,6 +53,15 @@ module ADIWG
                      end
                   end
 
+                  if hVector.has_key?('scope')
+                     hVector['scope'].each do |item|
+                        scope =  Scope.unpack(item, responseObj, outContext)
+                        unless scope.nil?
+                           intVector[:scope] << scope
+                        end
+                     end
+                  end
+
                   # error messages
                   unless haveVector
                      @MessagePath.issueError(911, responseObj, inContext)

data/lib/adiwg/mdtranslator/version.rb

@@ -1,6 +1,8 @@
 # adiwg mdTranslator
 
 # version 2 history
+# 2.17.1 2019-11-06 fix attribute domain assignment
+# 2.17.0 2019-09-28 add support for LE_ProcessStep and LE_Source
 # 2.16.1 2019-09-19 refactor fgdc reader to output FGDC entityAttribute citation title as dictionary citation title
 # 2.16.1 2019-09-18 add applicationProfile and protocolRequest to onlineResource
 # 2.16.0 2019-09-17 add 19110:2005 dictionary support to 19115-1
@@ -107,7 +109,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.16.1"
+      VERSION = "2.18.0rc2"
    end
 end
 

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

@@ -0,0 +1,48 @@
+# HTML writer
+# algorithm
+
+# History:
+#  Stan Smith 2019-09-24 original script
+
+require_relative 'html_citation'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Html
+
+            class Html_Algorithm
+
+               def initialize(html)
+                  @html = html
+               end
+
+               def writeHtml(hAlgorithm)
+
+                  # classes used
+                  citationClass = Html_Citation.new(@html)
+
+                  # algorithm - description
+                  unless hAlgorithm[:description].nil?
+                     @html.em('Description: ')
+                     @html.text!(hAlgorithm[:description])
+                     @html.br
+                  end
+
+                  # algorithm - citation {citation}
+                  unless hAlgorithm[:citation].empty?
+                     @html.details do
+                        @html.summary('Algorithm citation', {'class' => 'h5'})
+                        @html.section(:class => 'block') do
+                           citationClass.writeHtml(hAlgorithm[:citation])
+                        end
+                     end
+                  end
+
+               end # writeHtml
+            end # Html_Algorithm
+
+         end
+      end
+   end
+end

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

@@ -5,6 +5,7 @@
 #  Stan Smith 2017-04-02 original script
 
 require_relative 'html_identifier'
+require_relative 'html_rangeElementDescription'
 
 module ADIWG
    module Mdtranslator
@@ -20,6 +21,7 @@ module ADIWG
                def writeHtml(hAttribute)
                   # classes used
                   identifierClass = Html_Identifier.new(@html)
+                  rangeElementDescriptionClass = Html_RangeElementDescription.new(@html)
 
                   # attribute - sequence identifier
                   unless hAttribute[:sequenceIdentifier].nil?
@@ -116,6 +118,16 @@ module ADIWG
                      @html.br
                   end
 
+                  # attribute - range element description
+                  hAttribute[:rangeElementDescription].each do |red|
+                     @html.details do
+                        @html.summary('Range Element Description', 'class' => 'h5')
+                        @html.section(:class => 'block') do
+                           rangeElementDescriptionClass.writeHtml(red)
+                        end
+                     end
+                  end
+
                   # attribute - bound minimum
                   unless hAttribute[:boundMinimum].nil?
                      @html.em('Bound Minimum: ')

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

@@ -5,6 +5,7 @@
 #  Stan Smith 2017-03-28 original script
 
 require_relative 'html_gridRepresentation'
+require_relative 'html_scope'
 
 module ADIWG
    module Mdtranslator
@@ -21,6 +22,17 @@ module ADIWG
 
                   # classes used
                   gridClass = Html_GridRepresentation.new(@html)
+                  scopeClass = Html_Scope.new(@html)
+
+                  # georectified representation - scope
+                  hGeorectified[:scope].each do |scope|
+                     @html.details do
+                        @html.summary('Scope ', 'class' => 'h5')
+                        @html.section(:class => 'block') do
+                           scopeClass.writeHtml(hGeorectified[:scope])
+                        end
+                     end
+                  end
 
                   # georectified representation - grid {gridRepresentation}
                   unless hGeorectified[:gridRepresentation].empty?

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

@@ -6,6 +6,7 @@
 
 require_relative 'html_gridRepresentation'
 require_relative 'html_citation'
+require_relative 'html_scope'
 
 module ADIWG
    module Mdtranslator
@@ -23,6 +24,18 @@ module ADIWG
                   # classes used
                   gridClass = Html_GridRepresentation.new(@html)
                   citationClass = Html_Citation.new(@html)
+                  scopeClass = Html_Scope.new(@html)
+
+                  # georeferenceable representation - scope
+                  hGeoreferenceable[:scope].each do |scope|
+                     @html.details do
+                        @html.summary('Scope ', 'class' => 'h5')
+                        @html.section(:class => 'block') do
+                           scopeClass.writeHtml(hGeoreferenceable[:scope])
+                        end
+                     end
+                  end
+
 
                   # georeferenceable representation - grid {gridRepresentation}
                   unless hGeoreferenceable[:gridRepresentation].empty?

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

@@ -6,6 +6,7 @@
 # 	Stan Smith 2015-07-31 original script
 
 require_relative 'html_dimension'
+require_relative 'html_scope'
 
 module ADIWG
    module Mdtranslator
@@ -22,6 +23,18 @@ module ADIWG
 
                   # classes used
                   dimensionClass = Html_Dimension.new(@html)
+                  scopeClass = Html_Scope.new(@html)
+
+                  # grid representation - scope
+                  hGrid[:scope].each do |scope|
+                     @html.details do
+                        @html.summary('Scope ', 'class' => 'h5')
+                        @html.section(:class => 'block') do
+                           scopeClass.writeHtml(hGrid[:scope])
+                        end
+                     end
+                  end
+
 
                   # grid representation - number of dimensions
                   unless hGrid[:numberOfDimensions].nil?

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

@@ -0,0 +1,51 @@
+# HTML writer
+# nominal resolution
+
+# History:
+#  Stan Smith 2019-09-24 original script
+
+require_relative 'html_measure'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Html
+
+            class Html_NominalResolution
+
+               def initialize(html)
+                  @html = html
+               end
+
+               def writeHtml(hResolution)
+
+                  # classes used
+                  measureClass = Html_Measure.new(@html)
+
+                  # nominal resolution - scanning resolution {measure}
+                  unless hResolution[:scanningResolution].empty?
+                     @html.details do
+                        @html.summary('Scanning Resolution', {'class' => 'h5'})
+                        @html.section(:class => 'block') do
+                           measureClass.writeHtml(hResolution[:scanningResolution])
+                        end
+                     end
+                  end
+
+                  # nominal resolution - ground resolution {measure}
+                  unless hResolution[:groundResolution].empty?
+                     @html.details do
+                        @html.summary('Ground Resolution', {'class' => 'h5'})
+                        @html.section(:class => 'block') do
+                           measureClass.writeHtml(hResolution[:groundResolution])
+                        end
+                     end
+                  end
+
+               end # writeHtml
+            end # Html_NominalResolution
+
+         end
+      end
+   end
+end