adiwg-mdtranslator 2.18.0rc1 → 2.18.0rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67548c26ee946f10c11bb16593fea2bff705209467ffd4fbe9b9ce5db971803e
-  data.tar.gz: c4c6850208bbf1e47621c741777862cc6f30c2f6668d1753309c4f7397618311
+  metadata.gz: ecb7704090196204491ef42a0817dd4e9980188e3e63852d61cb7f0406b57f80
+  data.tar.gz: 396c316ebdabbbe7acccf9deacbc45cd662799bb379e2a97389ecf546d04477d
 SHA512:
-  metadata.gz: 76385a2877ccbb04739c2aac4a2526912f97d1d3a3863c9779ff948f447b5434f34d68030ad2a143466ac2fa804887d1edd60b56587e14b3a069545651fb52fb
-  data.tar.gz: 53326a9899e781aaa171bbaa25a18a6d0e736d3d615bb1f6f24c7818a65885b42cb3345bfb37d4d2f5155727cb3aee6660e56088b31ce8303999dac4ad2f8634
+  metadata.gz: 69eb88558f05db637609abe2047853a6517ce0a5ee7e85e2ad9c7fd679d52cde0d3fd4af206a73bb2ebd9cafde309e97e10dc49f02bc0e0ab0a076cfa9fc6fcb
+  data.tar.gz: 806fcca0134b19ea6da6619eb60c1480f73ef0f4323c847d51165fd5b377741b4ce48248f57a92276d4c6a7f6c24882ea554cc95efe6eaf0cb72f9c46af2ca7d

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.8.0.pre.beta"
+   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: [],
@@ -311,9 +312,8 @@ class InternalMetadata
          eMailList: [],
          onlineResources: [],
          hoursOfService: [],
-         externalIdentifiers: [],
          contactInstructions: nil,
-         contactType: nil,
+         contactType: nil
       }
    end
 
@@ -493,12 +493,12 @@ class InternalMetadata
          maxValue: nil,
          units: nil,
          scaleFactor: nil,
-         rangeElementDescriptions: [],
          offset: nil,
          meanValue: nil,
          numberOfValues: nil,
          standardDeviation: nil,
          bitsPerValue: nil,
+         rangeElementDescription: [],
          boundMin: nil,
          boundMax: nil,
          boundUnits: nil,
@@ -1180,11 +1180,11 @@ class InternalMetadata
 
    def newGridInfo
       {
+         scope: [],
          numberOfDimensions: nil,
          dimension: [],
          cellGeometry: nil,
-         transformationParameterAvailable: false,
-         scope: []
+         transformationParameterAvailable: false
       }
    end
 
@@ -1200,9 +1200,9 @@ class InternalMetadata
 
    def newVectorInfo
       {
+         scope: [],
          topologyLevel: nil,
-         vectorObject: [],
-         scope: []
+         vectorObject: []
       }
    end
 
@@ -1215,6 +1215,7 @@ class InternalMetadata
 
    def newGeorectifiedInfo
       {
+         scope: [],
          gridRepresentation: {},
          checkPointAvailable: false,
          checkPointDescription: nil,
@@ -1222,20 +1223,19 @@ class InternalMetadata
          centerPoint: [],
          pointInPixel: nil,
          transformationDimensionDescription: nil,
-         transformationDimensionMapping: nil,
-         scope: []
+         transformationDimensionMapping: nil
       }
    end
 
    def newGeoreferenceableInfo
       {
+         scope: [],
          gridRepresentation: {},
          controlPointAvailable: false,
          orientationParameterAvailable: false,
          orientationParameterDescription: nil,
          georeferencedParameter: nil,
-         parameterCitation: [],
-         scope: []
+         parameterCitation: []
       }
    end
 

data/lib/adiwg/mdtranslator/readers/mdJson/mdJson_reader.rb

@@ -43,10 +43,6 @@ module ADIWG
                   return {}
                end
 
-               if hMdJson.is_a?(Array)
-                  hMdJson = hMdJson.first
-               end
-
                # file must contain an mdJson object
                if hMdJson.empty?
                   hResponseObj[:readerStructureMessages] << 'ERROR: mdJson reader: object is empty'

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

@@ -103,12 +103,12 @@ module ADIWG
                      end
                   end
 
-                  if hAttribute.has_key?('rangeElementDescriptions')
-                     unless hAttribute['rangeElementDescriptions'].nil?
-                        intAttGroup[:rangeElementDescriptions] = []
+                  if hAttribute.has_key?('rangeElementDescription')
+                     unless hAttribute['rangeElementDescription'].nil?
+                        intAttGroup[:rangeElementDescription] = []
 
-                        hAttribute['rangeElementDescriptions'].each do |item|
-                           intAttGroup[:rangeElementDescriptions] << RangeElementDescription.unpack(item, responseObj, outContext)
+                        hAttribute['rangeElementDescription'].each do |item|
+                           intAttGroup[:rangeElementDescription] << RangeElementDescription.unpack(item, responseObj, outContext)
                         end
                      end
                   end

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

@@ -36,24 +36,19 @@ module ADIWG
 
                   # contact - contact id (required)
                   if hContact.has_key?('contactId')
-                     if hContact['contactId'].is_a?(Hash)
-                        outContext = 'contact ID ' + hContact['contactId']['identifier']
-                        intContact[:contactId] = hContact['contactId'].transform_keys(&:to_sym)
-                     elsif hContact['contactId'].is_a?(String)
-                        outContext = 'contact ID ' + hContact['contactId']
-                        intContact[:contactId] = hContact['contactId']
-                     end
+                     intContact[:contactId] = hContact['contactId']
+                     outContext = 'contact ID ' + hContact['contactId']
                   end
                   if intContact[:contactId].nil? || intContact[:contactId] == ''
                      @MessagePath.issueError(101, responseObj)
                   end
 
-                  if hContact.has_key?('externalIdentifiers')
-                     aItems = hContact['externalIdentifiers']
+                  if hContact.has_key?('externalIdentifier')
+                     aItems = hContact['externalIdentifier']
                      aItems.each do |item|
                         hReturn = Identifier.unpack(item, responseObj, outContext)
                         unless hReturn.nil?
-                           intContact[:externalIdentifiers] << hReturn
+                           intContact[:externalIdentifier] << hReturn
                         end
                      end
                   end

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

@@ -123,13 +123,7 @@ module ADIWG
                   contactType = nil
                   contactName = nil
                   @contacts.each_with_index do |contact, i|
-                     if contact[:contactId] == contactId || 
-                        (
-                           contact[:contactId].is_a?(Hash) && 
-                           contactId.is_a?(Hash) && 
-                           contact[:contactId][:identifier] == contactId['identifier']
-                        )
-
+                     if contact[:contactId] == contactId
                         contactIndex = i
                         if contact[:isOrganization]
                            contactType = 'organization'

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

@@ -30,18 +30,11 @@ module ADIWG
                   # load party with contact index, contact type, and name
                   # return nil if contact ID does not exist in contact array
                   if hParty.has_key?('contactId')
-                     if hParty['contactId'].is_a?(Hash)
-                        intParty[:contactId] = hParty['contactId'].transform_keys(&:to_sym)
-                        context = hParty['contactId']['identifier']
-                     elsif hParty['contactId'].is_a?(String)
-                        intParty[:contactId] = hParty['contactId']
-                        context = hParty['contactId']
-                     end
-
+                     intParty[:contactId] = hParty['contactId']
                      unless intParty[:contactId].nil? || intParty[:contactId] == ''
                         hContact = @MessagePath.findContact(hParty['contactId'])
                         if hContact[0].nil?
-                           outContext = 'contact ID ' + context
+                           outContext = 'contact ID ' + intParty[:contactId]
                            outContext = inContext + ' > ' + outContext unless inContext.nil?
                            @MessagePath.issueError(622, responseObj, outContext)
                         else

data/lib/adiwg/mdtranslator/version.rb

@@ -109,7 +109,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.18.0rc1"
+      VERSION = "2.18.0rc2"
    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_rangeElementDescription.rb

@@ -0,0 +1,40 @@
+# HTML writer
+# range element description
+
+module ADIWG
+  module Mdtranslator
+    module Writers
+      module Html
+
+        class Html_RangeElementDescription
+
+          def initialize(html)
+            @html = html
+          end
+
+          def writeHtml(red)
+            unless red[:name].nil?
+              @html.em('Name:')
+              @html.text!(red[:name])
+              @html.br
+            end
+
+            unless red[:definition].nil?
+              @html.em('Definition:')
+              @html.text!(red[:definition])
+              @html.br
+            end
+
+            red[:rangeElements].each do |hRangeElement|
+              @html.em('Range Element:')
+              @html.text!(hRangeElement)
+            end
+
+            @html.br
+          end # writeHtml
+        end # Html_RangeElementDescription
+        
+      end
+    end
+  end
+end

data/lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_individual.rb

@@ -72,8 +72,9 @@ module ADIWG
                            @xml.tag!('cit:positionName')
                         end
 
-                        if hContact[:externalIdentifiers] && hContact[:externalIdentifiers].length > 0
-                           hContact[:externalIdentifiers].each do |identifier|
+                        # individual - party identifier
+                        if hContact[:externalIdentifier] && hContact[:externalIdentifier].length > 0
+                           hContact[:externalIdentifier].each do |identifier|
                               @xml.tag!('cit:partyIdentifier') do
                                  identifierClass.writeXML(identifier);
                               end
@@ -90,7 +91,7 @@ module ADIWG
                               end
                            end
                         end
-
+                        
                      end
                   end
                   if hContact.empty?

data/lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_organization.rb

@@ -94,9 +94,8 @@ module ADIWG
                         end
 
                         # organization - party identifier
-
-                        if hContact[:externalIdentifiers] && hContact[:externalIdentifiers].length > 0
-                           hContact[:externalIdentifiers].each do |identifier|
+                        if hContact[:externalIdentifier] && hContact[:externalIdentifier].length > 0
+                           hContact[:externalIdentifier].each do |identifier|
                               @xml.tag!('cit:partyIdentifier') do
                                  identifierClass.writeXML(identifier);
                               end

data/lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_sampleDimension.rb

@@ -67,7 +67,7 @@ module ADIWG
                      @xml.tag!('mrc:scaleFactor')
                   end
 
-                  hAttribute[:rangeElementDescriptions].each do |red|
+                  hAttribute[:rangeElementDescription].each do |red|
                      @xml.tag!('mrc:rangeElementDescription') do
                         rangeElementDescription.writeXML(red, inContext)
                      end

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

@@ -27,12 +27,12 @@ module ADIWG
                      json.maxValue hAttribute[:maxValue]
                      json.units hAttribute[:units]
                      json.scaleFactor hAttribute[:scaleFactor]
-                     json.rangeElementDescriptions hAttribute[:rangeElementDescriptions]
                      json.offset hAttribute[:offset]
                      json.meanValue hAttribute[:meanValue]
                      json.numberOfValues hAttribute[:numberOfValues]
                      json.standardDeviation hAttribute[:standardDeviation]
                      json.bitsPerValue hAttribute[:bitsPerValue]
+                     json.rangeElementDescription hAttribute[:rangeElementDescription]
                      json.boundMin hAttribute[:boundMin]
                      json.boundMax hAttribute[:boundMax]
                      json.boundUnits hAttribute[:boundUnits]

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

@@ -25,13 +25,13 @@ module ADIWG
                      json.contactId hContact[:contactId]
                      json.isOrganization hContact[:isOrganization]
                      json.name hContact[:name]
+                     json.externalIdentifier hContact[:externalIdentifier] unless hContact[:externalIdentifier].empty?
                      json.positionName hContact[:positionName]
                      json.memberOfOrganization hContact[:memberOfOrgs] unless hContact[:memberOfOrgs].empty?
                      json.logoGraphic @Namespace.json_map(hContact[:logos], GraphicOverview)
                      json.phone @Namespace.json_map(hContact[:phones], Phone)
                      json.address @Namespace.json_map(hContact[:addresses], Address)
                      json.electronicMailAddress hContact[:eMailList] unless hContact[:eMailList].empty?
-                     json.externalIdentifiers hContact[:externalIdentifiers] unless hContact[:externalIdentifiers].empty?
                      json.onlineResource @Namespace.json_map(hContact[:onlineResources], OnlineResource)
                      json.hoursOfService hContact[:hoursOfService] unless hContact[:hoursOfService].empty?
                      json.contactInstructions hContact[:contactInstructions]

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

@@ -16,6 +16,7 @@ module ADIWG
                def self.build(hGeoRec)
 
                   Jbuilder.new do |json|
+                     json.scope hGeoRec[:scope]
                      json.gridRepresentation Grid.build(hGeoRec[:gridRepresentation]) unless hGeoRec[:gridRepresentation].empty?
                      json.checkPointAvailable hGeoRec[:checkPointAvailable]
                      json.checkPointDescription hGeoRec[:checkPointDescription]
@@ -24,7 +25,6 @@ module ADIWG
                      json.pointInPixel hGeoRec[:pointInPixel]
                      json.transformationDimensionDescription hGeoRec[:transformationDimensionDescription]
                      json.transformationDimensionMapping hGeoRec[:transformationDimensionMapping]
-                     json.scope hGeoRec[:scope]
                   end
 
                end # build

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

@@ -19,13 +19,13 @@ module ADIWG
                   @Namespace = ADIWG::Mdtranslator::Writers::MdJson
 
                   Jbuilder.new do |json|
+                     json.scope hGeoRef[:scope]
                      json.gridRepresentation Grid.build(hGeoRef[:gridRepresentation]) unless hGeoRef[:gridRepresentation].empty?
                      json.controlPointAvailable hGeoRef[:controlPointAvailable]
                      json.orientationParameterAvailable hGeoRef[:orientationParameterAvailable]
                      json.orientationParameterDescription hGeoRef[:orientationParameterDescription]
                      json.georeferencedParameter hGeoRef[:georeferencedParameter]
                      json.parameterCitation @Namespace.json_map(hGeoRef[:parameterCitation], Citation)
-                     json.scope hGeoRef[:scope]
                   end
 
                end # build

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

@@ -19,11 +19,11 @@ module ADIWG
                   @Namespace = ADIWG::Mdtranslator::Writers::MdJson
 
                   Jbuilder.new do |json|
+                     json.scope hGrid[:scope]
                      json.numberOfDimensions hGrid[:numberOfDimensions]
                      json.dimension @Namespace.json_map(hGrid[:dimension], Dimension)
                      json.cellGeometry hGrid[:cellGeometry]
                      json.transformationParameterAvailable hGrid[:transformationParameterAvailable]
-                     json.scope hGrid[:scope]
                   end
 
                end # build

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

@@ -18,9 +18,9 @@ module ADIWG
                   @Namespace = ADIWG::Mdtranslator::Writers::MdJson
 
                   Jbuilder.new do |json|
+                     json.scope hVector[:scope]
                      json.topologyLevel hVector[:topologyLevel]
                      json.vectorObject @Namespace.json_map(hVector[:vectorObject], VectorObject)
-                     json.scope hVector[:scope]
                   end
 
                end # build

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.18.0rc1
+  version: 2.18.0rc2
 platform: ruby
 authors:
 - Stan Smith
 - Josh Bradley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.0.pre.beta
+        version: 2.8.0.pre.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.0.pre.beta
+        version: 2.8.0.pre.beta2
 - !ruby/object:Gem::Dependency
   name: adiwg-mdcodes
   requirement: !ruby/object:Gem::Requirement
@@ -586,6 +586,7 @@ files:
 - lib/adiwg/mdtranslator/writers/html/sections/html_processStep.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_processing.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_projectionParameters.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_rangeElementDescription.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_referenceSystemParameters.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_releasability.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_resourceFormat.rb
@@ -968,7 +969,7 @@ homepage: http://www.adiwg.org/mdTranslator
 licenses:
 - UNLICENSED
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -984,7 +985,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: The mdtranslator (metadata translator) is a tool for translating metadata
   in one format to another. The tool is written and maintained by the Alaska Data