adiwg-mdtranslator 2.3.4 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f26b919359ed9d72b1db9742fee50c4ebe22eb70
-  data.tar.gz: 1a97fdfe91c74bc14657dd60255ca544522b447f
+  metadata.gz: 711b22c64a7c6acc742500ca82ceadfabfc979c3
+  data.tar.gz: 359f7b98507e8f2420f4c4cce21bff8719a55f28
 SHA512:
-  metadata.gz: 222055baebb1801531b4051feb70fbb7159c9717a2bb966c9fdaf3a27bf8b535ec1b6723582616f3ad39ed78424e4080b933fb625697eae67567661d23acd935
-  data.tar.gz: 5b936a4118e0d5032b9e8e396637d1248234882079f8aa6e4482f4479eed981413c65c57fde5d376156536ec4dc54cfb79a65967834b97d374f1c6728b617345
+  metadata.gz: f573f0909635e78ad98b365cdcb35c083ed9733617cc62575d64ed1c3b73413164fd1761bbb15782de42d4563c3f96a3d406e27c9da9655ddf811157de1ce4e8
+  data.tar.gz: 824d2cfc455565074996d874cff4f9b82f65d9ccb5b743dbb4d7daecfe5618aa88dd8c83a9d2c1ecf5df7e189532c54b94408989b7b5449fd42ba5efc16bbc15

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

@@ -2,6 +2,7 @@
 # unpack fgdc distribution
 
 # History:
+#  Stan Smith 2017-10-17 fixed problem with adding technical prerequisite to nil distribution description
 #  Stan Smith 2017-08-15 original script
 
 require 'nokogiri'
@@ -75,7 +76,11 @@ module ADIWG
                   # -> distribution.description {+=}
                   techPre = xDistribution.xpath('./techpreq').text
                   unless techPre.empty?
-                     hDistribution[:description] += '\n\n Technical Prerequisites: ' + techPre
+                     if hDistribution[:description].nil?
+                        hDistribution[:description] = techPre
+                     else
+                        hDistribution[:description] += '\n\n Technical Prerequisites: ' + techPre
+                     end
                   end
 
                   # distribution 6.7 (availabl) - available time period {time period}

data/lib/adiwg/mdtranslator/version.rb

@@ -1,6 +1,8 @@
 # adiwg mdTranslator
 
 # version 2 history
+# 2.3.5 2017-10-17 fixed problem with adding technical prerequisite to nil distribution description
+# 2.3.5 2017-10-13 trap missing topology level in html writer vectorRepresentation
 # 2.3.4 2017-10-12 drop harvest set tag if repository citation is missing
 # 2.3.3 2017-10-03 modify sbJson reader execution fail tests
 # 2.3.2 2017-09-14 add associationType to sbJson relatedItems
@@ -30,7 +32,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.3.4"
+      VERSION = "2.3.5"
    end
 end
 

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

@@ -52,7 +52,7 @@ module ADIWG
                   end
 
                   # citation - date [] {}
-                     hCitation[:dates].each do |hDate|
+                  hCitation[:dates].each do |hDate|
                      @html.em('Date: ')
                      dateClass.writeHtml(hDate)
                      @html.br

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

@@ -28,13 +28,15 @@ module ADIWG
                   graphicClass = Html_Graphic.new(@html)
 
                   @html.details do
-                     @html.summary(hContact[:name], {'id' => 'CID_'+hContact[:contactId], 'class' => 'h3'})
+                     @html.summary(hContact[:name], {'id' => 'CID_' + hContact[:contactId], 'class' => 'h3'})
                      @html.section(:class => 'block') do
 
                         # contact - contact ID
-                        @html.em('Contact ID: ')
-                        @html.text!(hContact[:contactId])
-                        @html.br
+                        unless hContact[:contactId].nil?
+                           @html.em('Contact ID: ')
+                           @html.text!(hContact[:contactId])
+                           @html.br
+                        end
 
                         # contact - isOrganization
                         @html.em('is Organization: ')

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

@@ -24,9 +24,11 @@ module ADIWG
                   dimensionClass = Html_Dimension.new(@html)
 
                   # grid representation - number of dimensions
-                  @html.em('Number of dimensions: ')
-                  @html.text!(hGrid[:numberOfDimensions].to_s)
-                  @html.br
+                  unless hGrid[:numberOfDimensions].nil?
+                     @html.em('Number of dimensions: ')
+                     @html.text!(hGrid[:numberOfDimensions].to_s)
+                     @html.br
+                  end
 
                   # grid representation - dimension []
                   dimensionCount = 0
@@ -48,7 +50,7 @@ module ADIWG
                      @html.br
                   end
 
-                  # grid representation - transformation parameters available
+                  # grid representation - transformation parameters available {Boolean}
                   @html.em('Transformation parameters available: ')
                   @html.text!(hGrid[:transformationParameterAvailable].to_s)
 

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

@@ -36,7 +36,9 @@ module ADIWG
                         # keywords
                         @html.ul do
                            hKeyword[:keywords].each do |hKeyword|
-                              @html.li(hKeyword[:keyword])
+                              unless hKeyword[:keyword].nil?
+                                 @html.li(hKeyword[:keyword])
+                              end
                            end
                         end
 

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

@@ -5,35 +5,36 @@
 # 	Stan Smith 2015-03-24 original script
 
 module ADIWG
-    module Mdtranslator
-        module Writers
-            module Html
+   module Mdtranslator
+      module Writers
+         module Html
 
-                class MdHtmlResourceFormat
-                    def initialize(html)
-                        @html = html
-                    end
+            class MdHtmlResourceFormat
+               def initialize(html)
+                  @html = html
+               end
 
-                    def writeHtml(hResFormat)
+               def writeHtml(hResFormat)
 
-                        # resource format - name - required
-                        @html.em('Resource Format: ')
-                        @html.text!(hResFormat[:formatName])
+                  # resource format - name - required
+                  unless hResFormat[:formatName].nil?
+                     @html.em('Resource Format: ')
+                     @html.text!(hResFormat[:formatName])
+                  end
 
-                        # resource format - version
-                        s = hResFormat[:formatVersion]
-                        if !s.nil?
-                            @html.em(' Version: ')
-                            @html.text!(s)
-                        end
+                  # resource format - version
+                  unless  !hResFormat[:formatVersion].nil?
+                     @html.em(' Version: ')
+                     @html.text!(hResFormat[:formatVersion])
+                  end
 
-                        @html.br
+                  @html.br
 
-                    end # writeHtml
+               end # writeHtml
 
-                end # class
+            end # class
 
-            end
-        end
-    end
+         end
+      end
+   end
 end

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

@@ -97,9 +97,11 @@ module ADIWG
                            end
 
                            # full abstract
-                           @html.em('Full Abstract:')
-                           @html.br
-                           @html.text!(hResource[:abstract])
+                           unless hResource[:abstract].nil?
+                              @html.em('Full Abstract:')
+                              @html.br
+                              @html.text!(hResource[:abstract])
+                           end
 
                         end
                      end

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

@@ -18,14 +18,16 @@ module ADIWG
 
                def writeHtml(hType)
 
-                  # resource type
-                  @html.em('Resource Type: ')
-                  @html.text!(hType[:type])
-                  unless hType[:name].nil?
-                     @html.em(' Name: ')
-                     @html.text!(hType[:name])
+                  # resource type - (required)
+                  unless hType[:type].nil?
+                     @html.em('Resource Type: ')
+                     @html.text!(hType[:type])
+                     unless hType[:name].nil?
+                        @html.em(' Name: ')
+                        @html.text!(hType[:name])
+                     end
+                     @html.br
                   end
-                  @html.br
 
                end # writeHtml
             end # Html_ResourceType

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

@@ -18,16 +18,19 @@ module ADIWG
 
                def writeHtml(hSecCon)
 
-                  # security constraint - classification code {classification}
-                  @html.em('Classification: ')
-                  @html.text!(hSecCon[:classCode])
-                  @html.br
-
+                  # security constraint - classification code {classification} (required)
+                  unless hSecCon[:classCode].nil?
+                     @html.em('Classification: ')
+                     @html.text!(hSecCon[:classCode])
+                     @html.br
+                  end
 
                   # security constraint - classification system
-                  @html.em('Classification System: ')
-                  @html.text!(hSecCon[:classSystem])
-                  @html.br
+                  unless hSecCon[:classSystem].nil?
+                     @html.em('Classification System: ')
+                     @html.text!(hSecCon[:classSystem])
+                     @html.br
+                  end
 
                   # security constraint - user note
                   unless hSecCon[:userNote].nil?

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

@@ -2,6 +2,7 @@
 # vector representation
 
 # History:
+#  Stan Smith 2017-10-13 trap missing topology level
 #  Stan Smith 2017-03-28 original script
 
 require_relative 'html_vectorObject'
@@ -23,9 +24,11 @@ module ADIWG
                   objectClass = Html_VectorObject.new(@html)
 
                   # vector representation - topology level
-                  @html.em('Topology Level: ')
-                  @html.text!(hVector[:topologyLevel])
-                  @html.br
+                  unless hVector[:topologyLevel].nil?
+                     @html.em('Topology Level: ')
+                     @html.text!(hVector[:topologyLevel])
+                     @html.br
+                  end
 
                   # vector representation - vector object []
                   hVector[:vectorObject].each do |hObject|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-13 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -464,7 +464,6 @@ files:
 - lib/adiwg/mdtranslator/writers/html/sections/html_scope.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_scopeDescription.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_securityConstraint.rb
-- lib/adiwg/mdtranslator/writers/html/sections/html_sensorInfo.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_source.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_spatialReference.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_spatialRepresentation.rb

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

@@ -1,66 +0,0 @@
-# HTML writer
-# sensor information
-
-# History:
-# 	Stan Smith 2015-08-21 original script
-
-module ADIWG
-    module Mdtranslator
-        module Writers
-            module Html
-
-                class MdHtmlSensorInfo
-                    def initialize(html)
-                        @html = html
-                    end
-
-                    def writeHtml(hSensor)
-
-                        # sensor information - tone gradations
-                        s = hSensor[:toneGradations]
-                        if !s.nil?
-                            @html.em('Number of tone gradations: ')
-                            @html.text!(s.to_s)
-                            @html.br
-                        end
-
-                        # sensor information - sensor min
-                        s = hSensor[:sensorMin]
-                        if !s.nil?
-                            @html.em('Sensor lower limit: ')
-                            @html.text!(s.to_s)
-                            @html.br
-                        end
-
-                        # sensor information - sensor max
-                        s = hSensor[:sensorMax]
-                        if !s.nil?
-                            @html.em('Sensor upper limit: ')
-                            @html.text!(s.to_s)
-                            @html.br
-                        end
-
-                        # sensor information - units
-                        s = hSensor[:sensorUnits]
-                        if !s.nil?
-                            @html.em('Sensor units: ')
-                            @html.text!(s.to_s)
-                            @html.br
-                        end
-
-                        # sensor information - peak response
-                        s = hSensor[:sensorPeakResponse]
-                        if !s.nil?
-                            @html.em('Sensor peak response: ')
-                            @html.text!(s.to_s)
-                            @html.br
-                        end
-
-                    end # writeHtml
-
-                end # class
-
-            end
-        end
-    end
-end