Merge branch 'releases/2-19-0' into feature/acquisition

adiwg · Jul 3, 2024 · 391a184 · 391a184
2 parents a9fef38 + 87ce034
commit 391a184
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 40 deletions.
diff --git a/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_timePeriod.rb b/lib/adiwg/mdtranslator/writers/iso19115_3/classes/class_timePeriod.rb
@@ -65,9 +65,7 @@ def writeXML(hPeriod)
                      # if empty add indeterminatePosition="unknown"
                      unless hPeriod[:startDateTime].empty?
                         hDateTime = hPeriod[:startDateTime]
-                        dateTime = hDateTime[:dateTime]
-                        timeResolution = hDateTime[:dateResolution]
-                        dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(dateTime, timeResolution)
+                        dateStr = AdiwgDateTimeFun.stringDateTimeFromDateObject(hDateTime)
                         @xml.tag!('gml:beginPosition', dateStr)
                      end
                      if hPeriod[:startDateTime].empty?
@@ -79,9 +77,7 @@ def writeXML(hPeriod)
                      # if empty add indeterminatePosition="unknown"
                      unless hPeriod[:endDateTime].empty?
                         hDateTime = hPeriod[:endDateTime]
-                        dateTime = hDateTime[:dateTime]
-                        timeResolution = hDateTime[:dateResolution]
-                        dateStr = AdiwgDateTimeFun.stringDateTimeFromDateTime(dateTime, timeResolution)
+                        dateStr = AdiwgDateTimeFun.stringDateTimeFromDateObject(hDateTime)
                         @xml.tag!('gml:endPosition', dateStr)
                      end
                      if hPeriod[:endDateTime].empty?

diff --git a/test/helpers/mdJson_hash_functions.rb b/test/helpers/mdJson_hash_functions.rb
@@ -74,7 +74,8 @@ def build_dataQuality
          reportReference: build_citation('standalone quality report 1'),
          abstract: "standalone quality report 1"
       }
-
+      # NOTE: This object should be in the file mdJson_hash_objects.rb so at some point it should be moved
+      # refer to other build_ functions for examples and references on how build_dataQuality should be structured
       hDataQuality[:report] = [
          {
             type: 'DQ_AbsoluteExternalPositionalAccuracy',

diff --git a/test/writers/iso19115-3/tc_19115_3_temporalExtent.rb b/test/writers/iso19115-3/tc_19115_3_temporalExtent.rb
@@ -16,7 +16,7 @@ class TestWriter191151TemporalExtent < TestWriter191151Parent
    # build mdJson test file in hash
    mdHash = TDClass.base
 
-   hTimeP = TDClass.build_timePeriod('TPID001',nil,'2017-05-02','2018-05-02T08:46')
+   hTimeP = TDClass.build_timePeriod('TPID001',nil,'2017-05-02T00:00','2018-05-02T08:46')
    hTimeI = TDClass.build_timeInstant('TIID001',nil,'2018-05-02T08:48:00-00:09')
    mdHash[:metadata][:resourceInfo][:extent][0][:temporalExtent] = []
    mdHash[:metadata][:resourceInfo][:extent][0][:temporalExtent] << { timePeriod: hTimeP }

diff --git a/test/writers/iso19115-3/tc_19115_3_timePeriod.rb b/test/writers/iso19115-3/tc_19115_3_timePeriod.rb
@@ -16,7 +16,7 @@ class TestWriter191151TimePeriod < TestWriter191151Parent
    # build mdJson test file in hash
    mdHash = TDClass.base
 
-   hTimeP = TDClass.build_timePeriod('TPID001',nil,'2017-05-02','2018-05-02T08:46')
+   hTimeP = TDClass.build_timePeriod('TPID001',nil,'2017-05-02T00:00','2018-05-02T08:46')
    mdHash[:metadata][:resourceInfo][:extent][0][:temporalExtent] = []
    mdHash[:metadata][:resourceInfo][:extent][0][:temporalExtent] << { timePeriod: hTimeP }
    mdHash[:metadata][:resourceInfo][:extent][0].delete(:geographicExtent)

diff --git a/test/writers/iso19115-3/testData/19115_3_dataIdentification.xml b/test/writers/iso19115-3/testData/19115_3_dataIdentification.xml
@@ -260,7 +260,7 @@
                   <gml:description>resource time period</gml:description>
                   <gml:identifier codeSpace=""/>
                   <gml:name/>
-                  <gml:beginPosition>2017-12-01T00:00:00</gml:beginPosition>
+                  <gml:beginPosition>2017-12-01</gml:beginPosition>
                   <gml:endPosition indeterminatePosition="unknown"/>
                 </gml:TimePeriod>
               </gex:extent>
@@ -607,7 +607,7 @@
                   <gml:description>resource time period</gml:description>
                   <gml:identifier codeSpace=""/>
                   <gml:name/>
-                  <gml:beginPosition>2017-12-01T00:00:00</gml:beginPosition>
+                  <gml:beginPosition>2017-12-01</gml:beginPosition>
                   <gml:endPosition indeterminatePosition="unknown"/>
                 </gml:TimePeriod>
               </gex:extent>
@@ -765,8 +765,8 @@
               <gml:identifier codeSpace="">time period identifier</gml:identifier>
               <gml:name>period name one</gml:name>
               <gml:name>period name two</gml:name>
-              <gml:beginPosition>2018-05-02T00:00:00</gml:beginPosition>
-              <gml:endPosition>2016-12-31T00:00:00</gml:endPosition>
+              <gml:beginPosition>2018-05-02</gml:beginPosition>
+              <gml:endPosition>2016-12-31</gml:endPosition>
               <gml:timeInterval unit="year">1.1</gml:timeInterval>
             </gml:TimePeriod>
           </mri:usageDateTime>
@@ -1273,7 +1273,7 @@
                   <gml:description>resource time period</gml:description>
                   <gml:identifier codeSpace=""/>
                   <gml:name/>
-                  <gml:beginPosition>2017-12-01T00:00:00</gml:beginPosition>
+                  <gml:beginPosition>2017-12-01</gml:beginPosition>
                   <gml:endPosition indeterminatePosition="unknown"/>
                 </gml:TimePeriod>
               </gex:extent>
@@ -1615,8 +1615,8 @@
               <gml:identifier codeSpace="">time period identifier</gml:identifier>
               <gml:name>period name one</gml:name>
               <gml:name>period name two</gml:name>
-              <gml:beginPosition>2018-05-02T00:00:00</gml:beginPosition>
-              <gml:endPosition>2016-12-31T00:00:00</gml:endPosition>
+              <gml:beginPosition>2018-05-02</gml:beginPosition>
+              <gml:endPosition>2016-12-31</gml:endPosition>
               <gml:timeInterval unit="year">1.1</gml:timeInterval>
             </gml:TimePeriod>
           </mri:usageDateTime>
@@ -1709,8 +1709,8 @@
               <gml:identifier codeSpace="">time period identifier</gml:identifier>
               <gml:name>period name one</gml:name>
               <gml:name>period name two</gml:name>
-              <gml:beginPosition>2018-05-02T00:00:00</gml:beginPosition>
-              <gml:endPosition>2016-12-31T00:00:00</gml:endPosition>
+              <gml:beginPosition>2018-05-02</gml:beginPosition>
+              <gml:endPosition>2016-12-31</gml:endPosition>
               <gml:timeInterval unit="year">1.1</gml:timeInterval>
             </gml:TimePeriod>
           </mri:usageDateTime>
@@ -2274,7 +2274,7 @@
                   <gml:description>resource time period</gml:description>
                   <gml:identifier codeSpace=""/>
                   <gml:name/>
-                  <gml:beginPosition>2017-12-01T00:00:00</gml:beginPosition>
+                  <gml:beginPosition>2017-12-01</gml:beginPosition>
                   <gml:endPosition indeterminatePosition="unknown"/>
                 </gml:TimePeriod>
               </gex:extent>

diff --git a/test/writers/iso19115-3/testData/19115_3_extent.xml b/test/writers/iso19115-3/testData/19115_3_extent.xml
@@ -189,7 +189,7 @@
             <gml:name>period name one</gml:name>
             <gml:name>period name two</gml:name>
             <gml:beginPosition>2018-04-20T16:46</gml:beginPosition>
-            <gml:endPosition>2016-12-31T00:00:00</gml:endPosition>
+            <gml:endPosition>2016-12-31</gml:endPosition>
             <gml:timeInterval unit="year">1.1</gml:timeInterval>
           </gml:TimePeriod>
         </gex:extent>

diff --git a/test/writers/iso19115-3/testData/19115_3_leProcessStep.xml b/test/writers/iso19115-3/testData/19115_3_leProcessStep.xml
@@ -47,8 +47,8 @@
           <gml:identifier codeSpace="">time period identifier</gml:identifier>
           <gml:name>period name one</gml:name>
           <gml:name>period name two</gml:name>
-          <gml:beginPosition>2018-06-22T00:00:00</gml:beginPosition>
-          <gml:endPosition>2016-12-31T00:00:00</gml:endPosition>
+          <gml:beginPosition>2018-06-22</gml:beginPosition>
+          <gml:endPosition>2016-12-31</gml:endPosition>
           <gml:timeInterval unit="year">1.1</gml:timeInterval>
         </gml:TimePeriod>
       </mrl:stepDateTime>
@@ -1018,8 +1018,8 @@
           <gml:identifier codeSpace="">time period identifier</gml:identifier>
           <gml:name>period name one</gml:name>
           <gml:name>period name two</gml:name>
-          <gml:beginPosition>2018-06-22T00:00:00</gml:beginPosition>
-          <gml:endPosition>2016-12-31T00:00:00</gml:endPosition>
+          <gml:beginPosition>2018-06-22</gml:beginPosition>
+          <gml:endPosition>2016-12-31</gml:endPosition>
           <gml:timeInterval unit="year">1.1</gml:timeInterval>
         </gml:TimePeriod>
       </mrl:stepDateTime>

diff --git a/test/writers/iso19115-3/testData/19115_3_liProcessStep.xml b/test/writers/iso19115-3/testData/19115_3_liProcessStep.xml
@@ -47,8 +47,8 @@
           <gml:identifier codeSpace="">time period identifier</gml:identifier>
           <gml:name>period name one</gml:name>
           <gml:name>period name two</gml:name>
-          <gml:beginPosition>2018-06-22T00:00:00</gml:beginPosition>
-          <gml:endPosition>2016-12-31T00:00:00</gml:endPosition>
+          <gml:beginPosition>2018-06-22</gml:beginPosition>
+          <gml:endPosition>2016-12-31</gml:endPosition>
           <gml:timeInterval unit="year">1.1</gml:timeInterval>
         </gml:TimePeriod>
       </mrl:stepDateTime>
@@ -231,8 +231,8 @@
           <gml:identifier codeSpace="">time period identifier</gml:identifier>
           <gml:name>period name one</gml:name>
           <gml:name>period name two</gml:name>
-          <gml:beginPosition>2018-06-22T00:00:00</gml:beginPosition>
-          <gml:endPosition>2016-12-31T00:00:00</gml:endPosition>
+          <gml:beginPosition>2018-06-22</gml:beginPosition>
+          <gml:endPosition>2016-12-31</gml:endPosition>
           <gml:timeInterval unit="year">1.1</gml:timeInterval>
         </gml:TimePeriod>
       </mrl:stepDateTime>
@@ -583,8 +583,8 @@
           <gml:identifier codeSpace="">time period identifier</gml:identifier>
           <gml:name>period name one</gml:name>
           <gml:name>period name two</gml:name>
-          <gml:beginPosition>2018-06-22T00:00:00</gml:beginPosition>
-          <gml:endPosition>2016-12-31T00:00:00</gml:endPosition>
+          <gml:beginPosition>2018-06-22</gml:beginPosition>
+          <gml:endPosition>2016-12-31</gml:endPosition>
           <gml:timeInterval unit="year">1.1</gml:timeInterval>
         </gml:TimePeriod>
       </mrl:stepDateTime>

diff --git a/test/writers/iso19115-3/testData/19115_3_mdMetadata.xml b/test/writers/iso19115-3/testData/19115_3_mdMetadata.xml
@@ -382,7 +382,7 @@
                   <gml:description>resource time period</gml:description>
                   <gml:identifier codeSpace=""/>
                   <gml:name/>
-                  <gml:beginPosition>2017-12-01T00:00:00</gml:beginPosition>
+                  <gml:beginPosition>2017-12-01</gml:beginPosition>
                   <gml:endPosition indeterminatePosition="unknown"/>
                 </gml:TimePeriod>
               </gex:extent>

diff --git a/test/writers/iso19115-3/testData/19115_3_temporalExtent.xml b/test/writers/iso19115-3/testData/19115_3_temporalExtent.xml
@@ -41,7 +41,7 @@
           <gml:identifier codeSpace="">time period identifier</gml:identifier>
           <gml:name>period name one</gml:name>
           <gml:name>period name two</gml:name>
-          <gml:beginPosition>2017-05-02T00:00:00</gml:beginPosition>
+          <gml:beginPosition>2017-05-02T00:00</gml:beginPosition>
           <gml:endPosition>2018-05-02T08:46</gml:endPosition>
           <gml:timeInterval unit="year">1.1</gml:timeInterval>
         </gml:TimePeriod>

diff --git a/test/writers/iso19115-3/testData/19115_3_timePeriod.xml b/test/writers/iso19115-3/testData/19115_3_timePeriod.xml
@@ -41,7 +41,7 @@
           <gml:identifier codeSpace="">time period identifier</gml:identifier>
           <gml:name>period name one</gml:name>
           <gml:name>period name two</gml:name>
-          <gml:beginPosition>2017-05-02T00:00:00</gml:beginPosition>
+          <gml:beginPosition>2017-05-02T00:00</gml:beginPosition>
           <gml:endPosition>2018-05-02T08:46</gml:endPosition>
           <gml:timeInterval unit="year">1.1</gml:timeInterval>
         </gml:TimePeriod>
@@ -56,7 +56,7 @@
           <gml:description/>
           <gml:identifier codeSpace=""/>
           <gml:name/>
-          <gml:beginPosition>2017-05-02T00:00:00</gml:beginPosition>
+          <gml:beginPosition>2017-05-02T00:00</gml:beginPosition>
           <gml:endPosition indeterminatePosition="unknown"/>
           <gml:duration>P1Y2M3DT4H5M6S</gml:duration>
         </gml:TimePeriod>

diff --git a/test/writers/iso19115-3/testData/19115_3_usage.xml b/test/writers/iso19115-3/testData/19115_3_usage.xml
@@ -44,8 +44,8 @@
           <gml:identifier codeSpace="">time period identifier</gml:identifier>
           <gml:name>period name one</gml:name>
           <gml:name>period name two</gml:name>
-          <gml:beginPosition>2018-05-02T00:00:00</gml:beginPosition>
-          <gml:endPosition>2016-12-31T00:00:00</gml:endPosition>
+          <gml:beginPosition>2018-05-02</gml:beginPosition>
+          <gml:endPosition>2016-12-31</gml:endPosition>
           <gml:timeInterval unit="year">1.1</gml:timeInterval>
         </gml:TimePeriod>
       </mri:usageDateTime>
@@ -139,8 +139,8 @@
           <gml:identifier codeSpace="">time period identifier</gml:identifier>
           <gml:name>period name one</gml:name>
           <gml:name>period name two</gml:name>
-          <gml:beginPosition>2018-06-24T00:00:00</gml:beginPosition>
-          <gml:endPosition>2016-12-31T00:00:00</gml:endPosition>
+          <gml:beginPosition>2018-06-24</gml:beginPosition>
+          <gml:endPosition>2016-12-31</gml:endPosition>
           <gml:timeInterval unit="year">1.1</gml:timeInterval>
         </gml:TimePeriod>
       </mri:usageDateTime>
@@ -150,8 +150,8 @@
           <gml:identifier codeSpace="">time period identifier</gml:identifier>
           <gml:name>period name one</gml:name>
           <gml:name>period name two</gml:name>
-          <gml:beginPosition>2019-05-15T00:00:00</gml:beginPosition>
-          <gml:endPosition>2016-12-31T00:00:00</gml:endPosition>
+          <gml:beginPosition>2019-05-15</gml:beginPosition>
+          <gml:endPosition>2016-12-31</gml:endPosition>
           <gml:timeInterval unit="year">1.1</gml:timeInterval>
         </gml:TimePeriod>
       </mri:usageDateTime>