adiwg-mdtranslator 2.13.3 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2e846bab923dba1c4af51d308e33eb83ae5ea96
-  data.tar.gz: bbb0ab9ad5191e0dc43cf2889594d44ca31bdb08
+  metadata.gz: f6314a8f43eb42ada37a556d73c9fbd0a76d46eb
+  data.tar.gz: 34fade7d3ac05ab024a601b899e3734ec4a72d31
 SHA512:
-  metadata.gz: 76dc16abf989aba99ec3775be2e6f59344d41ec74759d7392f3309343de73443bdc61a9615c7b1933bb6605ab03b47a9a04031d2713d97f9a42e5186bba8b757
-  data.tar.gz: 99126f4e0bafae3d8118889f18216c1c70a45f3c886281fafda0a2b70086de8bf9cd4b058c8843dc44fff7e651706015fbb067f04964520105c99a4f166e78d3
+  metadata.gz: e28c20ccb05a1e42cbfea51404301f8451fb0367e024c7877714edc7bd42e3628c030936d03116b4d774c2715e820a279d1ad0e26118309fefbc65bbae80e63a
+  data.tar.gz: b49985b384314529c11c69cda56848e1087a20cba33fbb8ff240d0cbbf9f6dbe75e503358f4d5474ff6e1b036739816e45acf7c014b1d5eaa5b0f1a6086a6499

data/.travis.yml

@@ -3,9 +3,9 @@ sudo: false
 language: ruby
 before_install: 'gem install bundler'
 rvm:
-  - 2.2
-  - "2.3.3"
-  - "2.4.0"
+  - "2.3"
+  - "2.4"
+  - "2.5"
   - jruby-head
   - ruby-head
 matrix:

data/CHANGELOG.md

@@ -1,12 +1,19 @@
 # Change Log
 
-## [v2.13.3](https://github.com/adiwg/mdTranslator/tree/v2.13.3)
+## [v2.14.0](https://github.com/adiwg/mdTranslator/tree/v2.14.0)
 
-[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.13.2...v2.13.3)
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.13.3...v2.14.0)
 
-**Fixed bugs:**
+**Closed issues:**
+
+- Breaking change in timeInterval [\#199](https://github.com/adiwg/mdTranslator/issues/199)
 
-- sbJSON contacts inherited from associated records [\#202](https://github.com/adiwg/mdTranslator/issues/202)
+**Merged pull requests:**
+
+- Change error message text in ISO 19115-2 writer [\#204](https://github.com/adiwg/mdTranslator/pull/204) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.13.3](https://github.com/adiwg/mdTranslator/tree/v2.13.3) (2018-09-06)
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.13.2...v2.13.3)
 
 **Closed issues:**
 

data/Rakefile

@@ -5,15 +5,15 @@ require 'rake/testtask'
 Rake::TestTask.new do |t|
    t.libs << 'test'
    t.test_files = FileList[
+      'test/readers/fgdc/tc*.rb',
       'test/readers/mdJson/tc*.rb',
       'test/readers/sbJson/tc*.rb',
-      'test/readers/fgdc/tc*.rb',
-      'test/writers/iso19115-2/tc*.rb',
+      'test/writers/fgdc/tc*.rb',
+      'test/writers/html/tc*.rb',
       'test/writers/iso19110/tc*.rb',
+      'test/writers/iso19115-2/tc*.rb',
       'test/writers/mdJson/tc*.rb',
       'test/writers/sbJson/tc*.rb',
-      'test/writers/html/tc*.rb',
-      'test/writers/fgdc/tc*.rb',
       'test/translator/tc*.rb'
    ]
    t.verbose = true
@@ -22,13 +22,13 @@ end
 desc 'Run tests'
 task :default => :test
 
-# 'test/readers/mdJson/tc*.rb'
-# 'test/readers/sbJson/tc*.rb',
-# 'test/readers/fgdc/tc*.rb',
-# 'test/writers/iso19115-2/tc*.rb',
-# 'test/writers/iso19110/tc*.rb',
-# 'test/writers/mdJson/tc*.rb',
-# 'test/writers/sbJson/tc*.rb',
-# 'test/writers/html/tc*.rb',
-# 'test/writers/fgdc/tc*.rb',
-# 'test/translator/tc*.rb'
+   # 'test/readers/fgdc/tc*.rb',
+   # 'test/readers/mdJson/tc*.rb',
+   # 'test/readers/sbJson/tc*.rb',
+   # 'test/writers/fgdc/tc*.rb',
+   # 'test/writers/html/tc*.rb',
+   # 'test/writers/iso19110/tc*.rb',
+   # 'test/writers/iso19115-2/tc*.rb',
+   # 'test/writers/mdJson/tc*.rb',
+   # 'test/writers/sbJson/tc*.rb',
+   # 'test/translator/tc*.rb'

data/adiwg-mdtranslator.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
    spec.test_files = spec.files.grep(%r{^(tc|test|spec|features)/})
    spec.require_paths = ["lib"]
 
-   spec.required_ruby_version = '>= 2.2'
+   spec.required_ruby_version = '>= 2.3'
 
    spec.add_development_dependency "bundler", "~> 1"
    spec.add_development_dependency "rake", "~> 10"
@@ -33,8 +33,8 @@ 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.4.9"
-   spec.add_runtime_dependency "adiwg-mdcodes", "~> 2.6.3"
+   spec.add_runtime_dependency "adiwg-mdjson_schemas", ">= 2.6"
+   spec.add_runtime_dependency "adiwg-mdcodes", "~> 2.7"
    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

@@ -2,6 +2,8 @@
 
 # History:
 # version 2
+#  Stan Smith 2018-10-02 modified referenceSystemParameterSet
+#  Stan Smith 2018-10-02 added local reference system
 #  Stan Smith 2017-09-28 add altitude to bounding box for fgdc
 #  Stan Smith 2017-09-28 add description to geographicExtent for fgdc
 #  Stan Smith 2017-04-22 removed 'intObj = ' from new object definitions
@@ -848,11 +850,8 @@ class InternalMetadata
    def newProjection
       {
          projectionIdentifier: {},
-         gridSystem: nil,
-         gridSystemName: nil,
+         gridIdentifier: {},
          gridZone: nil,
-         projection: nil,
-         projectionName: nil,
          standardParallel1: nil,
          standardParallel2: nil,
          longitudeOfCentralMeridian: nil,
@@ -873,26 +872,21 @@ class InternalMetadata
          obliqueLinePoints: [],
          landsatNumber: nil,
          landsatPath: nil,
-         localPlanarDescription: nil,
-         localPlanarGeoreference: nil,
-         otherGridDescription: nil,
-         otherProjectionDescription: nil
+         local: {}
       }
    end
 
    def newObliqueLinePoint
       {
-         azimuthLineLatitude: nil,
-         azimuthLineLongitude: nil
+         obliqueLineLatitude: nil,
+         obliqueLineLongitude: nil
       }
    end
 
    def newGeodetic
       {
          datumIdentifier: {},
-         datumName: nil,
          ellipsoidIdentifier: {},
-         ellipsoidName: nil,
          semiMajorAxis: nil,
          axisUnits: nil,
          denominatorOfFlatteningRatio: nil
@@ -902,13 +896,19 @@ class InternalMetadata
    def newVerticalDatum
       {
          datumIdentifier: {},
-         datumName: nil,
          isDepthSystem: false,
          encodingMethod: nil,
          verticalResolution: nil,
          unitOfMeasure: nil
       }
+   end
 
+   def newLocal
+      {
+         description: nil,
+         georeference: nil,
+         fixedToEarth: true
+      }
    end
 
 
@@ -1038,7 +1038,7 @@ class InternalMetadata
          idProcedure: nil,
          idCompleteness: nil,
          vouchers: [],
-         taxonClass: {}
+         taxonClasses: []
       }
    end
 

data/lib/adiwg/mdtranslator/readers/fgdc/modules/gridSystems/grid_equalArcSecond.rb

@@ -0,0 +1,69 @@
+# Reader - fgdc to internal data structure
+# unpack fgdc map grid coordinate system
+
+# History:
+#  Stan Smith 2018-10-04 original script
+
+require 'nokogiri'
+require_relative '../mapProjections/projection_equirectangular'
+require_relative '../mapProjections/projection_azimuthEquidistant'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module Fgdc
+
+            module MapGridEqualArcSecond
+
+               def self.unpack(xArc, hProjection, hResponseObj)
+
+                  # grid system 4.1.2.2.5 (arcsys) - equal arc-second coordinate system
+
+                  hGridSystemId = hProjection[:gridIdentifier]
+                  hProjectionId = hProjection[:projectionIdentifier]
+
+                  hGridSystemId[:identifier] = 'arcsys'
+                  hGridSystemId[:name] = 'Equal Arc-Second Coordinate System' if hGridSystemId[:name].nil?
+
+                  # grid system 4.1.2.2.5.1 (arcszone) - state plane zone number {1..18} (required)
+                  # -> ReferenceSystemParameters.projection.gridZone
+                  zone = xArc.xpath('./arczone').text
+                  unless zone.empty?
+                     hProjection[:gridZone] = zone
+                  end
+                  if zone.empty?
+                     hResponseObj[:readerExecutionMessages] <<
+                        'WARNING: FGDC reader: equal arc-second zone number is missing'
+                  end
+
+                  # + [ equirectangular | azimuthal equidistant ] (required)
+                  # + equirectangular
+                  xEquiR = xArc.xpath('./equirect')
+                  unless xEquiR.empty?
+                     hProjectionId[:identifier] = 'equirectangular'
+                     hProjectionId[:name] = 'Equirectangular'
+                     return EquirectangularProjection.unpack(xEquiR, hProjection, hResponseObj)
+                  end
+
+                  # + azimuthal equidistant
+                  xAzimuthE = xArc.xpath('./azimequi')
+                  unless xAzimuthE.empty?
+                     hProjectionId[:identifier] = 'azimuthalEquidistant'
+                     hProjectionId[:name] = 'Azimuthal Equidistant'
+                     return AzimuthEquidistantProjection.unpack(xAzimuthE, hProjection, hResponseObj)
+                  end
+
+                  # error message
+                  hResponseObj[:readerExecutionMessages] <<
+                     'WARNING: FGDC reader: UPS equal arc-second projection definition is missing'
+
+                  return hProjection
+
+               end
+
+            end
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/readers/fgdc/modules/gridSystems/grid_other.rb

@@ -0,0 +1,42 @@
+# Reader - fgdc to internal data structure
+# unpack fgdc map grid coordinate system
+
+# History:
+#  Stan Smith 2018-10-04 original script
+
+require 'nokogiri'
+require_relative '../mapProjections/projection_transverseMercator'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module Fgdc
+
+            module MapGridOther
+
+               def self.unpack(other, hProjection)
+
+                  # grid system 4.1.2.2.6 (othergrd) - other coordinate system {text}
+                  # -> ReferenceSystemParameters.projection.gridIdentifier.description
+
+                  hProjectionId = hProjection[:projectionIdentifier]
+                  hGridSystemId = hProjection[:gridIdentifier]
+
+                  hGridSystemId[:identifier] = 'other'
+                  hGridSystemId[:name] = 'Other Grid Coordinate System' if hGridSystemId[:name].nil?
+                  hGridSystemId[:description] = other
+
+                  hProjectionId[:identifier] = 'other'
+                  hProjectionId[:name] = 'Other Projection'
+                  hProjectionId[:description] = 'for description see grid system description'
+
+                  return hProjection
+
+               end
+
+            end
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/readers/fgdc/modules/gridSystems/grid_statePlane.rb

@@ -0,0 +1,87 @@
+# Reader - fgdc to internal data structure
+# unpack fgdc map grid coordinate system
+
+# History:
+#  Stan Smith 2018-10-04 original script
+
+require 'nokogiri'
+require_relative '../mapProjections/projection_transverseMercator'
+require_relative '../mapProjections/projection_lambertConic'
+require_relative '../mapProjections/projection_obliqueMercator'
+require_relative '../mapProjections/projection_polyconic'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module Fgdc
+
+            module MapGridStatePlane
+
+               def self.unpack(xStateP, hProjection, hResponseObj)
+
+                  # grid system 4.1.2.2.4 (spcs) - state plane coordinate system
+
+                  hGridSystemId = hProjection[:gridIdentifier]
+                  hProjectionId = hProjection[:projectionIdentifier]
+
+                  hGridSystemId[:identifier] = 'spcs'
+                  hGridSystemId[:name] = 'State Plane Coordinate System' if hGridSystemId[:name].nil?
+
+                  # grid system 4.1.2.2.4.1 (spcszone) - state plane zone number {nnnn} (required)
+                  # -> ReferenceSystemParameters.projection.gridZone
+                  zone = xStateP.xpath('./spcszone').text
+                  unless zone.empty?
+                     hProjection[:gridZone] = zone
+                  end
+                  if zone.empty?
+                     hResponseObj[:readerExecutionMessages] <<
+                        'WARNING: FGDC reader: state plane zone number is missing'
+                  end
+
+                  # + [ lambert conformal conic | transverse mercator | oblique mercator | polyconic ] (required)
+                  # + lambert conformal conic
+                  xLambert = xStateP.xpath('./lambertc')
+                  unless xLambert.empty?
+                     hProjectionId[:identifier] = 'lambertConic'
+                     hProjectionId[:name] = 'Lambert Conformal Conic'
+                     return LambertConicProjection.unpack(xLambert, hProjection, hResponseObj)
+                  end
+
+                  # + transverse mercator
+                  xTransMer = xStateP.xpath('./transmer')
+                  unless xTransMer.empty?
+                     hProjectionId[:identifier] = 'transverseMercator'
+                     hProjectionId[:name] = 'Transverse Mercator'
+                     return TransverseMercatorProjection.unpack(xTransMer, hProjection, hResponseObj)
+                  end
+
+                  # + oblique mercator
+                  xObliqueM = xStateP.xpath('./obqmerc')
+                  unless xObliqueM.empty?
+                     hProjectionId[:identifier] = 'obliqueMercator'
+                     hProjectionId[:name] = 'Oblique Mercator'
+                     return ObliqueMercatorProjection.unpack(xObliqueM, hProjection, hResponseObj)
+                  end
+
+                  # + polyconic
+                  xPolyCon = xStateP.xpath('./polycon')
+                  unless xPolyCon.empty?
+                     hProjectionId[:identifier] = 'polyconic'
+                     hProjectionId[:name] = 'Polyconic'
+                     return PolyconicProjection.unpack(xPolyCon, hProjection, hResponseObj)
+                  end
+
+                  # error message
+                  hResponseObj[:readerExecutionMessages] <<
+                     'WARNING: FGDC reader: UPS state plane projection definition is missing'
+
+                  return hProjection
+
+               end
+
+            end
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/readers/fgdc/modules/gridSystems/grid_ups.rb

@@ -0,0 +1,58 @@
+# Reader - fgdc to internal data structure
+# unpack fgdc map grid coordinate system
+
+# History:
+#  Stan Smith 2018-10-04 original script
+
+require 'nokogiri'
+require_relative '../mapProjections/projection_polarStereo'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module Fgdc
+
+            module MapGridUps
+
+               def self.unpack(xUPS, hProjection, hResponseObj)
+
+                  # grid system 4.1.2.2.3 (ups) - universal polar stereographic
+
+                  hGridSystemId = hProjection[:gridIdentifier]
+                  hProjectionId = hProjection[:projectionIdentifier]
+
+                  hGridSystemId[:identifier] = 'ups'
+                  hGridSystemId[:name] = 'Universal Polar Stereographic' if hGridSystemId[:name].nil?
+
+                  # grid system 4.1.2.2.3.1 (upszone) - utm zone number {-60..-1, 1..60} (required)
+                  # -> ReferenceSystemParameters.projection.gridZone
+                  zone = xUPS.xpath('./upszone').text
+                  unless zone.empty?
+                     hProjection[:gridZone] = zone
+                  end
+                  if zone.empty?
+                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: UPS zone number is missing'
+                  end
+
+                  # + polar stereographic (required)
+                  xPolarS = xUPS.xpath('./polarst')
+                  unless xPolarS.empty?
+                     hProjectionId[:identifier] = 'polarStereo'
+                     hProjectionId[:name] = 'Polar Stereographic'
+                     return PolarStereoProjection.unpack(xPolarS, hProjection, hResponseObj)
+                  end
+
+                  # error message
+                  hResponseObj[:readerExecutionMessages] <<
+                     'WARNING: FGDC reader: UPS polar stereographic definition is missing'
+
+                  return hProjection
+
+               end
+
+            end
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/readers/fgdc/modules/gridSystems/grid_utm.rb

@@ -0,0 +1,58 @@
+# Reader - fgdc to internal data structure
+# unpack fgdc map grid coordinate system
+
+# History:
+#  Stan Smith 2018-10-04 original script
+
+require 'nokogiri'
+require_relative '../mapProjections/projection_transverseMercator'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module Fgdc
+
+            module MapGridUtm
+
+               def self.unpack(xUTM, hProjection, hResponseObj)
+
+                  # grid system 4.1.2.2.2 (utm) - universal transverse mercator
+
+                  hGridSystemId = hProjection[:gridIdentifier]
+                  hProjectionId = hProjection[:projectionIdentifier]
+
+                  hGridSystemId[:identifier] = 'utm'
+                  hGridSystemId[:name] = 'Universal Transverse Mercator' if hGridSystemId[:name].nil?
+
+                  # grid system 4.1.2.2.2.1 (utmzone) - utm zone number {-60..-1, 1..60} (required)
+                  # -> ReferenceSystemParameters.projection.gridZone
+                  zone = xUTM.xpath('./utmzone').text
+                  unless zone.empty?
+                     hProjection[:gridZone] = zone
+                  end
+                  if zone.empty?
+                     hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: UTM zone number is missing'
+                  end
+
+                  # + transverse mercator (required)
+                  xTransMer = xUTM.xpath('./transmer')
+                  unless xTransMer.empty?
+                     hProjectionId[:identifier] = 'transverseMercator'
+                     hProjectionId[:name] = 'Transverse Mercator'
+                     return TransverseMercatorProjection.unpack(xTransMer, hProjection, hResponseObj)
+                  end
+
+                  # error message
+                  hResponseObj[:readerExecutionMessages] <<
+                     'WARNING: FGDC reader: UTM transverse mercator definition is missing'
+
+                  return hProjection
+
+               end
+
+            end
+
+         end
+      end
+   end
+end

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

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - albers
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-04 original script
 
 require 'nokogiri'
@@ -20,28 +21,27 @@ module ADIWG
                   # map projection 4.1.2.1.2 (albers) - Albers Conical Equal Area
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'albers'
-                     hProjection[:projectionName] = 'Albers Conical Equal Area'
 
                      # -> ReferenceSystemParameters.projection.standardParallel1
                      # -> ReferenceSystemParameters.projection.standardParallel2
-                     paramCount += ProjectionCommon.unpackStandParallel(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackStandParallel(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.longitudeOfCentralMeridian
-                     paramCount += ProjectionCommon.unpackLongCM(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackLongCM(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.latitudeOfProjectionOrigin
-                     paramCount += ProjectionCommon.unpackLatPO(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackLatPO(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.falseEasting
                      # -> ReferenceSystemParameters.projection.falseNorthing
-                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection)
 
                      # verify parameter count
                      if paramCount == 6
                         return hProjection
                      else
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: Albers projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: Albers projection is missing one or more parameters'
                      end
                   end
 

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

@@ -2,6 +2,7 @@
 # unpack fgdc map projection - azimuth equidistant
 
 # History:
+#  Stan Smith 2018-10-03 refactor mdJson projection object
 #  Stan Smith 2017-10-16 original script
 
 require 'nokogiri'
@@ -20,24 +21,23 @@ module ADIWG
                   # map projection 4.1.2.1.3 (azimequi) - Azimuthal Equidistant
                   unless xParams.empty?
                      paramCount = 0
-                     hProjection[:projection] = 'azimuthalEquidistant'
-                     hProjection[:projectionName] = 'Azimuthal Equidistant'
 
                      # -> ReferenceSystemParameters.projection.longitudeOfCentralMeridian
-                     paramCount += ProjectionCommon.unpackLongCM(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackLongCM(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.latitudeOfProjectionOrigin
-                     paramCount += ProjectionCommon.unpackLatPO(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackLatPO(xParams, hProjection)
 
                      # -> ReferenceSystemParameters.projection.falseEasting
                      # -> ReferenceSystemParameters.projection.falseNorthing
-                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection, hResponseObj)
+                     paramCount += ProjectionCommon.unpackFalseNE(xParams, hProjection)
 
                      # verify parameter count
                      if paramCount == 4
                         return hProjection
                      else
-                        hResponseObj[:readerExecutionMessages] << 'WARNING: FGDC reader: Azimuth Equidistant projection is missing one or more parameters'
+                        hResponseObj[:readerExecutionMessages] <<
+                           'WARNING: FGDC reader: Azimuth Equidistant projection is missing one or more parameters'
                      end
                   end