adiwg-mdtranslator 2.14.2 → 2.15.0

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

@@ -1,10 +1,10 @@
-# ISO <<Class>> CI_Series
+# ISO <<Class>> MD_GridSpatialRepresentation
 # 19115-2 writer output in XML
 
 # History:
 #  Stan Smith 2016-12-14 original script
 
-require_relative 'class_grid'
+require_relative 'class_gridRepresentation'
 require_relative 'class_vectorRepresentation'
 require_relative 'class_georectified'
 require_relative 'class_georeferenceable'
@@ -24,20 +24,14 @@ module ADIWG
                def writeXML(hRepresentation)
 
                   # classes used
-                  gridClass = Grid.new(@xml, @hResponseObj)
+                  gridClass = MD_GridSpatialRepresentation.new(@xml, @hResponseObj)
                   vectorClass = MD_VectorSpatialRepresentation.new(@xml, @hResponseObj)
                   rectifiedClass = MD_Georectified.new(@xml, @hResponseObj)
                   referenceClass = MD_Georeferenceable.new(@xml, @hResponseObj)
 
                   # spatial representation - grid
-                  # write MD_GridSpatialRepresentation tag here
-                  # ... it is not written in the Grid class since the
-                  # ... Grid attributes are also written into georectified
-                  # ... and georeferenceable classes
                   unless hRepresentation[:gridRepresentation].empty?
-                     @xml.tag!('gmd:MD_GridSpatialRepresentation') do
-                        gridClass.writeXML(hRepresentation[:gridRepresentation], 'spatial representation')
-                     end
+                     gridClass.writeXML(hRepresentation[:gridRepresentation])
                   end
 
                   # spatial representation - vector

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

@@ -33,7 +33,7 @@ module ADIWG
                         end
                      end
                      if aCons.empty?
-                        @xml.tag!('gmd:useLimitation')
+                        @xml.tag!('gmd:useLimitation') && @hResponseObj[:writerShowTags]
                      end
 
                   end # gmd:MD_Constraints tag

data/lib/adiwg/mdtranslator/writers/iso19115_2/iso19115_2_writer_messages_eng.yml

@@ -81,6 +81,7 @@ messageList:
    - {id: 260, message: "process step description is missing"}
 
    - {id: 270, message: "responsible party role is missing"}
+   - {id: 270, message: "responsible party is missing"}
 
    - {id: 280, message: "scope level (code) is missing"}
 
@@ -111,3 +112,7 @@ messageList:
    - {id: 351, message: "attribute sequence identifier type is missing"}
 
    - {id: 360, message: "measure type is invalid; must be one of [distance, length, angle, measure, scale]"}
+
+   - {id: 370, message: "invalid obligation code"}
+
+   - {id: 380, message: "invalid topic category"}

data/lib/adiwg/mdtranslator/writers/iso19115_2/readme.md

@@ -4,9 +4,9 @@
 ### Writer for ISO 19115-2:2009 Geographic Metadata
 
 The mdTranslator iso19115_2 writer implements approximately 95% of 
-the for ISO 19115-2 standard. Efforts were made to include all 
+the for ISO 19139:2007 and 19115-2:2009 standards. Efforts were made to include all 
 elements of the ISO standard that support general data descriptions 
 to ensure generation of health and robust project and data metadata 
 records. The sections of 19115-2 not supported by the mdTranslator 
 writer are the 'quantitative' section for data quality, portrayal 
-catalog reference, and application schema information. 
+catalog reference, acquisition, and application schema information. 

data/lib/adiwg/mdtranslator/writers/iso19115_2/version.rb

@@ -7,7 +7,7 @@ module ADIWG
       module Writers
          module Iso19115_2
 
-            # current version of html writer
+            # current version of ISO 19115-2 writer
             VERSION = '2.2.0'
 
          end

data/lib/adiwg/mdtranslator/writers/mdWriters.rb

@@ -6,8 +6,8 @@
 #  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-03-04 changed method of setting $WriterNS
-#  Stan Smith 2012-12-16 generalized handleWriter to use :writerName
-#  Stan Smith 2014-12-11 original script
+#  Stan Smith 2014-12-16 generalized handleWriter to use :writerName
+#  Stan Smith 2012-12-11 original script
 
 module ADIWG
    module Mdtranslator
@@ -16,13 +16,13 @@ module ADIWG
          def self.handleWriter(intObj, hResponseObj)
 
             # use ':writerRequested' from hResponseObj to build directory path to writer
-            # writer's high-level folder must be placed in 'lib/adiwg/mdtranslator/writers/'
-            # writer's code must must be in folder named '{writer}'
-            # '{writer}' must contain a module named '{writer}_writer.rb'
+            # all writers must be in the folder 'lib/adiwg/mdtranslator/writers/'
+            # place a particular writer's code in a folder by the same name as the writer
+            # the writer must contain a starting point module named '{writer}_writer.rb'
             # '{writer}_writer.rb' must have a method named 'startWriter()'
             # 'startWriter()' must pass two parameters (intObj, hResponseObj)
-            # all writer modules and classes must remain in their private namespace
-            # writer namespace is 'ADIWG::Mdtranslator::Writers::{writer}'
+            # all of the {writer's} modules and classes must be contained in a unique private namespace
+            # the writer's namespace is 'ADIWG::Mdtranslator::Writers::{writer}'
 
             # the writer's high-level
             thisDir = File.dirname(File.expand_path(__FILE__))

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

@@ -3,7 +3,6 @@
 # History:
 #  Stan Smith 2017-05-16 original script
 
-require 'adiwg/mdtranslator/internal/module_dateTimeFun'
 require_relative 'sbJson_codelists'
 
 module ADIWG

data/lib/adiwg/mdtranslator_cli.rb

@@ -2,6 +2,7 @@
 # ADIwg mdTranslator - Thor CLI for mdtranslator
 
 # History:
+#  Stan Smith 2019-04-11 add 'iso19115-1' option to writer enum list
 #  Stan Smith 2018-05-04 add support for reader execution messages
 #  Stan Smith 2018-04-07 add 'fgdc' option to reader and writer enum list
 #  Stan Smith 2018-02-26 add 'forceValid' parameter
@@ -38,7 +39,7 @@ and to choose the level of validation for mdJson input files.
                  :enum => %w{mdJson sbJson fgdc}, :required => true
    method_option :writer, :aliases => '-w',
                  :desc => 'Writer to create your output metadata file, leave blank to validate input only',
-                 :enum => %w{iso19115_2 iso19110 html mdJson sbJson fgdc}
+                 :enum => %w{fgdc html iso19110 iso19115_1 iso19115_2 mdJson sbJson }
    method_option :validate, :aliases => '-v', :desc => 'Specify level of validation to be performed',
                  :enum => %w{none normal strict}, :default => 'normal'
    method_option :forceValid, :aliases => '-f', :desc => 'Insert tags for required elements missing from input',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.14.2
+  version: 2.15.0
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,7 @@ files:
 - lib/adiwg-mdtranslator.rb
 - lib/adiwg/mdtranslator.rb
 - lib/adiwg/mdtranslator/internal/internal_metadata_obj.rb
+- lib/adiwg/mdtranslator/internal/module_codelistFun.rb
 - lib/adiwg/mdtranslator/internal/module_coordinates.rb
 - lib/adiwg/mdtranslator/internal/module_dateTimeFun.rb
 - lib/adiwg/mdtranslator/readers/fgdc/fgdc_reader.rb
@@ -366,7 +367,6 @@ files:
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_geometryProperties.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_georectifiedRepresentation.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_georeferenceableRepresentation.rb
-- lib/adiwg/mdtranslator/readers/mdJson/modules/module_gmlIdentifier.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_graphic.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_gridRepresentation.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_identifier.rb
@@ -630,6 +630,94 @@ files:
 - lib/adiwg/mdtranslator/writers/iso19110/iso19110_writer_messages_eng.yml
 - lib/adiwg/mdtranslator/writers/iso19110/readme.md
 - lib/adiwg/mdtranslator/writers/iso19110/version.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_additionalDocument.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_address.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_associatedResource.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_attribute.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_attributeGroup.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_baseUnit.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_boundingBox.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_browseGraphic.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_citation.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_codelist.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_constraint.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_constraintCommon.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_contact.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_conventionalUnit.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_coverageDescription.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_dataIdentification.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_date.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_definitionUnit.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_derivedUnit.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_dimension.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_distribution.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_distributor.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_email.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_extent.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_feature.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_featureCollection.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_featureProperties.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_format.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_fraction.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_gcoDateTime.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_geographicElement.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_geographicExtent.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_geometricObjects.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_geometryCollection.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_georectified.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_georeferenceable.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_gmlIdentifier.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_grid.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_gridRepresentation.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_identifier.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_imageDescription.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_individual.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_keyword.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_legalConstraints.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_lineString.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_lineage.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_locale.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_maintenance.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_mdBand.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_mdMetadata.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_measure.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_medium.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_miBand.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_multiLine.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_multiPoint.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_multiPolygon.rb
+- 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_phone.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_point.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_polygon.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_processStep.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_rangeDimension.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
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_responsibility.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_sampleDimension.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_scope.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_scopeDescription.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_securityConstraints.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_series.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_source.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_spatialRepresentation.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_temporalExtent.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_timeInstant.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_timePeriod.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_transferOptions.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_unitsOfMeasure.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_usage.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_useConstraints.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_vectorRepresentation.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/classes/class_verticalExtent.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/iso19115_1_writer.rb
+- lib/adiwg/mdtranslator/writers/iso19115_1/iso19115_1_writer_messages_eng.yml
+- lib/adiwg/mdtranslator/writers/iso19115_1/readme.md
+- lib/adiwg/mdtranslator/writers/iso19115_1/version.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_address.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_aggregateInformation.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_attribute.rb

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

@@ -1,55 +0,0 @@
-# unpack GML identifier
-# Reader - ADIwg JSON to internal data structure
-
-# History:
-#  Stan Smith 2018-06-20 refactored error and warning messaging
-# 	Stan Smith 2016-11-30 original script
-
-# TODO verify this method is not used
-
-module ADIWG
-   module Mdtranslator
-      module Readers
-         module MdJson
-
-            module GMLIdentifier
-
-               def self.unpack(hIdentifier, responseObj)
-
-                  @MessagePath = ADIWG::Mdtranslator::Readers::MdJson::MdJson
-
-                  # return nil object if input is empty
-                  if hIdentifier.empty?
-                     @MessagePath.issueWarning(420, responseObj)
-                     return nil
-                  end
-
-                  # instance classes needed in script
-                  intMetadataClass = InternalMetadata.new
-                  intIdentifier = intMetadataClass.newIdentifier
-
-                  # gml identifier - identifier (required)
-                  if hIdentifier.has_key?('identifier')
-                     intIdentifier[:identifier] = hIdentifier['identifier']
-                  end
-                  if intIdentifier[:identifier].nil? || intIdentifier[:identifier] == ''
-                     @MessagePath.issueError(421, responseObj)
-                  end
-
-                  # gml identifier - namespace (required)
-                  if hIdentifier.has_key?('namespace')
-                     intIdentifier[:namespace] = hIdentifier['namespace']
-                  end
-                  if intIdentifier[:namespace].nil? || intIdentifier[:namespace] == ''
-                     @MessagePath.issueError(422, responseObj)
-                  end
-
-                  return intIdentifier
-
-               end
-            end
-
-         end
-      end
-   end
-end