adiwg-mdtranslator 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f63c2f64b279e4dbd888fe4af191291d692440e9
-  data.tar.gz: 37fdda4ca201df46a93d611d8ef3d639cfc684d2
+  metadata.gz: b8967380488c638b7c04f98f0fd3d51d68bccf9a
+  data.tar.gz: 695fbc3cff2ddf09eda1fabcba0478c035d5a990
 SHA512:
-  metadata.gz: 9bb5674e9a1e307c07826358dcde39452219c9b415e2cb8b4c4873340863b8802f10d38c29964cf9dc77ae90f0dce3457b2769fba833e85a958743fc00b477e1
-  data.tar.gz: 90e071925c75844fe2203b6177ffc752e91bae66e4f35502c47a4908d8e2a1eefeff68023f49a67153f7cbc52d858c5f92f8c2704618739845e6ae0eed4857d8
+  metadata.gz: 25f1962901b59cd7c317ab6d1c70d88362fa8a1018a98ff55fcc9311d243b8152132f2779f38c8ed7ac32de3f40a14c0eb612942f1adb7a65a4dca5042cfa26a
+  data.tar.gz: fc110571208fd0f094ddb53a31a42b204a6d655dfa1bf7a603a6f267022f62bea71b9269734b7c3eac190cbe348577ee25d2a0514b4552bb930340f50680626f

data/CHANGELOG.md

@@ -1,7 +1,24 @@
 # Change Log
 
-## [v2.7.0](https://github.com/adiwg/mdTranslator/tree/v2.7.0)
+## [v2.8.0](https://github.com/adiwg/mdTranslator/tree/v2.8.0)
 
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.7.0...v2.8.0)
+
+**Implemented enhancements:**
+
+- Add resource citation title to HTML heading [\#172](https://github.com/adiwg/mdTranslator/issues/172)
+
+**Fixed bugs:**
+
+- FGDC writer outputs time in ISO format [\#176](https://github.com/adiwg/mdTranslator/issues/176)
+- FGDC writer time-currentness tag is in wrong location [\#173](https://github.com/adiwg/mdTranslator/issues/173)
+- ISO Topic Category keywords not translated [\#171](https://github.com/adiwg/mdTranslator/issues/171)
+
+**Merged pull requests:**
+
+- Add spatial resolution section and various patches to FGDC writer beta release [\#179](https://github.com/adiwg/mdTranslator/pull/179) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.7.0](https://github.com/adiwg/mdTranslator/tree/v2.7.0) (2017-12-29)
 [Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.6.1...v2.7.0)
 
 **Merged pull requests:**

data/adiwg-mdtranslator.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
    spec.add_runtime_dependency "uuidtools", "~> 2.1"
    spec.add_runtime_dependency "json-schema", "~> 2.7"
    spec.add_runtime_dependency "adiwg-mdjson_schemas", ">= 2.4.1"
-   spec.add_runtime_dependency "adiwg-mdcodes", "~> 2.3.2"
+   spec.add_runtime_dependency "adiwg-mdcodes", "~> 2.4.0"
    spec.add_runtime_dependency "jbuilder", "~> 2.5"
    spec.add_runtime_dependency "kramdown", "~> 1.13"
    spec.add_runtime_dependency "coderay", "~> 1.1"

data/lib/adiwg/mdtranslator/internal/internal_metadata_obj.rb

@@ -256,7 +256,6 @@ class InternalMetadata
          credits: [],
          timePeriod: {},
          status: [],
-         topicCategories: [],
          pointOfContacts: [],
          spatialReferenceSystems: [],
          spatialRepresentationTypes: [],
@@ -814,6 +813,7 @@ class InternalMetadata
       {
          systemType: nil,
          systemIdentifier: {},
+         systemWKT: nil,
          systemParameterSet: {}
       }
    end
@@ -821,7 +821,7 @@ class InternalMetadata
    def newReferenceSystemParameterSet
       {
          projection: {},
-         ellipsoid: {},
+         geodetic: {},
          verticalDatum: {}
       }
    end
@@ -829,8 +829,11 @@ class InternalMetadata
    def newProjection
       {
          projectionIdentifier: {},
+         gridSystem: nil,
+         gridSystemName: nil,
+         gridZone: nil,
+         projection: nil,
          projectionName: nil,
-         zone: nil,
          standardParallel1: nil,
          standardParallel2: nil,
          longitudeOfCentralMeridian: nil,
@@ -853,8 +856,8 @@ class InternalMetadata
          landsatPath: nil,
          localPlanarDescription: nil,
          localPlanarGeoreference: nil,
-         otherProjectionDescription: nil,
-         otherGridDescription: nil
+         otherGridDescription: nil,
+         otherProjectionDescription: nil
       }
    end
 
@@ -865,8 +868,10 @@ class InternalMetadata
       }
    end
 
-   def newEllipsoid
+   def newGeodetic
       {
+         datumIdentifier: {},
+         datumName: nil,
          ellipsoidIdentifier: {},
          ellipsoidName: nil,
          semiMajorAxis: nil,
@@ -924,6 +929,7 @@ class InternalMetadata
    def newVerticalDatum
       {
          datumIdentifier: {},
+         datumName: nil,
          isDepthSystem: false,
          encodingMethod: nil,
          verticalResolution: nil,

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_albers.rb

@@ -20,7 +20,8 @@ module ADIWG
                   # map projection 4.1.2.1.2 (albers) - Albers Conical Equal Area
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'albers'
+                     hProjection[:projection] = 'albers'
+                     hProjection[:projectionName] = 'Albers Conical Equal Area'
 
                      # -> ReferenceSystemParameters.projection.standardParallel1
                      # -> ReferenceSystemParameters.projection.standardParallel2

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_azimuthEquidistant.rb

@@ -20,7 +20,8 @@ module ADIWG
                   # map projection 4.1.2.1.3 (azimequi) - Azimuthal Equidistant
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'azimuthal equidistant'
+                     hProjection[:projection] = 'azimuthalEquidistant'
+                     hProjection[:projectionName] = 'Azimuthal Equidistant'
 
                      # -> ReferenceSystemParameters.projection.longitudeOfCentralMeridian
                      paramCount += ProjectionCommon.unpackLongCM(xParams, hProjection, hResponseObj)

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_common.rb

@@ -149,12 +149,12 @@ module ADIWG
                   xObliqueLA = xParams.xpath('./obqlazim')
                   unless xObliqueLA.empty?
                      paramCount = 0
-                     lineAzimuth = xObliqueLA.xpath('./asimangl').text
+                     lineAzimuth = xObliqueLA.xpath('./azimangl').text
                      unless lineAzimuth.empty?
                         hProjection[:azimuthAngle] = lineAzimuth.to_f
                         paramCount += 1
                      end
-                     lineLong = xObliqueLA.xpath('./asimptl').text
+                     lineLong = xObliqueLA.xpath('./azimptl').text
                      unless lineLong.empty?
                         hProjection[:azimuthMeasurePointLongitude] = lineLong.to_f
                         paramCount += 1

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_equidistantConic.rb

@@ -19,7 +19,8 @@ module ADIWG
                   # map projection 4.1.2.1.4 (equicon) - Equidistant Conic
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'equidistant conic'
+                     hProjection[:projection] = 'equidistantConic'
+                     hProjection[:projectionName] = 'Equidistant Conic'
 
                      # -> ReferenceSystemParameters.projection.standardParallel1
                      # -> ReferenceSystemParameters.projection.standardParallel2

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_equirectangular.rb

@@ -19,7 +19,8 @@ module ADIWG
                   # map projection 4.1.2.1.5 (equirect) - Equirectangular
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'equirectangular'
+                     hProjection[:projection] = 'equirectangular'
+                     hProjection[:projectionName] = 'Equirectangular'
 
                      # -> ReferenceSystemParameters.projection.standardParallel1
                      paramCount += ProjectionCommon.unpackStandParallel(xParams, hProjection, hResponseObj)

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_generalVertical.rb

@@ -20,7 +20,8 @@ module ADIWG
                   # map projection 4.1.2.1.6 (gvnsp) - General Vertical Near-sided Perspective
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'general vertical near-side perspective'
+                     hProjection[:projection] = 'generalVertical'
+                     hProjection[:projectionName] = 'General Vertical Near-sided Perspective'
 
                      # -> ReferenceSystemParameters.projection.heightOfProspectivePointAboveSurface
                      paramCount += ProjectionCommon.unpackHeightAS(xParams, hProjection, hResponseObj)

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_gnomonic.rb

@@ -20,7 +20,8 @@ module ADIWG
                   # map projection 4.1.2.1.7 (gnomonic) - Gnomonic
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'gnomonic'
+                     hProjection[:projection] = 'gnomonic'
+                     hProjection[:projectionName] = 'Gnomonic'
 
                      # -> ReferenceSystemParameters.projection.longitudeOfProjectionCenter
                      paramCount += ProjectionCommon.unpackLongPC(xParams, hProjection, hResponseObj)

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_lambertConic.rb

@@ -20,7 +20,8 @@ module ADIWG
                   # map projection 4.1.2.1.9 (lambertc) - Lambert Conformal Conic
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'lambert conformal conic'
+                     hProjection[:projection] = 'lambertConic'
+                     hProjection[:projectionName] = 'Lambert Conformal Conic'
 
                      # -> ReferenceSystemParameters.projection.standardParallel1
                      # -> ReferenceSystemParameters.projection.standardParallel2

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_lambertEqualArea.rb

@@ -20,7 +20,8 @@ module ADIWG
                   # map projection 4.1.2.1.8 (lamberta) - Lambert Azimuthal Equal Area
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'lambert azimuthal equal area'
+                     hProjection[:projection] = 'lambertEqualArea'
+                     hProjection[:projectionName] = 'Lambert Azimuthal Equal Area'
 
                      # -> ReferenceSystemParameters.projection.longitudeOfProjectionCenter
                      paramCount += ProjectionCommon.unpackLongPC(xParams, hProjection, hResponseObj)

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_mercator.rb

@@ -21,7 +21,8 @@ module ADIWG
                   # -> ReferenceSystemParameters.projection.[ standardParallel1 | scaleFactorAtEquator ]
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'mercator'
+                     hProjection[:projection] = 'mercator'
+                     hProjection[:projectionName] = 'Mercator'
 
                      # -> ReferenceSystemParameters.projection.standardParallel1
                      # -> ReferenceSystemParameters.projection.standardParallel2

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_millerCylinder.rb

@@ -20,7 +20,8 @@ module ADIWG
                   # map projection 4.1.2.1.12 (miller) - Miller Cylindrical
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'miller cylindrical'
+                     hProjection[:projection] = 'miller'
+                     hProjection[:projectionName] = 'Miller Cylindrical'
 
                      # -> ReferenceSystemParameters.projection.longitudeOfCentralMeridian
                      paramCount += ProjectionCommon.unpackLongCM(xParams, hProjection, hResponseObj)

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_modifiedAlaska.rb

@@ -20,7 +20,8 @@ module ADIWG
                   # map projection 4.1.2.1.11 (modsak) - Modified Stereographic for Alaska
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'alaska modified stereographic'
+                     hProjection[:projection] = 'alaska'
+                     hProjection[:projectionName] = 'Modified Stereographic for Alaska'
 
                      # -> ReferenceSystemParameters.projection.falseEasting
                      # -> ReferenceSystemParameters.projection.falseNorthing

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_obliqueMercator.rb

@@ -20,7 +20,8 @@ module ADIWG
                   # map projection 4.1.2.1.13 (obqmerc) - Oblique Mercator
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'oblique mercator'
+                     hProjection[:projection] = 'obliqueMercator'
+                     hProjection[:projectionName] = 'Oblique Mercator'
 
                      # -> ReferenceSystemParameters.projection.scaleFactorAtCenterLine
                      paramCount += ProjectionCommon.unpackSFCenter(xParams, hProjection, hResponseObj)

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_orthographic.rb

@@ -20,7 +20,8 @@ module ADIWG
                   # map projection 4.1.2.1.14 (orthogr) - Orthographic
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'orthographic'
+                     hProjection[:projection] = 'orthographic'
+                     hProjection[:projectionName] = 'Orthographic'
 
                      # -> ReferenceSystemParameters.projection.longitudeOfProjectionCenter
                      paramCount += ProjectionCommon.unpackLongPC(xParams, hProjection, hResponseObj)

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_parameters.rb

@@ -18,7 +18,8 @@ module ADIWG
 
                   # map projection 4.1.2.1.23 (mapprojp) - projection parameter set
                   unless xParams.empty?
-                     hProjection[:projectionName] = 'projection parameters'
+                     hProjection[:projection] = 'parameters'
+                     hProjection[:projectionName] = 'Projection Parameter Set'
 
                      # -> ReferenceSystemParameters.projection.standardParallel1
                      # -> ReferenceSystemParameters.projection.standardParallel2

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_polarStereo.rb

@@ -20,7 +20,8 @@ module ADIWG
                   # map projection 4.1.2.1.15 (polarst) - Polar Stereographic
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'polar stereographic'
+                     hProjection[:projection] = 'polarStereo'
+                     hProjection[:projectionName] = 'Polar Stereographic'
 
                      # -> ReferenceSystemParameters.projection.straightVerticalLongitudeFromPole
                      paramCount += ProjectionCommon.unpackVSLong(xParams, hProjection, hResponseObj)

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_polyconic.rb

@@ -20,7 +20,8 @@ module ADIWG
                   # map projection 4.1.2.1.16 (polycon) - Polyconic
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'polyconic'
+                     hProjection[:projection] = 'polyconic'
+                     hProjection[:projectionName] = 'Polyconic'
 
                      # -> ReferenceSystemParameters.projection.longitudeOfCentralMeridian
                      paramCount += ProjectionCommon.unpackLongCM(xParams, hProjection, hResponseObj)

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_robinson.rb

@@ -20,7 +20,8 @@ module ADIWG
                   # map projection 4.1.2.1.17 (robinson) - Robinson
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'robinson'
+                     hProjection[:projection] = 'robinson'
+                     hProjection[:projectionName] = 'Robinson'
 
                      # -> ReferenceSystemParameters.projection.longitudeOfProjectionCenter
                      paramCount += ProjectionCommon.unpackLongPC(xParams, hProjection, hResponseObj)

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_sinusoidal.rb

@@ -20,7 +20,8 @@ module ADIWG
                   # map projection 4.1.2.1.18 (sinusoid) - Sinusoidal
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'sinusoidal'
+                     hProjection[:projection] = 'sinusoidal'
+                     hProjection[:projectionName] = 'Sinusoidal'
 
                      # -> ReferenceSystemParameters.projection.longitudeOfCentralMeridian
                      paramCount += ProjectionCommon.unpackLongCM(xParams, hProjection, hResponseObj)

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_spaceOblique.rb

@@ -20,7 +20,8 @@ module ADIWG
                   # map projection 4.1.2.1.19 (spaceobq) - Space Oblique Mercator (Landsat)
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'space oblique'
+                     hProjection[:projection] = 'spaceOblique'
+                     hProjection[:projectionName] = 'Space Oblique Mercator (Landsat)'
 
                      # -> ReferenceSystemParameters.projection.landsatNumber
                      paramCount += ProjectionCommon.unpackLandSat(xParams, hProjection, hResponseObj)

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_stereographic.rb

@@ -20,7 +20,8 @@ module ADIWG
                   # map projection 4.1.2.1.20 (stereo) - Stereographic
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'stereographic'
+                     hProjection[:projection] = 'stereographic'
+                     hProjection[:projectionName] = 'Stereographic'
 
                      # -> ReferenceSystemParameters.projection.longitudeOfProjectionCenter
                      paramCount += ProjectionCommon.unpackLongPC(xParams, hProjection, hResponseObj)

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_transverseMercator.rb

@@ -19,7 +19,8 @@ module ADIWG
                   # map projection 4.1.2.1.21 (transmer) - Transverse Mercator
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'transverse mercator'
+                     hProjection[:projection] = 'transverseMercator'
+                     hProjection[:projectionName] = 'Transverse Mercator'
 
                      # -> ReferenceSystemParameters.projection.scaleFactorAtCentralMeridian
                      paramCount += ProjectionCommon.unpackSFCM(xParams, hProjection, hResponseObj)

data/lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_vanDerGrinten.rb

@@ -19,7 +19,8 @@ module ADIWG
                   # map projection 4.1.2.1.22 (vdgrin) - van der Grinten
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projectionName] = 'van der grinten'
+                     hProjection[:projection] = 'grinten'
+                     hProjection[:projectionName] = 'van der Grinten'
 
                      # -> ReferenceSystemParameters.projection.longitudeOfCentralMeridian
                      paramCount += ProjectionCommon.unpackLongCM(xParams, hProjection, hResponseObj)

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

@@ -0,0 +1,82 @@
+# Reader - fgdc to internal data structure
+# unpack fgdc horizontal data geodetic reference
+
+# History:
+#  Stan Smith 2017-12-29 original script
+
+require 'nokogiri'
+require 'adiwg/mdtranslator/internal/internal_metadata_obj'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module Fgdc
+
+            module GeodeticReference
+
+               def self.unpack(xHorizontalRef)
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+
+                  hGeodetic = intMetadataClass.newGeodetic
+                  xGeodetic = xHorizontalRef.xpath('./geodetic')
+
+                  # geodetic model 4.1.4.1 (horizdn) - horizontal datum name
+                  # -> referenceSystemParameters.geodetic.datumName
+                  datumName = xGeodetic.xpath('./horizdn').text
+                  unless datumName.empty?
+                     hGeodetic[:datumName] = datumName
+                  end
+
+                  # geodetic model 4.1.4.2 (ellips) - ellipsoid name
+                  # -> referenceSystemParameters.geodetic.ellipsoidName
+                  ellipsoidName = xGeodetic.xpath('./ellips').text
+                  unless ellipsoidName.empty?
+                     hGeodetic[:ellipsoidName] = ellipsoidName
+                  end
+
+                  # geodetic model 4.1.4.3 (semiaxis) - semi-major axis
+                  # -> referenceSystemParameters.geodetic.semiMajorAxis
+                  semiAxis = xGeodetic.xpath('./semiaxis').text
+                  unless semiAxis.empty?
+                     hGeodetic[:semiMajorAxis] = semiAxis.to_f
+                  end
+
+                  # geodetic model 4.1.2.4.4 (plandu) - distance units
+                  # take value from the first 'planar' section with 'plandu' specified
+                  axPlanar = xHorizontalRef.xpath('./planar')
+                  unless axPlanar.empty?
+                     axPlanar.each do |xPlanar|
+                        xPlanCI = xPlanar.xpath('./planci')
+                        unless xPlanCI.empty?
+                           units = xPlanCI.xpath('./plandu').text
+                           unless units.empty?
+                              hGeodetic[:axisUnits] = units
+                           end
+                        end
+                     end
+                  end
+
+                  # geodetic model 4.1.4.4 (denflat) - denominator of flattening ratio
+                  # -> referenceSystemParameters.geodetic.denominatorOfFlatteningRatio
+                  flattening = xGeodetic.xpath('./denflat').text
+                  unless flattening.empty?
+                     hGeodetic[:denominatorOfFlatteningRatio] = flattening.to_f
+                  end
+
+                  hReferenceSystem = intMetadataClass.newSpatialReferenceSystem
+                  hSystemParameters = intMetadataClass.newReferenceSystemParameterSet
+                  hSystemParameters[:geodetic] = hGeodetic
+                  hReferenceSystem[:systemParameterSet] = hSystemParameters
+
+                  return hReferenceSystem
+
+               end
+
+            end
+
+         end
+      end
+   end
+end