adiwg-mdtranslator 2.17.1 → 2.18.0rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b362845af6332b68c79bd86eefb21288c3571eb77673bb54fb2354d60ea947f
-  data.tar.gz: a62c78bf1888b263870db379c5303c1d7d07e89fd7d5712b0584b6f0b44d6457
+  metadata.gz: 67548c26ee946f10c11bb16593fea2bff705209467ffd4fbe9b9ce5db971803e
+  data.tar.gz: c4c6850208bbf1e47621c741777862cc6f30c2f6668d1753309c4f7397618311
 SHA512:
-  metadata.gz: 9aca1d45a359ac891958c803f880716bdb6016e00cf510e43ef7462e407c2678608c12affee79f5340d16c7e29ffeafb3f2fa146578fe4ea1921d6073a651e7c
-  data.tar.gz: 47db90725c67976476de6cc3c7f3c92eeac6fee01c5c6a943b696abc6e9c72f03c23174224e38954e0df6e38d897d63f4376f661be0d7508067f4b995cb725b3
+  metadata.gz: 76385a2877ccbb04739c2aac4a2526912f97d1d3a3863c9779ff948f447b5434f34d68030ad2a143466ac2fa804887d1edd60b56587e14b3a069545651fb52fb
+  data.tar.gz: 53326a9899e781aaa171bbaa25a18a6d0e736d3d615bb1f6f24c7818a65885b42cb3345bfb37d4d2f5155727cb3aee6660e56088b31ce8303999dac4ad2f8634

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.beta"
    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

@@ -311,8 +311,9 @@ class InternalMetadata
          eMailList: [],
          onlineResources: [],
          hoursOfService: [],
+         externalIdentifiers: [],
          contactInstructions: nil,
-         contactType: nil
+         contactType: nil,
       }
    end
 
@@ -492,6 +493,7 @@ class InternalMetadata
          maxValue: nil,
          units: nil,
          scaleFactor: nil,
+         rangeElementDescriptions: [],
          offset: nil,
          meanValue: nil,
          numberOfValues: nil,
@@ -1181,7 +1183,8 @@ class InternalMetadata
          numberOfDimensions: nil,
          dimension: [],
          cellGeometry: nil,
-         transformationParameterAvailable: false
+         transformationParameterAvailable: false,
+         scope: []
       }
    end
 
@@ -1198,7 +1201,8 @@ class InternalMetadata
    def newVectorInfo
       {
          topologyLevel: nil,
-         vectorObject: []
+         vectorObject: [],
+         scope: []
       }
    end
 
@@ -1218,7 +1222,8 @@ class InternalMetadata
          centerPoint: [],
          pointInPixel: nil,
          transformationDimensionDescription: nil,
-         transformationDimensionMapping: nil
+         transformationDimensionMapping: nil,
+         scope: []
       }
    end
 
@@ -1229,7 +1234,8 @@ class InternalMetadata
          orientationParameterAvailable: false,
          orientationParameterDescription: nil,
          georeferencedParameter: nil,
-         parameterCitation: []
+         parameterCitation: [],
+         scope: []
       }
    end
 

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

@@ -43,6 +43,10 @@ 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

@@ -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?('rangeElementDescriptions')
+                     unless hAttribute['rangeElementDescriptions'].nil?
+                        intAttGroup[:rangeElementDescriptions] = []
+
+                        hAttribute['rangeElementDescriptions'].each do |item|
+                           intAttGroup[:rangeElementDescriptions] << 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
@@ -35,13 +36,28 @@ module ADIWG
 
                   # contact - contact id (required)
                   if hContact.has_key?('contactId')
-                     intContact[:contactId] = hContact['contactId']
-                     outContext = 'contact ID ' + hContact['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
                   end
                   if intContact[:contactId].nil? || intContact[:contactId] == ''
                      @MessagePath.issueError(101, responseObj)
                   end
 
+                  if hContact.has_key?('externalIdentifiers')
+                     aItems = hContact['externalIdentifiers']
+                     aItems.each do |item|
+                        hReturn = Identifier.unpack(item, responseObj, outContext)
+                        unless hReturn.nil?
+                           intContact[:externalIdentifiers] << 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_mdJson.rb

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

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

@@ -30,11 +30,18 @@ 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')
-                     intParty[:contactId] = hParty['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
+
                      unless intParty[:contactId].nil? || intParty[:contactId] == ''
                         hContact = @MessagePath.findContact(hParty['contactId'])
                         if hContact[0].nil?
-                           outContext = 'contact ID ' + intParty[:contactId]
+                           outContext = 'contact ID ' + context
                            outContext = inContext + ' > ' + outContext unless inContext.nil?
                            @MessagePath.issueError(622, responseObj, outContext)
                         else

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

@@ -109,7 +109,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.17.1"
+      VERSION = "2.18.0rc1"
    end
 end
 

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_vectorRepresentation.rb

@@ -6,6 +6,7 @@
 #  Stan Smith 2017-03-28 original script
 
 require_relative 'html_vectorObject'
+require_relative 'html_scope'
 
 module ADIWG
    module Mdtranslator
@@ -22,6 +23,18 @@ module ADIWG
 
                   # classes used
                   objectClass = Html_VectorObject.new(@html)
+                  scopeClass = Html_Scope.new(@html)
+
+                  # vector representation - scope
+                  hVector[:scope].each do |scope|
+                     @html.details do
+                        @html.summary('Scope ', 'class' => 'h5')
+                        @html.section(:class => 'block') do
+                           scopeClass.writeHtml(hVector[:scope])
+                        end
+                     end
+                  end
+
 
                   # vector representation - topology level
                   unless hVector[:topologyLevel].nil?

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

@@ -7,6 +7,7 @@
 require_relative '../iso19115_1_writer'
 require_relative 'class_grid'
 require_relative 'class_point'
+require_relative 'class_scope'
 
 module ADIWG
    module Mdtranslator
@@ -26,12 +27,20 @@ module ADIWG
                   # classes used
                   gridClass = Grid.new(@xml, @hResponseObj)
                   pointClass = Point.new(@xml, @hResponseObj)
+                  scopeClass = MD_Scope.new(@xml, @hResponseObj)
+
 
                   outContext = 'georectified representation'
                   outContext = inContext + ' georectified representation' unless inContext.nil?
 
                   @xml.tag!('msr:MD_Georectified') do
 
+                     hGeoRec[:scope].each do |scope|
+                        @xml.tag!('msr:scope') do
+                           scopeClass.writeXML(scope, inContext)
+                        end
+                     end
+
                      # georectified - add grid info
                      hGrid = hGeoRec[:gridRepresentation]
                      gridClass.writeXML(hGrid, outContext)

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

@@ -7,6 +7,7 @@
 require_relative '../iso19115_1_writer'
 require_relative 'class_grid'
 require_relative 'class_citation'
+require_relative 'class_scope'
 
 module ADIWG
    module Mdtranslator
@@ -26,12 +27,21 @@ module ADIWG
                   # classes used
                   gridClass = Grid.new(@xml, @hResponseObj)
                   citationClass = CI_Citation.new(@xml, @hResponseObj)
+                  scopeClass = MD_Scope.new(@xml, @hResponseObj)
+
 
                   outContext = 'georeferenceable representation'
                   outContext = inContext + ' georeferenceable representation' unless inContext.nil?
 
                   @xml.tag!('msr:MD_Georeferenceable') do
 
+                     # georeferenceable - scope
+                     hGeoRef[:scope].each do |scope|
+                        @xml.tag!('msr:scope') do
+                           scopeClass.writeXML(scope, inContext)
+                        end
+                     end
+
                      # georeferenceable - add grid info (required)
                      hGrid = hGeoRef[:gridRepresentation]
                      gridClass.writeXML(hGrid, outContext)

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

@@ -6,6 +6,7 @@
 
 require_relative '../iso19115_1_writer'
 require_relative 'class_dimension'
+require_relative 'class_scope'
 
 module ADIWG
    module Mdtranslator
@@ -25,7 +26,15 @@ module ADIWG
                   # classes used
                   codelistClass = MD_Codelist.new(@xml, @hResponseObj)
                   dimensionClass = MD_Dimension.new(@xml, @hResponseObj)
-                  
+                  scopeClass = MD_Scope.new(@xml, @hResponseObj)
+
+                  # grid - scope
+                  hGrid[:scope].each do |scope|
+                     @xml.tag!('msr:scope') do
+                        scopeClass.writeXML(scope, inContext)
+                     end
+                  end
+
                   # grid - number of dimensions (required)
                   unless hGrid[:numberOfDimensions].nil?
                      @xml.tag!('msr:numberOfDimensions') do
@@ -62,6 +71,7 @@ module ADIWG
                      @xml.tag!('gco:Boolean', hGrid[:transformationParameterAvailable])
                   end
 
+
                end # writeXML
             end # Grid class
 

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

@@ -32,12 +32,12 @@ module ADIWG
 
                      # identifier - authority {CI_Citation}
                      hCitation = hIdentifier[:citation]
-                     unless hCitation.empty?
+                     unless hCitation.nil? || hCitation.empty?
                         @xml.tag!('mcc:authority') do
                            citationClass.writeXML(hCitation, outContext)
                         end
                      end
-                     if hCitation.empty? && @hResponseObj[:writerShowTags]
+                     if hCitation.nil? || hCitation.empty? && @hResponseObj[:writerShowTags]
                         @xml.tag!('mcc:authority')
                      end
 

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

@@ -6,6 +6,7 @@
 
 require_relative '../iso19115_1_writer'
 require_relative 'class_contact'
+require_relative 'class_partyIdentifier'
 
 module ADIWG
    module Mdtranslator
@@ -24,6 +25,7 @@ module ADIWG
 
                   # classes used
                   contactClass = CI_Contact.new(@xml, @hResponseObj)
+                  identifierClass = MD_PartyIdentifier.new(@xml, @hResponseObj)
 
                   outContext = 'individual contact'
                   outContext = inContext + ' individual contact' unless inContext.nil?
@@ -70,6 +72,25 @@ module ADIWG
                            @xml.tag!('cit:positionName')
                         end
 
+                        if hContact[:externalIdentifiers] && hContact[:externalIdentifiers].length > 0
+                           hContact[:externalIdentifiers].each do |identifier|
+                              @xml.tag!('cit:partyIdentifier') do
+                                 identifierClass.writeXML(identifier);
+                              end
+                           end
+                        else
+                           if hContact[:contactId] && 
+                              hContact[:contactId].is_a?(Hash)
+                              @xml.tag!('cit:partyIdentifier') do
+                                 identifierClass.writeXML(hContact[:contactId]);
+                              end
+                           elsif hContact[:contactId].is_a?(String)
+                              @xml.tag!('cit:partyIdentifier') do
+                                 identifierClass.writeXML({ identifier: hContact[:contactId] })
+                              end
+                           end
+                        end
+
                      end
                   end
                   if hContact.empty?

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

@@ -8,6 +8,7 @@ require_relative '../iso19115_1_writer'
 require_relative 'class_contact'
 require_relative 'class_browseGraphic'
 require_relative 'class_individual'
+require_relative 'class_partyIdentifier'
 
 module ADIWG
    module Mdtranslator
@@ -28,6 +29,7 @@ module ADIWG
                   contactClass = CI_Contact.new(@xml, @hResponseObj)
                   graphicClass = MD_BrowseGraphic.new(@xml, @hResponseObj)
                   individualClass = CI_Individual.new(@xml, @hResponseObj)
+                  identifierClass = MD_PartyIdentifier.new(@xml, @hResponseObj)
 
                   outContext = 'responsible party'
                   outContext = inContext + ' responsible party' unless inContext.nil?
@@ -91,6 +93,27 @@ module ADIWG
                            @xml.tag!('cit:individual')
                         end
 
+                        # organization - party identifier
+
+                        if hContact[:externalIdentifiers] && hContact[:externalIdentifiers].length > 0
+                           hContact[:externalIdentifiers].each do |identifier|
+                              @xml.tag!('cit:partyIdentifier') do
+                                 identifierClass.writeXML(identifier);
+                              end
+                           end
+                        else
+                           if hContact[:contactId] && 
+                              hContact[:contactId].is_a?(Hash)
+                              @xml.tag!('cit:partyIdentifier') do
+                                 identifierClass.writeXML(hContact[:contactId]);
+                              end
+                           elsif hContact[:contactId].is_a?(String)
+                              @xml.tag!('cit:partyIdentifier') do
+                                 identifierClass.writeXML({ identifier: hContact[:contactId] })
+                              end
+                           end
+                        end
+
                      end
                      if hContact.empty?
                         @NameSpace.issueWarning(271, nil, outContext)

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

@@ -0,0 +1,92 @@
+# ISO <<Class>> MD_Identifier for specific party identfier features for individual and organization
+# 19115-3 output for ISO 19115-1 XML
+
+require_relative '../iso19115_1_writer'
+require_relative 'class_citation'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module Iso19115_1
+
+            class MD_PartyIdentifier
+
+               def initialize(xml, hResponseObj)
+                  @xml = xml
+                  @hResponseObj = hResponseObj
+                  @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_1
+               end
+
+               def writeXML(hIdentifier, inContext = nil)
+
+                  outContext = 'identifier'
+                  outContext = inContext + ' authority' unless inContext.nil?
+
+                  # classes used in MD_Metadata
+                  citationClass = CI_Citation.new(@xml, @hResponseObj)
+
+                  @xml.tag!('mcc:MD_Identifier') do
+
+                     # identifier - authority {CI_Citation}
+                     hCitation = hIdentifier[:citation]
+                     unless hCitation.nil? || hCitation.empty?
+                        @xml.tag!('mcc:authority') do
+                           citationClass.writeXML(hCitation, outContext)
+                        end
+                     end
+                     if hCitation.nil? || hCitation.empty? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('mcc:authority')
+                     end
+
+                     # identifier - code (required)
+                     s = hIdentifier[:identifier]
+                     unless s.nil?
+                        @xml.tag!('mcc:code') do
+                           @xml.tag!('gco:CharacterString', s)
+                        end
+                     end
+                     if s.nil?
+                        @NameSpace.issueWarning(230, 'mcc:code', inContext)
+                     end
+
+                     # identifier - codeSpace
+                     s = hIdentifier[:namespace]
+                     unless s.nil?
+                        @xml.tag!('mcc:codeSpace') do
+                           @xml.tag!('gco:CharacterString', s)
+                        end
+                     end
+                     if s.nil? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('mcc:codeSpace')
+                     end
+
+                     # identifier - codeSpace version
+                     s = hIdentifier[:version]
+                     unless s.nil?
+                        @xml.tag!('mcc:version') do
+                           @xml.tag!('gco:CharacterString', s)
+                        end
+                     end
+                     if s.nil? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('mcc:version')
+                     end
+
+                     # identifier - description
+                     s = hIdentifier[:description]
+                     unless s.nil?
+                        @xml.tag!('mcc:description') do
+                           @xml.tag!('gco:CharacterString', s)
+                        end
+                     end
+                     if s.nil? && @hResponseObj[:writerShowTags]
+                        @xml.tag!('mcc:description')
+                     end
+
+                  end # MD_Identifier tag
+               end # writeXML
+            end # MD_Identifier class
+
+         end
+      end
+   end
+end

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

@@ -0,0 +1,45 @@
+# ISO <<Class>> MI_RangeElementDescription attributes
+# 19115-1 writer output in XML
+
+require_relative '../iso19115_1_writer'
+
+module ADIWG
+  module Mdtranslator
+    module Writers
+      module Iso19115_1
+
+        class MI_RangeElementDescription
+
+          def initialize(xml, hResponseObj)
+            @xml = xml
+            @hResponseObj = hResponseObj
+            @NameSpace = ADIWG::Mdtranslator::Writers::Iso19115_1
+          end
+
+          def writeXML(hAttribute, inContext = nil)
+
+            unless hAttribute[:name].nil?
+              @xml.tag!('mrc:name') do
+                @xml.tag!('gco:CharacterString', hAttribute[:name])
+              end
+            end
+
+            unless hAttribute[:definition].nil?
+              @xml.tag!('mrc:definition') do
+                @xml.tag!('gco:CharacterString', hAttribute[:definition])
+              end
+            end
+
+            hAttribute[:rangeElements].each do |hRangeElement|
+              @xml.tag!('mrc:rangeElement') do
+                @xml.tag!('gco:Record') do
+                  @xml.tag!('gco:CharacterString', hRangeElement)
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,6 +6,7 @@
 
 require_relative '../iso19115_1_writer'
 require_relative 'class_unitsOfMeasure'
+require_relative 'class_rangeElementDescription'
 
 module ADIWG
    module Mdtranslator
@@ -24,6 +25,7 @@ module ADIWG
 
                   # classes used
                   uomClass = UnitsOfMeasure.new(@xml, @hResponseObj)
+                  rangeElementDescription = MI_RangeElementDescription.new(@xml, @hResponseObj)
 
                   # sample dimension - max value {real}
                   unless hAttribute[:maxValue].nil?
@@ -65,6 +67,12 @@ module ADIWG
                      @xml.tag!('mrc:scaleFactor')
                   end
 
+                  hAttribute[:rangeElementDescriptions].each do |red|
+                     @xml.tag!('mrc:rangeElementDescription') do
+                        rangeElementDescription.writeXML(red, inContext)
+                     end
+                  end
+
                   # sample dimension - offset {real}
                   unless hAttribute[:offset].nil?
                      @xml.tag!('mrc:offset') do

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

@@ -6,6 +6,7 @@
 
 require_relative 'class_codelist'
 require_relative 'class_geometricObjects'
+require_relative 'class_scope'
 
 module ADIWG
    module Mdtranslator
@@ -24,12 +25,20 @@ module ADIWG
                   # classes used
                   codelistClass = MD_Codelist.new(@xml, @hResponseObj)
                   geoObjClass = MD_GeometricObjects.new(@xml, @hResponseObj)
+                  scopeClass = MD_Scope.new(@xml, @hResponseObj)
 
                   outContext = 'vector representation'
                   outContext = inContext + ' vector representation' unless inContext.nil?
 
                   @xml.tag!('msr:MD_VectorSpatialRepresentation') do
 
+                     # vector representation - scope
+                     hVector[:scope].each do |scope|
+                        @xml.tag!('msr:scope') do
+                           scopeClass.writeXML(scope, inContext)
+                        end
+                     end
+
                      # vector representation - topology level
                      unless hVector[:topologyLevel].nil?
                         @xml.tag!('msr:topologyLevel') do

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

@@ -27,6 +27,7 @@ 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]

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

@@ -31,6 +31,7 @@ module ADIWG
                      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

@@ -24,6 +24,7 @@ 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

@@ -25,6 +25,7 @@ module ADIWG
                      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

@@ -23,6 +23,7 @@ module ADIWG
                      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

@@ -20,6 +20,7 @@ module ADIWG
                   Jbuilder.new do |json|
                      json.topologyLevel hVector[:topologyLevel]
                      json.vectorObject @Namespace.json_map(hVector[:vectorObject], VectorObject)
+                     json.scope hVector[:scope]
                   end
 
                end # build

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.17.1
+  version: 2.18.0rc1
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-09 00:00:00.000000000 Z
+date: 2022-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,16 +127,16 @@ dependencies:
   name: adiwg-mdjson_schemas
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.8.0.pre.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.8.0.pre.beta
 - !ruby/object:Gem::Dependency
   name: adiwg-mdcodes
   requirement: !ruby/object:Gem::Requirement
@@ -397,6 +397,7 @@ files:
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_processStep.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_processing.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_projectionParameters.rb
+- lib/adiwg/mdtranslator/readers/mdJson/modules/module_rangeElementDescription.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_referenceSystemParameters.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_releasability.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_resourceInfo.rb
@@ -706,6 +707,7 @@ files:
 - lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_onlineResource.rb
 - lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_orderProcess.rb
 - lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_organization.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_partyIdentifier.rb
 - lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_phone.rb
 - lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_point.rb
 - lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_polygon.rb
@@ -713,6 +715,7 @@ files:
 - lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_processStep.rb
 - lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_processing.rb
 - lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_rangeDimension.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_rangeElementDescription.rb
 - lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_referenceSystem.rb
 - lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_releasability.rb
 - lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_resolution.rb
@@ -976,11 +979,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: The mdtranslator (metadata translator) is a tool for translating metadata