adiwg-mdtranslator 2.15.0 → 2.18.0rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4c28a9de2c4b82b2f0b46f4de13a87b8de286d98
-  data.tar.gz: af96ef12d442a941918a23842bd74aa027d0d1a2
+SHA256:
+  metadata.gz: 67548c26ee946f10c11bb16593fea2bff705209467ffd4fbe9b9ce5db971803e
+  data.tar.gz: c4c6850208bbf1e47621c741777862cc6f30c2f6668d1753309c4f7397618311
 SHA512:
-  metadata.gz: f428c56a2f93748c0482746b31278bbacd995080416a6c28e3aa195c1ca16b30a02a73ee3a1a1b7e45037f8f4fa28ee0db3735dc630903af85a6cedf58253ad4
-  data.tar.gz: 1a8b0cc95da21914bab8eae81d2b9f55b962984cc583e76fc49472ca8c14b1b0d3d9b0e3d16ef9f1c3b27986eadd954edc78e341b25228eb7a73de85e1f4f7b9
+  metadata.gz: 76385a2877ccbb04739c2aac4a2526912f97d1d3a3863c9779ff948f447b5434f34d68030ad2a143466ac2fa804887d1edd60b56587e14b3a069545651fb52fb
+  data.tar.gz: 53326a9899e781aaa171bbaa25a18a6d0e736d3d615bb1f6f24c7818a65885b42cb3345bfb37d4d2f5155727cb3aee6660e56088b31ce8303999dac4ad2f8634

data/CHANGELOG.md

@@ -1,7 +1,27 @@
 # Change Log
 
-## [v2.15.0](https://github.com/adiwg/mdTranslator/tree/v2.15.0)
+## [v2.17.1](https://github.com/adiwg/mdTranslator/tree/v2.17.1)
 
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.16.1...v2.17.1)
+
+**Closed issues:**
+
+- Enumerated Value lists Description written to the ISO 19110 output? [\#218](https://github.com/adiwg/mdTranslator/issues/218)
+- Support applicationProfile and protocolRequest in onlineResource [\#215](https://github.com/adiwg/mdTranslator/issues/215)
+
+**Merged pull requests:**
+
+- Dev [\#219](https://github.com/adiwg/mdTranslator/pull/219) ([jlblcc](https://github.com/jlblcc))
+- Add support for LE\_ProcessStep and LE\_Source [\#217](https://github.com/adiwg/mdTranslator/pull/217) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.16.1](https://github.com/adiwg/mdTranslator/tree/v2.16.1) (2019-09-24)
+[Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.15.0...v2.16.1)
+
+**Merged pull requests:**
+
+- Data Dictionary support for 19115-1 [\#216](https://github.com/adiwg/mdTranslator/pull/216) ([stansmith907](https://github.com/stansmith907))
+
+## [v2.15.0](https://github.com/adiwg/mdTranslator/tree/v2.15.0) (2019-05-17)
 [Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.14.2...v2.15.0)
 
 **Implemented enhancements:**
@@ -9,6 +29,10 @@
 - Add writer for ISO 19115-1 [\#207](https://github.com/adiwg/mdTranslator/issues/207)
 - Add ISO 19115-3 \(1\) Support [\#209](https://github.com/adiwg/mdTranslator/pull/209) ([stansmith907](https://github.com/stansmith907))
 
+**Merged pull requests:**
+
+- Fix issue with FGDC taxonomy reader [\#211](https://github.com/adiwg/mdTranslator/pull/211) ([stansmith907](https://github.com/stansmith907))
+
 ## [v2.14.2](https://github.com/adiwg/mdTranslator/tree/v2.14.2) (2018-11-02)
 [Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.14.1...v2.14.2)
 
@@ -124,7 +148,6 @@
 
 - Minor bug fixes [\#182](https://github.com/adiwg/mdTranslator/pull/182) ([stansmith907](https://github.com/stansmith907))
 - mdTranslator version 2.9.0 [\#181](https://github.com/adiwg/mdTranslator/pull/181) ([stansmith907](https://github.com/stansmith907))
-- Remove repository name from harvest set tag in sbJson writer.  [\#151](https://github.com/adiwg/mdTranslator/pull/151) ([stansmith907](https://github.com/stansmith907))
 
 ## [v2.9.1](https://github.com/adiwg/mdTranslator/tree/v2.9.1) (2018-02-03)
 [Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.9.0...v2.9.1)
@@ -235,6 +258,10 @@
 ## [v2.3.4](https://github.com/adiwg/mdTranslator/tree/v2.3.4) (2017-10-13)
 [Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.3.3...v2.3.4)
 
+**Merged pull requests:**
+
+- Remove repository name from harvest set tag in sbJson writer.  [\#151](https://github.com/adiwg/mdTranslator/pull/151) ([stansmith907](https://github.com/stansmith907))
+
 ## [v2.3.3](https://github.com/adiwg/mdTranslator/tree/v2.3.3) (2017-10-11)
 [Full Changelog](https://github.com/adiwg/mdTranslator/compare/v2.3.2...v2.3.3)
 

data/Rakefile

@@ -2,6 +2,14 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
+# Rake::TestTask.new do |t|
+#    t.libs << 'test'
+#    t.test_files = FileList[
+#       'test/writers/iso19115-2/tc*.rb'
+#    ]
+#    t.verbose = true
+# end
+
 Rake::TestTask.new do |t|
    t.libs << 'test'
    t.test_files = FileList[
@@ -18,19 +26,8 @@ Rake::TestTask.new do |t|
       'test/translator/tc*.rb'
    ]
    t.verbose = true
+   t.warning = false
 end
 
 desc 'Run tests'
 task :default => :test
-
-   # '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-1/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

@@ -34,8 +34,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.6"
-   spec.add_runtime_dependency "adiwg-mdcodes", "~> 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"
    spec.add_runtime_dependency "coderay", "~> 1.1"

data/lib/adiwg/mdtranslator/internal/acquisition.json

@@ -0,0 +1,108 @@
+{
+   "acquisition": [
+      {
+         "plan": [
+            {
+               "planId": "plan ID",
+               "planType": "MI_GeometryTypeCode",
+               "status": "MD_ProgressCode",
+               "citation": {},
+               "planOperation": ["operationId"],
+               "satisfiedRequirement": ["requirementId"]
+            }
+         ],
+         "requirement": [
+            {
+               "requirementId": "requirement ID",
+               "citation": {},
+               "identifier": {},
+               "requestor": [],
+               "recipient": [],
+               "priority": "MI_PriorityCode",
+               "requestedDate": {
+                  "requestedDateOfCollection": "2019-06-10T16:01:00",
+                  "latestAcceptableDate": "2019-06-13:T16:02:00"
+               },
+               "expiryDate": "2019-06-10T15:50:00",
+               "satisfiedPlan": ["planId"]
+            }
+         ],
+         "objective": [
+            {
+               "objectiveId": "objective ID",
+               "identifier": [],
+               "priority": "objective priority",
+               "objectiveType": ["MI_ObjectiveTypeCode"],
+               "function": ["objective function one"],
+               "extent": [],
+               "objectiveOccurrence": ["eventId"],
+               "pass": ["passId"],
+               "sensingInstrument": ["instrumentId"]
+            }
+         ],
+         "platform": [
+            {
+               "platformId": "platform ID",
+               "citation": {},
+               "identifier": {},
+               "description": "platform description",
+               "sponsor": [],
+               "instrument": ["instrumentId"]
+            }
+         ],
+         "instrument": [
+            {
+               "instrumentId": "instrument ID",
+               "citation": [],
+               "identifier": {},
+               "instrumentType": "instrument type",
+               "description": "instrument description",
+               "mountedOn": "platformId"
+            }
+         ],
+         "operation": [
+            {
+               "operationId": "operation ID",
+               "description": "operation description",
+               "citation": {},
+               "identifier": {},
+               "status": "MD_ProgressCode",
+               "operationType": "MI_OperationTypeCode",
+               "objective": ["objectiveId"],
+               "parentOperation": "operationId",
+               "childOperation": ["operationId"],
+               "plan": "planId",
+               "platform": ["platformId"],
+               "significantEvent": ["eventId"]
+            }
+         ],
+         "event": [
+            {
+               "eventId": "event ID",
+               "identifier": {},
+               "trigger": "MI_TriggerCode",
+               "context": "MI_ContextCode",
+               "sequence": "MI_SequenceCode",
+               "time": "2019-06-10T16:07:00",
+               "expectedObjective": ["objectiveId"],
+               "relatedPass": "passId",
+               "relatedSensor": ["instrumentId"]
+            }
+         ],
+         "pass": [
+            {
+               "passId": "pass ID",
+               "identifier": {},
+               "extent": {},
+               "relatedEvent": ["eventId"]
+            }
+         ],
+         "environment": {
+            "averageAirTemperature": 9.9,
+            "maxRelativeHumidity": 9.9,
+            "maxAltitude": 9.9,
+            "meteorologicalConditions": "meteorological conditions"
+         }
+      }
+   ]
+}

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

@@ -154,7 +154,138 @@ class InternalMetadata
    end
 
 
-   # contacts--------------------------------
+   # acquisition ----------------------------
+   def newAcquisition
+      {
+         plans: [],
+         requirements: [],
+         objectives: [],
+         platforms: [],
+         instruments: [],
+         operations: [],
+         events: [],
+         passes: [],
+         environment: {}
+      }
+   end
+
+   def newEnvironment
+      {
+         averageAirTemperature: nil,
+         maxRelativeHumidity: nil,
+         maxAltitude: nil,
+         meteorologicalConditions: nil
+      }
+   end
+
+   def newEvent
+      {
+         eventId: nil,
+         trigger: nil,
+         context: nil,
+         sequence: nil,
+         dateTime: nil,
+         expectedObjectives: [],
+         relatedPass: nil,
+         relatedSensors: []
+      }
+   end
+
+   def newInstrument
+      {
+         instrumentId: nil,
+         citation: {},
+         identifier: {},
+         instrumentType: nil,
+         description: nil,
+         mountedOn: nil
+      }
+   end
+
+   def newObjective
+      {
+         objectiveId: nil,
+         identifiers: [],
+         priority: nil,
+         objectiveTypes: [],
+         functions: [],
+         extents: [],
+         occurrences: [],
+         passes: [],
+         sensingInstruments: []
+      }
+   end
+
+   def newPass
+      {
+         passId: nil,
+         identifier: {},
+         extent: {},
+         relatedEvents: []
+      }
+   end
+
+   def newPlan
+      {
+         planId: nil,
+         planType: nil,
+         status: nil,
+         citation: {},
+         planOperations: [],
+         satisfiedRequirements: []
+      }
+   end
+
+   def newOperation
+      {
+         operationId: nil,
+         citation: {},
+         identifier: {},
+         status: nil,
+         operationType: nil,
+         objectives: [],
+         parentOperations: nil,
+         childOperations: [],
+         plan: nil,
+         platforms: [],
+         significantEvents: []
+      }
+   end
+
+   def newRequirement
+      {
+         requirementId: nil,
+         citation: {},
+         identifier: {},
+         requestors: [],
+         recipients: [],
+         priority: nil,
+         requestedDate: {},
+         expiryDate: nil,
+         satisfiedPlans: []
+      }
+   end
+
+   def newPlatform
+      {
+         platformId: nil,
+         citation: {},
+         identifier: {},
+         description: nil,
+         sponsors: [],
+         instruments: []
+      }
+   end
+
+   def newRequestedDate
+      {
+         requestedDateCollection: nil,
+         latestAcceptableDate: nil
+      }
+   end
+
+
+   # contacts -------------------------------
    def newAddress
       {
          addressTypes: [],
@@ -180,8 +311,9 @@ class InternalMetadata
          eMailList: [],
          onlineResources: [],
          hoursOfService: [],
+         externalIdentifiers: [],
          contactInstructions: nil,
-         contactType: nil
+         contactType: nil,
       }
    end
 
@@ -255,10 +387,12 @@ class InternalMetadata
    def newOnlineResource
       {
          olResURI: nil,
-         olResProtocol: nil,
          olResName: nil,
          olResDesc: nil,
-         olResFunction: nil
+         olResFunction: nil,
+         olResApplicationProfile: nil,
+         olResProtocol: nil,
+         olResProtocolRequest: nil
       }
    end
 
@@ -359,6 +493,7 @@ class InternalMetadata
          maxValue: nil,
          units: nil,
          scaleFactor: nil,
+         rangeElementDescriptions: [],
          offset: nil,
          meanValue: nil,
          numberOfValues: nil,
@@ -495,6 +630,90 @@ class InternalMetadata
    end
 
 
+   # data quality ---------------------------
+   def newDataQuality
+      {
+         scope: {},
+         standaloneReport: {},
+         reports: []
+      }
+   end
+
+   def newConformanceResult
+      {
+         dateTime: nil,
+         scope: {},
+         specification: {},
+         explanation: nil,
+         pass: false
+      }
+   end
+
+   def newDescriptiveResult
+      {
+         dateTime: nil,
+         scope: {},
+         statement: nil
+      }
+   end
+
+   def newEvaluationMethod
+      {
+         type: nil,
+         dateTime: [],
+         description: nil,
+         evaluationProcedure: {},
+         referenceDocuments: [],
+         evaluationMethodType: nil,
+         deductiveSource: 'deductive source',
+         samplingScheme: 'sampling scheme',
+         lotDescription: 'lot description',
+         samplingRatio: 'sampling ratio'
+      }
+   end
+
+   def newQuantitativeResult
+      {
+         dateTime: nil,
+         scope: {},
+         values: [],
+         valueUnits: nil,
+         valueRecordType: nil
+      }
+   end
+
+   def newQualityMeasure
+      {
+         identifier: {},
+         nameOfMeasure: [],
+         description: nil
+      }
+   end
+
+   def newReport
+      {
+         type: nil,
+         dateTime: [],
+         standaloneQualityReportDetails: nil,
+         qualityMeasure: {},
+         evaluationMethod: {},
+         quantitativeResults: [],
+         descriptiveResults: [],
+         conformanceResults: [],
+         derivedElementReports: [],
+         relatedElementReports: []
+      }
+   end
+
+   def newStandaloneReport
+      {
+         reportReference: {},
+         abstract: nil,
+         elementReports: []
+      }
+   end
+
+
    # date-time ------------------------------
    def newDate
       {
@@ -709,6 +928,46 @@ class InternalMetadata
       }
    end
 
+   def newAlgorithm
+      {
+         citation: {},
+         description: nil
+      }
+   end
+
+   def newDataSource
+      {
+         sourceId: nil,
+         description: nil,
+         sourceCitation: {},
+         metadataCitations: [],
+         spatialResolution: {},
+         referenceSystem: {},
+         sourceSteps: [],
+         scope: {},
+         processedLevel: {},
+         resolution: {}
+      }
+   end
+
+   def newNominalResolution
+      {
+         scanningResolution: {},
+         groundResolution: {}
+      }
+   end
+
+   def newProcessing
+      {
+         identifier: {},
+         softwareReference: {},
+         procedureDescription: nil,
+         documentation: [],
+         runtimeParameters: nil,
+         algorithms: []
+      }
+   end
+
    def newProcessStep
       {
          stepId: nil,
@@ -716,23 +975,20 @@ class InternalMetadata
          rationale: nil,
          timePeriod: {},
          processors: [],
-         references: [],
          stepSources: [],
          stepProducts: [],
-         scope: {}
+         references: [],
+         scope: {},
+         processingInformation: {},
+         reports: []
       }
    end
 
-   def newDataSource
+   def newProcessStepReport
       {
-         sourceId: nil,
+         name: nil,
          description: nil,
-         sourceCitation: {},
-         metadataCitation: [],
-         spatialResolution: {},
-         referenceSystem: {},
-         sourceSteps: [],
-         scope: {}
+         fileType: nil
       }
    end
 
@@ -927,7 +1183,8 @@ class InternalMetadata
          numberOfDimensions: nil,
          dimension: [],
          cellGeometry: nil,
-         transformationParameterAvailable: false
+         transformationParameterAvailable: false,
+         scope: []
       }
    end
 
@@ -944,7 +1201,8 @@ class InternalMetadata
    def newVectorInfo
       {
          topologyLevel: nil,
-         vectorObject: []
+         vectorObject: [],
+         scope: []
       }
    end
 
@@ -964,7 +1222,8 @@ class InternalMetadata
          centerPoint: [],
          pointInPixel: nil,
          transformationDimensionDescription: nil,
-         transformationDimensionMapping: nil
+         transformationDimensionMapping: nil,
+         scope: []
       }
    end
 
@@ -975,7 +1234,8 @@ class InternalMetadata
          orientationParameterAvailable: false,
          orientationParameterDescription: nil,
          georeferencedParameter: nil,
-         parameterCitation: []
+         parameterCitation: [],
+         scope: []
       }
    end
 

data/lib/adiwg/mdtranslator/internal/qualityReport.json

@@ -0,0 +1,64 @@
+{
+   "dataQuality": [
+      {
+         "scope": {},
+         "standaloneQualityReport": {
+            "reportReference": {},
+            "abstract": "stand alone abstract",
+            "elementReport": []
+         },
+         "report": [
+            {
+               "type": "quality report type - enumerated",
+               "dateTime": ["2019-06-11T08:10:00"],
+               "standaloneQualityReportDetails": "standalone details",
+               "qualityMeasure": {
+                  "identifier": {},
+                  "name": ["name of measure"],
+                  "description": "measure description"
+               },
+               "evaluationMethod": {
+                  "type": "evaluation method type - enumerated",
+                  "dateTime": ["2019-06-11T08:35:00"],
+                  "methodDescription": "evaluation method description",
+                  "evaluationProcedure": {},
+                  "referenceDocument": [],
+                  "evaluationMethodType": "DQ_EvaluationMethodTypeCode",
+                  "deductiveSource": "deductive source",
+                  "samplingScheme": "sampling scheme",
+                  "lotDescription": "lot description",
+                  "samplingRatio": "sampling ratio"
+               },
+               "quantitativeResult": [
+                  {
+                     "dateTime": "2019-06-11T09:00:00",
+                     "scope": {},
+                     "value": [9.99, 9.0],
+                     "valueUnits": "value units",
+                     "valueRecordType": "value record type"
+                  }
+               ],
+               "descriptiveResult": [
+                  {
+                     "dateTime": "2019-06-11T09:00:00",
+                     "scope": {},
+                     "statement": "descriptive result statement"
+                  }
+               ],
+               "conformanceResult": [
+                  {
+                     "dateTime": "2019-06-11T09:00:00",
+                     "scope": {},
+                     "specification": {},
+                     "explanation": "conformance result explanation",
+                     "pass": false
+                  }
+               ],
+               "coverageResult": ["drop this class"],
+               "derivedElementReport": [],
+               "relatedElementReport": []
+            }
+         ]
+      }
+   ]
+}

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

@@ -59,6 +59,7 @@ module ADIWG
                   end
 
                   # entity attribute 5.1.2.4 (attrdomv) - attribute domain value (required)
+                  domainLength = hDictionary[:domains].length
                   axDomain = xAttribute.xpath('./attrdomv')
                   unless axDomain.empty?
 
@@ -104,9 +105,12 @@ module ADIWG
                   # add domainId to attribute
                   # fgdc allows multiple domain definitions
                   # mdJson allows only one domain definition for an attribute
-                  # take the first, if this is a problem the user will need to fix in the editor
+                  # take the first domain that is assigned to the attribute,
+                  # if this is a problem the user will need to fix in the editor
                   unless hDictionary[:domains].empty?
-                     hAttribute[:domainId] = hDictionary[:domains][0][:domainId]
+                    if hDictionary[:domains].length > domainLength
+                      hAttribute[:domainId] = hDictionary[:domains][domainLength][:domainId]
+                    end
                   end
 
                   axBegin = xAttribute.xpath('./begdatea')