adiwg-mdtranslator 2.13.0 → 2.13.1

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

@@ -2,8 +2,8 @@
 # Reader - ADIwg JSON to internal data structure
 
 # History:
-#  Stan Smith 2018-02-19 refactored error and warning messaging
-#   Stan Smith 2016-10-21 original script
+#  Stan Smith 2018-06-27 refactored error and warning messaging
+#  Stan Smith 2016-10-21 original script
 
 require_relative 'module_responsibleParty'
 
@@ -16,9 +16,11 @@ module ADIWG
 
                def self.unpack(hVoucher, responseObj)
 
+                  @MessagePath = ADIWG::Mdtranslator::Readers::MdJson::MdJson
+
                   # return nil object if input is empty
                   if hVoucher.empty?
-                     responseObj[:readerExecutionMessages] << 'WARNING: mdJson reader: voucher object is empty'
+                     @MessagePath.issueWarning(940, responseObj)
                      return nil
                   end
 
@@ -26,30 +28,28 @@ module ADIWG
                   intMetadataClass = InternalMetadata.new
                   intVoucher = intMetadataClass.newTaxonVoucher
 
+                  outContext = 'taxon voucher'
+
                   # voucher - specimen (required)
                   if hVoucher.has_key?('specimen')
                      intVoucher[:specimen] = hVoucher['specimen']
                   end
                   if intVoucher[:specimen].nil? || intVoucher[:specimen] == ''
-                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: voucher specimen is missing'
-                     responseObj[:readerExecutionPass] = false
-                     return nil
+                     @MessagePath.issueError(941, responseObj)
                   end
 
                   # voucher - repository (required)
                   if hVoucher.has_key?('repository')
                      hObject = hVoucher['repository']
                      unless hObject.empty?
-                        hReturn = ResponsibleParty.unpack(hObject, responseObj)
+                        hReturn = ResponsibleParty.unpack(hObject, responseObj, outContext)
                         unless hReturn.nil?
                            intVoucher[:repository] = hReturn
                         end
                      end
                   end
                   if intVoucher[:repository].empty?
-                     responseObj[:readerExecutionMessages] << 'ERROR: mdJson reader: voucher repository is missing'
-                     responseObj[:readerExecutionPass] = false
-                     return nil
+                     @MessagePath.issueError(942, responseObj)
                   end
 
                   return intVoucher

data/lib/adiwg/mdtranslator/version.rb

@@ -1,13 +1,18 @@
 # adiwg mdTranslator
 
 # version 2 history
+# 2.13.1 2018-07-02 fix bug in ISO 19110 writer when dictionary empty
+# 2.13.1 2018-06-12 change default time stamps from 'local' to UTC
+# 2.13.1 2018-06-11 fix bug #179 remove 0 time value from date string when time not present
+# 2.13.1 2018-06-08 refactor mdJson test to use mdJson generation helpers
+# 2.13.1 2018-05-25 filter ISO 19115-3 topic categories from ISO 19115-2 writer
 # 2.13.0 2018-05-08 add contact name in addition to ID in outContext messaging
 # 2.13.0 2018-05-30 changed local schema reference in ISO writer tests to remote
-# 2.13.0 2018-05-03 refactor ISO19115-2 test mdJson to use mdJson generation helpers
+# 2.13.0 2018-05-03 refactor ISO19115-2 tests to use mdJson generation helpers
 # 2.13.0 2018-04-09 refactored messaging for ISO19115-2
 # 2.12.0 2018-04-07 add 'fgdc' option to reader and writer enum list
 # 2.12.0 2018-04-06 rename taxonomicRank to taxonomicLevel
-# 2.12.0 2018-04-06 rename latinName to taxonomicNamel
+# 2.12.0 2018-04-06 rename latinName to taxonomicName
 # 2.12.0 2018-04-06 changed resourceInfo taxonomy from object to array
 # 2.12.0 2018-04-05 refactored messaging for ISO19110
 # 2.11.0 2018-03-28 add 'responsibleParties' to budget allocation
@@ -82,7 +87,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.13.0"
+      VERSION = "2.13.1"
    end
 end
 

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

@@ -23,16 +23,14 @@ module ADIWG
                def writeXML(hResourceInfo)
 
                   # spatial organization 3.1 (indspref) - Indirect Spatial Reference
-                  # <- hResourceInfo.spatialReferenceSystems.systemIdentifier.identifier = 'indirect' (first)
+                  # <- hResourceInfo.spatialReferenceSystems.systemIdentifier (first)
                   haveIndirect = false
                   hResourceInfo[:spatialReferenceSystems].each do |hSystem|
                      unless hSystem[:systemIdentifier].empty?
-                        if hSystem[:systemIdentifier][:identifier] == 'indirect'
-                           unless hSystem[:systemIdentifier][:description].empty?
-                              @xml.tag!('indspref', hSystem[:systemIdentifier][:description])
-                              haveIndirect = true
-                              break
-                           end
+                        unless hSystem[:systemIdentifier][:description].empty?
+                           @xml.tag!('indspref', hSystem[:systemIdentifier][:description])
+                           haveIndirect = true
+                           break
                         end
                      end
                   end
@@ -42,7 +40,7 @@ module ADIWG
 
                   # spatial organization 3.2 (direct) - Direct Spatial Reference Method
                   # <- resourceInfo.spatialRepresentationTypes
-                  # take first that match ['point' | 'vector' | 'grid']
+                  # take first to match ['point' | 'vector' | 'grid']
                   direct = nil
                   hResourceInfo[:spatialRepresentationTypes].each do |type|
                      direct = 'Point' if type == 'point'
@@ -59,22 +57,47 @@ module ADIWG
 
                   # spatial organization 3.3 (ptvctinf) - point and vector object information
                   # <- resourceInfo.spatialRepresentations.vectorRepresentation (first)
-                  if direct == 'Point' || direct == 'Vector'
-                     hResourceInfo[:spatialRepresentations].each do |hSpaceRep|
-                        unless hSpaceRep[:vectorRepresentation].empty?
-                           hVectorRep = hSpaceRep[:vectorRepresentation]
-                           unless hVectorRep.empty?
-                              @xml.tag!('ptvctinf') do
-                                 if hVectorRep[:topologyLevel].nil?
-
-                                    # spatial organization point and vector object 3.3.1 (sdtsterm) - SDTS term []
+                  hResourceInfo[:spatialRepresentations].each do |hSpaceRep|
+                     unless hSpaceRep[:vectorRepresentation].empty?
+                        hVectorRep = hSpaceRep[:vectorRepresentation]
+                        unless hVectorRep.empty?
+                           @xml.tag!('ptvctinf') do
+                              if hVectorRep[:topologyLevel].nil?
+
+                                 # spatial organization point and vector object 3.3.1 (sdtsterm) - SDTS term []
+                                 hVectorRep[:vectorObject].each do |hVecObj|
+                                    @xml.tag!('sdtsterm') do
+
+                                       # spatial organization point and vector object 3.3.1.1 (sdtstype) - SDTS object type (requied)
+                                       @xml.tag!('sdtstype', hVecObj[:objectType])
+
+                                       # spatial organization point and vector object 3.3.1.2 (ptvctcnt) - SDTS count
+                                       unless hVecObj[:objectCount].nil?
+                                          @xml.tag!('ptvctcnt', hVecObj[:objectCount])
+                                       end
+                                       if hVecObj[:objectCount].nil?
+                                          @xml.tag!('ptvctcnt')
+                                       end
+
+                                    end
+                                 end
+
+                              else
+
+                                 # point and vector object 3.3.2 (vpfterm) - VPF terms description
+                                 @xml.tag!('vpfterm') do
+
+                                    # VPF term 3.3.2.1 (vpflevel) - VPF topology level
+                                    @xml.tag!('vpflevel', hVectorRep[:topologyLevel])
+
+                                    # VPF term 3.3.2.2 (vpfinfo) - VPF point and vector object information []
                                     hVectorRep[:vectorObject].each do |hVecObj|
-                                       @xml.tag!('sdtsterm') do
+                                       @xml.tag!('vpfinfo') do
 
-                                          # spatial organization point and vector object 3.3.1.1 (sdtstype) - SDTS object type (requied)
-                                          @xml.tag!('sdtstype', hVecObj[:objectType])
+                                          # spatial organization point and vector object 3.3.2.2.1 (vpftype) - VPF object type (requied)
+                                          @xml.tag!('vpftype', hVecObj[:objectType])
 
-                                          # spatial organization point and vector object 3.3.1.2 (ptvctcnt) - SDTS count
+                                          # spatial organization point and vector object 3.3.2.2.2 (ptvctcnt) - VPF object type
                                           unless hVecObj[:objectCount].nil?
                                              @xml.tag!('ptvctcnt', hVecObj[:objectCount])
                                           end
@@ -85,89 +108,60 @@ module ADIWG
                                        end
                                     end
 
-                                 else
-
-                                    # point and vector object 3.3.2 (vpfterm) - VPF terms description
-                                    @xml.tag!('vpfterm') do
-
-                                       # VPF term 3.3.2.1 (vpflevel) - VPF topology level
-                                       @xml.tag!('vpflevel', hVectorRep[:topologyLevel])
-
-                                       # VPF term 3.3.2.2 (vpfinfo) - VPF point and vector object information []
-                                       hVectorRep[:vectorObject].each do |hVecObj|
-                                          @xml.tag!('vpfinfo') do
-
-                                             # spatial organization point and vector object 3.3.2.2.1 (vpftype) - VPF object type (requied)
-                                             @xml.tag!('vpftype', hVecObj[:objectType])
-
-                                             # spatial organization point and vector object 3.3.2.2.2 (ptvctcnt) - VPF object type
-                                             unless hVecObj[:objectCount].nil?
-                                                @xml.tag!('ptvctcnt', hVecObj[:objectCount])
-                                             end
-                                             if hVecObj[:objectCount].nil?
-                                                @xml.tag!('ptvctcnt')
-                                             end
-
-                                          end
-                                       end
-
-                                    end
-
                                  end
+
                               end
-                              break
                            end
-
+                           break
                         end
+
                      end
                   end
 
                   # spatial organization 3.4 (rastinfo) - point and vector object information
                   # <- resourceInfo.spatialRepresentations.gridRepresentation (first)
-                  if direct == 'Raster'
-                     hResourceInfo[:spatialRepresentations].each do |hSpaceRep|
-                        if hSpaceRep[:gridRepresentation]
-                           hGridRep = hSpaceRep[:gridRepresentation]
-                           @xml.tag!('rastinfo') do
-
-                              # spatial organization raster 3.4.1 (rasttype) - raster type (required)
-                              unless hGridRep[:cellGeometry].empty?
-                                 @xml.tag!('rasttype', hGridRep[:cellGeometry])
-                              end
-                              if hGridRep[:cellGeometry].empty?
-                                 @NameSpace.issueWarning(380, 'rasttype')
-                              end
+                  hResourceInfo[:spatialRepresentations].each do |hSpaceRep|
+                     unless hSpaceRep[:gridRepresentation].empty?
+                        hGridRep = hSpaceRep[:gridRepresentation]
+                        @xml.tag!('rastinfo') do
+
+                           # spatial organization raster 3.4.1 (rasttype) - raster type (required)
+                           unless hGridRep[:cellGeometry].empty?
+                              @xml.tag!('rasttype', hGridRep[:cellGeometry])
+                           end
+                           if hGridRep[:cellGeometry].empty?
+                              @NameSpace.issueWarning(380, 'rasttype')
+                           end
 
-                              # spatial organization raster 3.4.2 (rowcount) - row count
-                              hGridRep[:dimension].each do |hDimension|
-                                 if hDimension[:dimensionType] == 'row'
-                                    unless hDimension[:dimensionSize].nil?
-                                       @xml.tag!('rowcount', hDimension[:dimensionSize])
-                                    end
+                           # spatial organization raster 3.4.2 (rowcount) - row count
+                           hGridRep[:dimension].each do |hDimension|
+                              if hDimension[:dimensionType] == 'row'
+                                 unless hDimension[:dimensionSize].nil?
+                                    @xml.tag!('rowcount', hDimension[:dimensionSize])
                                  end
                               end
+                           end
 
-                              # spatial organization raster 3.4.2 (colcount) - column count
-                              hGridRep[:dimension].each do |hDimension|
-                                 if hDimension[:dimensionType] == 'column'
-                                    unless hDimension[:dimensionSize].nil?
-                                       @xml.tag!('colcount', hDimension[:dimensionSize])
-                                    end
+                           # spatial organization raster 3.4.2 (colcount) - column count
+                           hGridRep[:dimension].each do |hDimension|
+                              if hDimension[:dimensionType] == 'column'
+                                 unless hDimension[:dimensionSize].nil?
+                                    @xml.tag!('colcount', hDimension[:dimensionSize])
                                  end
                               end
+                           end
 
-                              # spatial organization raster 3.4.2 (vrtcount) - depth count
-                              hGridRep[:dimension].each do |hDimension|
-                                 if hDimension[:dimensionType] == 'vertical'
-                                    unless hDimension[:dimensionSize].nil?
-                                       @xml.tag!('vrtcount', hDimension[:dimensionSize])
-                                    end
+                           # spatial organization raster 3.4.2 (vrtcount) - depth count
+                           hGridRep[:dimension].each do |hDimension|
+                              if hDimension[:dimensionType] == 'vertical'
+                                 unless hDimension[:dimensionSize].nil?
+                                    @xml.tag!('vrtcount', hDimension[:dimensionSize])
                                  end
                               end
-
                            end
-                           break
+
                         end
+                        break
                      end
                   end
 

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

@@ -43,10 +43,10 @@ module ADIWG
                            end
 
                            if hContact[:isOrganization]
-                              hParty[:organizationMembers].each do |hMember|
-                                 hMemberContact = Html_Document.getContact(hMember[:contactId])
+                              hParty[:organizationMembers].each do |memberId|
+                                 hMemberContact = Html_Document.getContact(memberId)
                                  @html.em('has Member: ')
-                                 @html.a(hMemberContact[:name], 'href' => '#CID_'+hMember[:contactId])
+                                 @html.a(hMemberContact[:name], 'href' => '#CID_'+ memberId)
                                  @html.br
                               end
                            else

data/lib/adiwg/mdtranslator/writers/iso19110/iso19110_writer.rb

@@ -1,7 +1,7 @@
 # Writer - internal data structure to ISO 19110:2003
 
 # History:
-#  Stan Smith 2018-03-30 add error/warning/notice message methods
+#  Stan Smith 2018-07-02 fix bug with handling of empty or missing dictionary
 #  Stan Smith 2017-05-26 allow choice of which dictionary to translate
 #                    ... fix bug when no dictionary is provided in mdJson
 #  Stan Smith 2017-01-20 refactor for mdJson/mdTranslator 2.0
@@ -21,28 +21,29 @@ module ADIWG
       module Writers
          module Iso19110
 
-            def self.startWriter(intObj, hResponseObj, whichDict: 0)
+            def self.startWriter(intObj, hResponseObj, whichDict = 0)
 
-               # Iso19110 can only output one dictionary at a time
-               # test if requested dictionary is in input file
-               if intObj[:dataDictionaries][whichDict].nil?
-                  responseObj[:writerMessages] << 'Dictionary is missing'
-                  responseObj[:writerPass] = false
-                  return nil
-               end
+               # load error message array
+               file = File.join(File.dirname(__FILE__), 'iso19110_writer_messages_eng') + '.yml'
+               hMessageList = YAML.load_file(file)
+               @aMessagesList = hMessageList['messageList']
 
                # make objects available to the instance
                @intObj = intObj
                @contacts = intObj[:contacts]
                @hResponseObj = hResponseObj
+
+               if intObj[:dataDictionaries].empty?
+                  issueError(110)
+                  return nil
+               end
+               if intObj[:dataDictionaries].length > 1
+                  issueNotice(111)
+               end
+
                dictionary = intObj[:dataDictionaries][whichDict]
                @domains = dictionary[:domains]
 
-               # load error message array
-               file = File.join(File.dirname(__FILE__), 'iso19110_writer_messages_eng') + '.yml'
-               hMessageList = YAML.load_file(file)
-               @aMessagesList = hMessageList['messageList']
-
                # set the format of the output file based on the writer specified
                hResponseObj[:writerOutputFormat] = 'xml'
                hResponseObj[:writerVersion] = ADIWG::Mdtranslator::Writers::Iso19110::VERSION
@@ -113,6 +114,14 @@ module ADIWG
                end
             end
 
+            def self.issueNotice(messageId, context = nil)
+               message = findMessage(messageId)
+               unless message.nil?
+                  message += ': CONTEXT is ' + context unless context.nil?
+                  @hResponseObj[:writerMessages] << 'NOTICE: ISO-19110 writer: ' + message
+               end
+            end
+
          end
       end
    end

data/lib/adiwg/mdtranslator/writers/iso19110/iso19110_writer_messages_eng.yml

@@ -37,4 +37,5 @@ messageList:
    - {id: 100, message: "codeset domain name is missing"}
    - {id: 101, message: "unrepresented domain name is missing"}
 
-   - {id: 110, message: " is missing"}
+   - {id: 110, message: "data dictionary is empty"}
+   - {id: 111, message: "multiple data dictionaries found, using first"}

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-05-25 block non-ISO19115-2 topic categories
 #  Stan Smith 2018-04-09 add error and warning messaging
 #  Stan Smith 2018-04-06 changed taxonomy to an array
 #  Stan Smith 2018-01-05 deprecated topicCategory[]
@@ -353,9 +354,16 @@ module ADIWG
                            end
                         end
                      end
+                     # only allow valid ISO 19115-2 topic categories to be written
+                     aAcceptable = %w(farming biota boundaries climatologyMeteorologyAtmosphere economy
+                                       elevation environment geoscientificInformation health imageryBaseMapsEarthCover
+                                       intelligenceMilitary inlandWaters location oceans planningCadastre society
+                                       structure transportation utilitiesCommunication)
                      aTopics.each do |topic|
-                        @xml.tag!('gmd:topicCategory') do
-                           enumerationClass.writeXML('iso_topicCategory', topic)
+                        if aAcceptable.include?(topic)
+                           @xml.tag!('gmd:topicCategory') do
+                              enumerationClass.writeXML('iso_topicCategory', topic)
+                           end
                         end
                      end
                      if aTopics.empty? && @hResponseObj[:writerShowTags]

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

@@ -18,6 +18,7 @@ module ADIWG
                   Jbuilder.new do |json|
                      json.date(AdiwgDateTimeFun.stringDateTimeFromDateObject(hDate))
                      json.dateType hDate[:dateType]
+                     json.description hDate[:description]
                   end
 
                end # build

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

@@ -24,9 +24,9 @@ module ADIWG
                def self.build(hDictionary)
 
                   Jbuilder.new do |json|
+                     json.citation Citation.build(hDictionary[:citation]) unless hDictionary[:citation].empty?
                      json.description hDictionary[:description]
                      json.subject hDictionary[:subjects] unless hDictionary[:subjects].empty?
-                     json.citation Citation.build(hDictionary[:citation]) unless hDictionary[:citation].empty?
                      json.recommendedUse hDictionary[:recommendedUses] unless hDictionary[:recommendedUses].empty?
                      json.locale @Namespace.json_map(hDictionary[:locales], Locale)
                      json.responsibleParty ResponsibleParty.build(hDictionary[:responsibleParty])

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

@@ -23,7 +23,7 @@ module ADIWG
                      json.containsData hGeographic[:containsData]
                      json.identifier Identifier.build(hGeographic[:identifier]) unless hGeographic[:identifier].empty?
                      json.boundingBox BoundingBox.build(hGeographic[:boundingBox]) unless hGeographic[:boundingBox].empty?
-                     json.geographicElement hGeographic[:nativeGeoJson]
+                     json.geographicElement hGeographic[:nativeGeoJson] unless hGeographic[:nativeGeoJson].empty?
                   end
 
                end # build