adiwg-mdtranslator 2.16.1 → 2.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5648f5e66d246d037e252f21ab96b678acd191582beac5faed22ce1b335d7922
-  data.tar.gz: f0125ed07e0fdfebfbc25b52ebb3144865d863713d09a37d171159fbeb86c6a8
+  metadata.gz: 4b362845af6332b68c79bd86eefb21288c3571eb77673bb54fb2354d60ea947f
+  data.tar.gz: a62c78bf1888b263870db379c5303c1d7d07e89fd7d5712b0584b6f0b44d6457
 SHA512:
-  metadata.gz: 0d7255a476ebf2e7d3dd60795693523b04f37dd9887ff1fbdee97eb67b5a4954532aa4925f993c64325f19b75e75d19a5226294310b025a9483ea4dd9848a109
-  data.tar.gz: 57d9fdf2c382e1ddf057faea4666c949c54915e7962b45820f5bd0486e8fd1f21274748aeb272a689d56423bc9734d540ddea423f9af061872f0639dd85203a5
+  metadata.gz: 9aca1d45a359ac891958c803f880716bdb6016e00cf510e43ef7462e407c2678608c12affee79f5340d16c7e29ffeafb3f2fa146578fe4ea1921d6073a651e7c
+  data.tar.gz: 47db90725c67976476de6cc3c7f3c92eeac6fee01c5c6a943b696abc6e9c72f03c23174224e38954e0df6e38d897d63f4376f661be0d7508067f4b995cb725b3

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/lib/adiwg/mdtranslator/internal/internal_metadata_obj.rb

@@ -958,7 +958,7 @@ class InternalMetadata
    def newProcessing
       {
          identifier: {},
-         softwareReferences: [],
+         softwareReference: {},
          procedureDescription: nil,
          documentation: [],
          runtimeParameters: nil,
@@ -973,11 +973,10 @@ class InternalMetadata
          rationale: nil,
          timePeriod: {},
          processors: [],
-         references: [],
          stepSources: [],
          stepProducts: [],
+         references: [],
          scope: {},
-         output: [],
          processingInformation: {},
          reports: []
       }

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_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/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.17.1"
    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_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

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

@@ -0,0 +1,47 @@
+# HTML writer
+# process step report
+
+# History:
+#  Stan Smith 2019-09-24 original script
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Html
+
+            class Html_ProcessStepReport
+
+               def initialize(html)
+                  @html = html
+               end
+
+               def writeHtml(hReport)
+
+                  # process step report - name
+                  unless hReport[:name].nil?
+                     @html.em('Name: ')
+                     @html.text!(hReport[:name])
+                     @html.br
+                  end
+
+                  # process step report - description
+                  unless hReport[:description].nil?
+                     @html.em('Description: ')
+                     @html.text!(hReport[:description])
+                     @html.br
+                  end
+
+                  # process step report - file type
+                  unless hReport[:fileType].nil?
+                     @html.em('File Type: ')
+                     @html.text!(hReport[:fileType])
+                     @html.br
+                  end
+
+               end # writeHtml
+            end # Html_ProcessStepReport
+
+         end
+      end
+   end
+end

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

@@ -2,9 +2,10 @@
 # process step
 
 # History:
-#  Stan Smith 2017-08-30 added support for process step sources
-#  Stan Smith 2017-04-03 refactored for mdTranslator 2.0
-#  Stan Smith 2015-07-16 refactored to remove global namespace $HtmlNS
+#  Stan Smith 2019-09-24 add support for LE_ProcessStep
+#  Stan Smith 2017-08-30 add support for process step sources
+#  Stan Smith 2017-04-03 refactor for mdTranslator 2.0
+#  Stan Smith 2015-07-16 refactor to remove global namespace $HtmlNS
 # 	Stan Smith 2015-03-27 original script
 
 require_relative 'html_temporalExtent'
@@ -12,6 +13,8 @@ require_relative 'html_responsibility'
 require_relative 'html_citation'
 require_relative 'html_scope'
 require_relative 'html_source'
+require_relative 'html_processing'
+require_relative 'html_processReport'
 
 module ADIWG
    module Mdtranslator
@@ -27,11 +30,13 @@ module ADIWG
                def writeHtml(hStep)
 
                   # classes used
-                  temporalClass = Html_TemporalExtent.new(@html)
+                  temporalClass = Html_TimePeriod.new(@html)
                   responsibilityClass = Html_Responsibility.new(@html)
                   citationClass = Html_Citation.new(@html)
                   scopeClass = Html_Scope.new(@html)
                   sourceClass = Html_Source.new(@html)
+                  processingClass = Html_Processing.new(@html)
+                  reportClass = Html_ProcessStepReport.new(@html)
 
                   # process step - id
                   unless hStep[:stepId].nil?
@@ -58,10 +63,12 @@ module ADIWG
 
                   # process step - time period {timePeriod}
                   unless hStep[:timePeriod].empty?
-                     temporalObj = {}
-                     temporalObj[:timeInstant] = {}
-                     temporalObj[:timePeriod] = hStep[:timePeriod]
-                     temporalClass.writeHtml(temporalObj)
+                     @html.details do
+                        @html.summary('Time Period', {'class' => 'h5'})
+                        @html.section(:class => 'block') do
+                           temporalClass.writeHtml(hStep[:timePeriod])
+                        end
+                     end
                   end
 
                   # process step - references [] {citation}
@@ -135,6 +142,26 @@ module ADIWG
                      end
                   end
 
+                  # process step - processing information {processingInformation}
+                  unless hStep[:processingInformation].empty?
+                     @html.details do
+                        @html.summary('Processing Information', {'class' => 'h5'})
+                        @html.section(:class => 'block') do
+                           processingClass.writeHtml(hStep[:processingInformation])
+                        end
+                     end
+                  end
+
+                  # process step - report [] {processStepReport}
+                  hStep[:reports].each do |hReport|
+                     @html.details do
+                        @html.summary(hReport[:name], {'class' => 'h5'})
+                        @html.section(:class => 'block') do
+                           reportClass.writeHtml(hReport)
+                        end
+                     end
+                  end
+
                end # writeHtml
             end # Html_ProcessStep
 

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

@@ -0,0 +1,89 @@
+# HTML writer
+# processing
+
+# History:
+#  Stan Smith 2019-09-24 original script
+
+require_relative 'html_identifier'
+require_relative 'html_citation'
+require_relative 'html_algorithm'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Html
+
+            class Html_Processing
+
+               def initialize(html)
+                  @html = html
+               end
+
+               def writeHtml(hProcessing)
+
+                  # classes used
+                  identifierClass = Html_Identifier.new(@html)
+                  citationClass = Html_Citation.new(@html)
+                  algorithmClass = Html_Algorithm.new(@html)
+
+                  # processing - procedure description
+                  unless hProcessing[:procedureDescription].nil?
+                     @html.em(' Procedure Description: ')
+                     @html.text!(hProcessing[:procedureDescription])
+                     @html.br
+                  end
+
+                  # processing - identifier {identifier}
+                  unless hProcessing[:identifier].empty?
+                     @html.details do
+                        @html.summary('Identifier', {'class' => 'h5'})
+                        @html.section(:class => 'block') do
+                           identifierClass.writeHtml(hProcessing[:identifier])
+                        end
+                     end
+                  end
+
+                  # processing - software reference {citation}
+                  unless hProcessing[:softwareReference].empty?
+                     @html.details do
+                        @html.summary('Software Reference', {'class' => 'h5'})
+                        @html.section(:class => 'block') do
+                           citationClass.writeHtml(hProcessing[:softwareReference])
+                        end
+                     end
+                  end
+
+                  # processing - runtime parameters
+                  unless hProcessing[:runtimeParameters].nil?
+                     @html.em(' Runtime Parameters: ')
+                     @html.text!(hProcessing[:runtimeParameters])
+                     @html.br
+                  end
+
+                  # processing - documentation [] {citation}
+                  hProcessing[:documentation].each do |hCitation|
+                     @html.details do
+                        @html.summary('Documentation', {'class' => 'h5'})
+                        @html.section(:class => 'block') do
+                           citationClass.writeHtml(hCitation)
+                        end
+                     end
+                  end
+
+                  # processing - algorithm [] {algorithm}
+                  hProcessing[:algorithms].each do |hAlgorithm|
+                     @html.details do
+                        @html.summary('Algorithm', {'class' => 'h5'})
+                        @html.section(:class => 'block') do
+                           algorithmClass.writeHtml(hAlgorithm)
+                        end
+                     end
+                  end
+
+               end # writeHtml
+            end # Html_Processing
+
+         end
+      end
+   end
+end