adiwg-mdtranslator 2.7.0 → 2.8.0

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_keyword.rb

@@ -2,14 +2,14 @@
 # 19115-2 writer output in XML
 
 # History:
-#   Stan Smith 2016-12-12 refactored for mdTranslator/mdJson 2.0
-#   Stan Smith 2015-07-14 refactored to eliminate namespace globals $WriterNS and $IsoNS
-#   Stan Smith 2015-07-14 refactored to make iso19110 independent of iso19115_2 classes
-#   Stan Smith 2015-06-22 replace global ($response) with passed in object (hResponseObj)
-#   Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
-#   Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
-#   Stan Smith 2014-08-21 removed keyword thesaurus link; use citation onlineResource
-#   Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
+#  Stan Smith 2016-12-12 refactored for mdTranslator/mdJson 2.0
+#  Stan Smith 2015-07-14 refactored to eliminate namespace globals $WriterNS and $IsoNS
+#  Stan Smith 2015-07-14 refactored to make iso19110 independent of iso19115_2 classes
+#  Stan Smith 2015-06-22 replace global ($response) with passed in object (hResponseObj)
+#  Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
+#  Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
+#  Stan Smith 2014-08-21 removed keyword thesaurus link; use citation onlineResource
+#  Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
 # 	Stan Smith 2013-09-18 original script
 
 require_relative 'class_codelist'

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_projectionParameters.rb

@@ -27,7 +27,7 @@ module ADIWG
                   @xml.tag!('gmd:MD_ProjectionParameters') do
 
                      # projection parameters - zone {integer}
-                     i = hProjection[:zone]
+                     i = hProjection[:gridZone]
                      unless i.nil?
                         @xml.tag!('gmd:zone') do
                            @xml.tag!('gco:integer', i.to_s)

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

@@ -0,0 +1,34 @@
+# mdJson 2.0 writer - spatial reference system ellipsoid parameters
+
+# History:
+#   Stan Smith 2017-10-24 original script
+
+require 'jbuilder'
+require_relative 'mdJson_identifier'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module MdJson
+
+            module GeodeticParameters
+
+               def self.build(hGeodetic)
+
+                  Jbuilder.new do |json|
+                     json.datumIdentifier Identifier.build(hGeodetic[:datumIdentifier]) unless hGeodetic[:datumIdentifier].empty?
+                     json.datumName hGeodetic[:datumName]
+                     json.ellipsoidIdentifier Identifier.build(hGeodetic[:ellipsoidIdentifier]) unless hGeodetic[:ellipsoidIdentifier].empty?
+                     json.ellipsoidName hGeodetic[:ellipsoidName]
+                     json.semiMajorAxis hGeodetic[:semiMajorAxis]
+                     json.axisUnits hGeodetic[:axisUnits]
+                     json.denominatorOfFlatteningRatio hGeodetic[:denominatorOfFlatteningRatio]
+                  end
+
+               end # build
+            end # EllipsoidParameters
+
+         end
+      end
+   end
+end

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

@@ -20,8 +20,11 @@ module ADIWG
 
                   Jbuilder.new do |json|
                      json.projectionIdentifier Identifier.build(hProjection[:projectionIdentifier]) unless hProjection[:projectionIdentifier].empty?
+                     json.gridSystem hProjection[:gridSystem]
+                     json.gridSystemName hProjection[:gridSystemName]
+                     json.gridZone hProjection[:gridZone]
+                     json.projection hProjection[:projection]
                      json.projectionName hProjection[:projectionName]
-                     json.zone hProjection[:zone]
                      json.standardParallel1 hProjection[:standardParallel1]
                      json.standardParallel2 hProjection[:standardParallel2]
                      json.longitudeOfCentralMeridian hProjection[:longitudeOfCentralMeridian]
@@ -44,8 +47,8 @@ module ADIWG
                      json.landsatPath hProjection[:landsatPath]
                      json.localPlanarDescription hProjection[:localPlanarDescription]
                      json.localPlanarGeoreference hProjection[:localPlanarGeoreference]
-                     json.otherProjectionDescription hProjection[:otherProjectionDescription]
                      json.otherGridDescription hProjection[:otherGridDescription]
+                     json.otherProjectionDescription hProjection[:otherProjectionDescription]
                   end
 
                end # build

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

@@ -20,6 +20,7 @@ module ADIWG
                   Jbuilder.new do |json|
                      json.referenceSystemType hSystem[:systemType]
                      json.referenceSystemIdentifier Identifier.build(hSystem[:systemIdentifier]) unless hSystem[:systemIdentifier].empty?
+                     json.referenceSystemWKT hSystem[:systemWKT]
                      json.referenceSystemParameterSet SpatialReferenceParameters.build(hSystem[:systemParameterSet]) unless hSystem[:systemParameterSet].empty?
                   end
 

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

@@ -5,7 +5,7 @@
 
 require 'jbuilder'
 require_relative 'mdJson_projectionParameters'
-require_relative 'mdJson_ellipsoidParameters'
+require_relative 'mdJson_geodeticParameters'
 require_relative 'mdJson_verticalDatumParameters'
 
 module ADIWG
@@ -19,7 +19,7 @@ module ADIWG
 
                   Jbuilder.new do |json|
                      json.projection ProjectionParameters.build(hSystem[:projection]) unless hSystem[:projection].empty?
-                     json.ellipsoid EllipsoidParameters.build(hSystem[:ellipsoid]) unless hSystem[:ellipsoid].empty?
+                     json.geodetic GeodeticParameters.build(hSystem[:geodetic]) unless hSystem[:geodetic].empty?
                      json.verticalDatum VerticalDatumParameters.build(hSystem[:verticalDatum]) unless hSystem[:verticalDatum].empty?
                   end
 

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_tag.rb

@@ -21,7 +21,7 @@ module ADIWG
                   hTag[:name] = keyword
                   hTag[:scheme] = namespace unless namespace.nil?
                   if theme == 'isoTopicCategory'
-                     hTag[:type] = hTag[:scheme] = 'ISO 19115 Topic Categories'
+                     hTag[:type] = hTag[:scheme] = 'ISO 19115 Topic Category'
                   end
                   return hTag
                end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,14 +143,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -273,15 +273,18 @@ files:
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_entityOverview.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_enumerated.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_fgdc.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_geodeticReference.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_geographicResolution.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_geologicAge.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_horizontalPlanar.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_horizontalReference.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_identification.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_keyword.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_lineage.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_localSystem.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_mapCoordinateInfo.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_mapGridSystem.rb
-- lib/adiwg/mdtranslator/readers/fgdc/modules/module_mapLocalSystem.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_mapLocalPlanar.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_mapProjection.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_metadataInfo.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_methodology.rb
@@ -309,8 +312,8 @@ files:
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_timePeriod.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_transferInfo.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_verticalAltitude.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_verticalDatum.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_verticalDepth.rb
-- lib/adiwg/mdtranslator/readers/fgdc/modules/module_verticalReference.rb
 - lib/adiwg/mdtranslator/readers/fgdc/readme.md
 - lib/adiwg/mdtranslator/readers/fgdc/version.rb
 - lib/adiwg/mdtranslator/readers/mdJson/mdJson_reader.rb
@@ -337,7 +340,6 @@ files:
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_domain.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_domainItem.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_duration.rb
-- lib/adiwg/mdtranslator/readers/mdJson/modules/module_ellipsoid.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_entity.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_entityAttribute.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_entityForeignKey.rb
@@ -347,6 +349,7 @@ files:
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_format.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_funding.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_geoJson.rb
+- lib/adiwg/mdtranslator/readers/mdJson/modules/module_geodetic.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_geographicExtent.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_geographicResolution.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_geologicAge.rb
@@ -448,14 +451,20 @@ files:
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_dateSingle.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_description.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_fgdc.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_geodeticReference.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_geographicResolution.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_geologicAge.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_geologicRange.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_identification.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_keyword.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_lineage.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_localSystem.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_mapCoordinateInfo.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_mapProjection.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_method.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_methodKeywords.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_phone.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_planarReference.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_process.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_publisher.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_quality.rb
@@ -464,12 +473,14 @@ files:
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_source.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_spatialDomain.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_spatialOrganization.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_spatialReference.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_status.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_taxonomy.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_taxonomyClassification.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_taxonomyKeywords.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_taxonomySystem.rb
 - lib/adiwg/mdtranslator/writers/fgdc/classes/class_timePeriod.rb
+- lib/adiwg/mdtranslator/writers/fgdc/classes/class_verticalDatum.rb
 - lib/adiwg/mdtranslator/writers/fgdc/fgdc_writer.rb
 - lib/adiwg/mdtranslator/writers/fgdc/readme.md
 - lib/adiwg/mdtranslator/writers/fgdc/version.rb
@@ -501,7 +512,6 @@ files:
 - lib/adiwg/mdtranslator/writers/html/sections/html_domain.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_domainItem.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_duration.rb
-- lib/adiwg/mdtranslator/writers/html/sections/html_ellipsoidParameters.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_entity.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_entityAttribute.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_entityForeignKey.rb
@@ -512,6 +522,7 @@ files:
 - lib/adiwg/mdtranslator/writers/html/sections/html_featureProperties.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_format.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_funding.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_geodeticParameters.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_geographicElement.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_geographicExtent.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_geographicResolution.rb
@@ -711,7 +722,6 @@ files:
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_domain.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_domainItem.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_duration.rb
-- lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_ellipsoidParameters.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_entity.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_entityAttribute.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_entityForeignKey.rb
@@ -719,6 +729,7 @@ files:
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_extent.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_format.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_funding.rb
+- lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_geodeticParameters.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_geographicExtent.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_geographicResolution.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_geologicAge.rb

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

@@ -1,78 +0,0 @@
-# unpack spatial reference system ellipsoid
-# Reader - ADIwg JSON to internal data structure
-
-# History:
-# 	Stan Smith 2017-10-23 original script
-
-require_relative 'module_identifier'
-
-module ADIWG
-   module Mdtranslator
-      module Readers
-         module MdJson
-
-            module Ellipsoid
-
-               def self.unpack(hEllipsoid, responseObj)
-
-                  # return nil object if input is empty
-                  if hEllipsoid.empty?
-                     responseObj[:readerExecutionMessages] << 'Ellipsoid object is empty'
-                     responseObj[:readerExecutionPass] = false
-                     return nil
-                  end
-
-                  # instance classes needed in script
-                  intMetadataClass = InternalMetadata.new
-                  intEllipsoid = intMetadataClass.newEllipsoid
-
-                  # ellipsoid - identifier {identifier}
-                  if hEllipsoid.has_key?('ellipsoidIdentifier')
-                     unless hEllipsoid['ellipsoidIdentifier'].empty?
-                        hReturn = Identifier.unpack(hEllipsoid['ellipsoidIdentifier'], responseObj)
-                        unless hReturn.nil?
-                           intEllipsoid[:ellipsoidIdentifier] = hReturn
-                        end
-                     end
-                  end
-
-                  # ellipsoid - ellipsoid name (required)
-                  if hEllipsoid.has_key?('ellipsoidName')
-                     intEllipsoid[:ellipsoidName] = hEllipsoid['ellipsoidName']
-                  end
-                  if intEllipsoid[:ellipsoidName].nil? || intEllipsoid[:ellipsoidName] == ''
-                     responseObj[:readerExecutionMessages] << 'Ellipsoid name is missing'
-                     responseObj[:readerExecutionPass] = false
-                     return nil
-                  end
-
-                  # ellipsoid - semi-major axis
-                  if hEllipsoid.has_key?('semiMajorAxis')
-                     if hEllipsoid['semiMajorAxis'] != ''
-                        intEllipsoid[:semiMajorAxis] = hEllipsoid['semiMajorAxis']
-                     end
-                  end
-
-                  # ellipsoid - axis units
-                  if hEllipsoid.has_key?('axisUnits')
-                     if hEllipsoid['axisUnits'] != ''
-                        intEllipsoid[:axisUnits] = hEllipsoid['axisUnits']
-                     end
-                  end
-
-                  # ellipsoid - denominator of flattening ratio
-                  if hEllipsoid.has_key?('denominatorOfFlatteningRatio')
-                     if hEllipsoid['denominatorOfFlatteningRatio'] != ''
-                        intEllipsoid[:denominatorOfFlatteningRatio] = hEllipsoid['denominatorOfFlatteningRatio']
-                     end
-                  end
-
-                  return intEllipsoid
-               end
-
-            end
-
-         end
-      end
-   end
-end

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

@@ -1,68 +0,0 @@
-# HTML writer
-# spatial reference system ellipsoid parameters
-
-# History:
-#  Stan Smith 2017-10-24 original script
-
-require_relative 'html_identifier'
-
-module ADIWG
-   module Mdtranslator
-      module Writers
-         module Html
-
-            class Html_EllipsoidParameters
-
-               def initialize(html)
-                  @html = html
-               end
-
-               def writeHtml(hEllipsoid)
-
-                  # classes used
-                  identifierClass = Html_Identifier.new(@html)
-
-                  # ellipsoid parameters - ellipsoid name
-                  unless hEllipsoid[:ellipsoidName].nil?
-                     @html.em('Ellipsoid Name: ')
-                     @html.text!(hEllipsoid[:ellipsoidName])
-                     @html.br
-                  end
-
-                  # ellipsoid parameters - semi-major axis
-                  unless hEllipsoid[:semiMajorAxis].nil?
-                     @html.em('Semi-major Axis: ')
-                     @html.text!(hEllipsoid[:semiMajorAxis].to_s)
-                     @html.br
-                  end
-
-                  # ellipsoid parameters - axis units
-                  unless hEllipsoid[:axisUnits].nil?
-                     @html.em('Axis Units: ')
-                     @html.text!(hEllipsoid[:axisUnits])
-                     @html.br
-                  end
-
-                  # ellipsoid parameters - denominator of flattening ratio
-                  unless hEllipsoid[:denominatorOfFlatteningRatio].nil?
-                     @html.em('Denominator or Flattening Ratio: ')
-                     @html.text!(hEllipsoid[:denominatorOfFlatteningRatio].to_s)
-                  end
-
-                  # ellipsoid parameters - ellipsoid identifier
-                  unless hEllipsoid[:ellipsoidIdentifier].empty?
-                     @html.details do
-                        @html.summary('Ellipsoid Identifier', {'id' => 'ellipsoid-identifier', 'class' => 'h5'})
-                        @html.section(:class => 'block') do
-                           identifierClass.writeHtml(hEllipsoid[:ellipsoidIdentifier])
-                        end
-                     end
-                  end
-
-               end # writeHtml
-            end # Html_ProjectionParameters
-
-         end
-      end
-   end
-end

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

@@ -1,32 +0,0 @@
-# mdJson 2.0 writer - spatial reference system ellipsoid parameters
-
-# History:
-#   Stan Smith 2017-10-24 original script
-
-require 'jbuilder'
-require_relative 'mdJson_identifier'
-
-module ADIWG
-   module Mdtranslator
-      module Writers
-         module MdJson
-
-            module EllipsoidParameters
-
-               def self.build(hEllipsoid)
-
-                  Jbuilder.new do |json|
-                     json.ellipsoidIdentifier Identifier.build(hEllipsoid[:ellipsoidIdentifier]) unless hEllipsoid[:ellipsoidIdentifier].empty?
-                     json.ellipsoidName hEllipsoid[:ellipsoidName]
-                     json.semiMajorAxis hEllipsoid[:semiMajorAxis]
-                     json.axisUnits hEllipsoid[:axisUnits]
-                     json.denominatorOfFlatteningRatio hEllipsoid[:denominatorOfFlatteningRatio]
-                  end
-
-               end # build
-            end # EllipsoidParameters
-
-         end
-      end
-   end
-end