Merge pull request #42 from pds-data-dictionaries/release/1.22.0.0

PDS4 Information Model Release 1.22.0.0

.github/workflows/build-docs.yml

@@ -54,7 +54,7 @@ jobs:
           make github
           cd ..
       - name: Setup Pages
-        uses: actions/configure-pages@v4
+        uses: actions/configure-pages@v5
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3

.github/workflows/ldd-ci.yml

@@ -77,7 +77,7 @@ jobs:
           lddtool_development_release: ${{ matrix.lddtool_development_release }}
           test_path: ${{ env.REGRESSION_TEST_PATH }}
           logs_path: ${{ env.LOGS_PATH }}
-          token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
+          token: ${{ secrets.ADMIN_GITHUB_TOKEN ||  github.token }}
 
       - name: Check logs
         run: |

build/development/8106ddebd33faefcedc32aedd7be410d5b46a95b/1.18.0.0/PDS4_IMG_1I00_1880.sch → build/development/915c5deef43035a87dabdb6fab7c155abc2c7e12/1.18.0.0/PDS4_IMG_1I00_1900.sch

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-  <!-- PDS4 Schematron for Name Space Id:img  Version:1.8.8.0 - Fri Nov 03 15:56:35 UTC 2023 -->
+  <!-- PDS4 Schematron for Name Space Id:img  Version:1.9.0.0 - Fri May 24 20:09:50 UTC 2024 -->
   <!-- Generated from the PDS4 Information Model Version 1.18.0.0 - System Build 12.1 -->
   <!-- *** This PDS4 schematron file is an operational deliverable. *** -->
 <sch:schema xmlns:sch="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
@@ -83,6 +83,13 @@
         IMG:error:frame_child_check: img:Frame must have at least 1 attribute or class specified.</sch:assert>
     </sch:rule>
   </sch:pattern>
+  <sch:pattern>
+    <sch:rule context="//img:ICER_Parameters">
+      <sch:assert test="count(child::*) > 0">
+        <title>//img:ICER_Parameters/Rule</title>
+        IMG:error:icer_params_child_check: img:ICER_Parameters must have at least 1 attribute or class specified.</sch:assert>
+    </sch:rule>
+  </sch:pattern>
   <sch:pattern>
     <sch:rule context="//img:ICER_Parameters">
       <sch:assert test="(count(img:Image_Compression_Segment) = img:segment_count) or (count(img:Image_Compression_Segment) = 0)">
@@ -188,6 +195,13 @@
         IMG:error:video_child_check: img:Video must have at least 1 attribute or class specified.</sch:assert>
     </sch:rule>
   </sch:pattern>
+  <sch:pattern>
+    <sch:rule context="img:Autoexposure/img:auto_exposure_max_delta">
+      <sch:assert test="@unit = ('day', 'hr', 'julian day', 'microseconds', 'min', 'ms', 'ns', 's', 'yr')">
+        <title>img:Autoexposure/img:auto_exposure_max_delta/img:auto_exposure_max_delta</title>
+        The attribute @unit must be equal to one of the following values 'day', 'hr', 'julian day', 'microseconds', 'min', 'ms', 'ns', 's', 'yr'.</sch:assert>
+    </sch:rule>
+  </sch:pattern>
   <sch:pattern>
     <sch:rule context="img:Brightness_Correction_Image/pds:Internal_Reference">
       <sch:assert test="pds:reference_type = 'data_to_brightness_correction'">
@@ -450,25 +464,6 @@
         The attribute @unit must be equal to one of the following values 'W*m**-2*sr**-1*Hz**-1', 'W*m**-2*sr**-1*nm**-1', 'W*m**-2*sr**-1*um**-1', 'W*m**-3*sr**-1', 'W/m**2/sr/Hz', 'W/m**2/sr/nm', 'W/m**2/sr/μm', 'W/m**3/sr', 'uW*cm**-2*sr**-1*um**-1', 'μW/cm**2/sr/μm'.</sch:assert>
     </sch:rule>
   </sch:pattern>
-  <sch:pattern>
-    <sch:rule context="img:Nonlinear_Pixel/img:threshold_value" role="warning">
-      <sch:assert test="@unit != 'W*m**-2*sr**-1*Hz**-1'">
-        <title>img:Nonlinear_Pixel/img:threshold_value role="warning"/img:threshold_value</title>
-        The unit value W*m**-2*sr**-1*Hz**-1 is deprecated and should not be used.</sch:assert>
-      <sch:assert test="@unit != 'W*m**-2*sr**-1*nm**-1'">
-        <title>img:Nonlinear_Pixel/img:threshold_value role="warning"/img:threshold_value</title>
-        The unit value W*m**-2*sr**-1*nm**-1 is deprecated and should not be used.</sch:assert>
-      <sch:assert test="@unit != 'W*m**-2*sr**-1*um**-1'">
-        <title>img:Nonlinear_Pixel/img:threshold_value role="warning"/img:threshold_value</title>
-        The unit value W*m**-2*sr**-1*um**-1 is deprecated and should not be used.</sch:assert>
-      <sch:assert test="@unit != 'W*m**-3*sr**-1'">
-        <title>img:Nonlinear_Pixel/img:threshold_value role="warning"/img:threshold_value</title>
-        The unit value W*m**-3*sr**-1 is deprecated and should not be used.</sch:assert>
-      <sch:assert test="@unit != 'uW*cm**-2*sr**-1*um**-1'">
-        <title>img:Nonlinear_Pixel/img:threshold_value role="warning"/img:threshold_value</title>
-        The unit value uW*cm**-2*sr**-1*um**-1 is deprecated and should not be used.</sch:assert>
-    </sch:rule>
-  </sch:pattern>
   <sch:pattern>
     <sch:rule context="img:Onboard_Compression">
       <sch:assert test="if (img:deferred_flag) then img:deferred_flag = ('true', 'false') else true()">
@@ -574,32 +569,27 @@
         The attribute img:Radiometric_Correction/img:radiometric_type must be equal to one of the following values 'No CFA', 'Radiance Factor', 'Scaled Spectral Radiance', 'Spectral Radiance'.</sch:assert>
     </sch:rule>
   </sch:pattern>
+  <sch:pattern>
+    <sch:rule context="img:Sampling/img:crosstrack_summing">
+      <sch:assert test="@unit = ('DN', 'W/m**2/sr/nm/(DN/s)', 'electron/DN', 'pixel')">
+        <title>img:Sampling/img:crosstrack_summing/img:crosstrack_summing</title>
+        The attribute @unit must be equal to one of the following values 'DN', 'W/m**2/sr/nm/(DN/s)', 'electron/DN', 'pixel'.</sch:assert>
+    </sch:rule>
+  </sch:pattern>
+  <sch:pattern>
+    <sch:rule context="img:Sampling/img:downtrack_summing">
+      <sch:assert test="@unit = ('DN', 'W/m**2/sr/nm/(DN/s)', 'electron/DN', 'pixel')">
+        <title>img:Sampling/img:downtrack_summing/img:downtrack_summing</title>
+        The attribute @unit must be equal to one of the following values 'DN', 'W/m**2/sr/nm/(DN/s)', 'electron/DN', 'pixel'.</sch:assert>
+    </sch:rule>
+  </sch:pattern>
   <sch:pattern>
     <sch:rule context="img:Saturated_Pixel/img:threshold_value">
       <sch:assert test="@unit = ('W*m**-2*sr**-1*Hz**-1', 'W*m**-2*sr**-1*nm**-1', 'W*m**-2*sr**-1*um**-1', 'W*m**-3*sr**-1', 'W/m**2/sr/Hz', 'W/m**2/sr/nm', 'W/m**2/sr/μm', 'W/m**3/sr', 'uW*cm**-2*sr**-1*um**-1', 'μW/cm**2/sr/μm')">
         <title>img:Saturated_Pixel/img:threshold_value/img:threshold_value</title>
         The attribute @unit must be equal to one of the following values 'W*m**-2*sr**-1*Hz**-1', 'W*m**-2*sr**-1*nm**-1', 'W*m**-2*sr**-1*um**-1', 'W*m**-3*sr**-1', 'W/m**2/sr/Hz', 'W/m**2/sr/nm', 'W/m**2/sr/μm', 'W/m**3/sr', 'uW*cm**-2*sr**-1*um**-1', 'μW/cm**2/sr/μm'.</sch:assert>
     </sch:rule>
   </sch:pattern>
-  <sch:pattern>
-    <sch:rule context="img:Saturated_Pixel/img:threshold_value" role="warning">
-      <sch:assert test="@unit != 'W*m**-2*sr**-1*Hz**-1'">
-        <title>img:Saturated_Pixel/img:threshold_value role="warning"/img:threshold_value</title>
-        The unit value W*m**-2*sr**-1*Hz**-1 is deprecated and should not be used.</sch:assert>
-      <sch:assert test="@unit != 'W*m**-2*sr**-1*nm**-1'">
-        <title>img:Saturated_Pixel/img:threshold_value role="warning"/img:threshold_value</title>
-        The unit value W*m**-2*sr**-1*nm**-1 is deprecated and should not be used.</sch:assert>
-      <sch:assert test="@unit != 'W*m**-2*sr**-1*um**-1'">
-        <title>img:Saturated_Pixel/img:threshold_value role="warning"/img:threshold_value</title>
-        The unit value W*m**-2*sr**-1*um**-1 is deprecated and should not be used.</sch:assert>
-      <sch:assert test="@unit != 'W*m**-3*sr**-1'">
-        <title>img:Saturated_Pixel/img:threshold_value role="warning"/img:threshold_value</title>
-        The unit value W*m**-3*sr**-1 is deprecated and should not be used.</sch:assert>
-      <sch:assert test="@unit != 'uW*cm**-2*sr**-1*um**-1'">
-        <title>img:Saturated_Pixel/img:threshold_value role="warning"/img:threshold_value</title>
-        The unit value uW*cm**-2*sr**-1*um**-1 is deprecated and should not be used.</sch:assert>
-    </sch:rule>
-  </sch:pattern>
   <sch:pattern>
     <sch:rule context="img:Shutter_Subtraction">
       <sch:assert test="if (img:active_flag) then img:active_flag = ('true', 'false') else true()">
@@ -709,6 +699,13 @@
         The attribute @unit must be equal to one of the following values 'day', 'hr', 'julian day', 'microseconds', 'min', 'ms', 'ns', 's', 'yr'.</sch:assert>
     </sch:rule>
   </sch:pattern>
+  <sch:pattern>
+    <sch:rule context="img:Video/img:pre_video_delay">
+      <sch:assert test="@unit = ('day', 'hr', 'julian day', 'microseconds', 'min', 'ms', 'ns', 's', 'yr')">
+        <title>img:Video/img:pre_video_delay/img:pre_video_delay</title>
+        The attribute @unit must be equal to one of the following values 'day', 'hr', 'julian day', 'microseconds', 'min', 'ms', 'ns', 's', 'yr'.</sch:assert>
+    </sch:rule>
+  </sch:pattern>
   <sch:pattern>
     <sch:rule context="img:Video/pds:External_Reference">
       <sch:assert test="pds:reference_type = 'video_frame_to_video'">
@@ -723,4 +720,11 @@
         In img:Video, Internal_Reference.reference_type must be equal to 'video_frame_to_video'.</sch:assert>
     </sch:rule>
   </sch:pattern>
+  <sch:pattern>
+    <sch:rule context="img:White_Balance/img:white_balance_color_temp">
+      <sch:assert test="@unit = ('K', 'degC')">
+        <title>img:White_Balance/img:white_balance_color_temp/img:white_balance_color_temp</title>
+        The attribute @unit must be equal to one of the following values 'K', 'degC'.</sch:assert>
+    </sch:rule>
+  </sch:pattern>
 </sch:schema>