Merge pull request #606 from ngageoint/integration/1.3.62

Release v1.3.62

Author: petersontex

sarpy/__about__.py

@@ -28,7 +28,7 @@
 
 from sarpy.__details__ import __classification__, _post_identifier
 
-__version__ = "1.3.61.1"
+__version__ = "1.3.62"
 
 __author__ = "National Geospatial-Intelligence Agency"
 __url__ = "https://github.com/ngageoint/sarpy"

sarpy/io/DEM/DTED.py

@@ -651,7 +651,7 @@ def from_reference_point(cls, ref_point, dted_list, dem_type=None, geoid_file=No
         DTEDInterpolator
         """
 
-        pad_value = float(pad_value)
+        pad_value = abs( float(pad_value) )
         if pad_value > 0.5:
             pad_value = 0.5
         if pad_value < 0.05:
@@ -660,7 +660,7 @@ def from_reference_point(cls, ref_point, dted_list, dem_type=None, geoid_file=No
         lat_max = min(ref_point[0] + lat_diff, 90)
         lat_min = max(ref_point[0] - lat_diff, -90)
 
-        lon_diff = min(15, lat_diff/(numpy.sin(numpy.deg2rad(ref_point[0]))))
+        lon_diff = min(15, abs( lat_diff/(numpy.cos(numpy.deg2rad(ref_point[0])))))
         lon_max = ref_point[1] + lon_diff
         if lon_max > 180:
             lon_max -= 360

sarpy/io/general/nitf.py

@@ -2693,7 +2693,9 @@ def item_bytes(self, value: Union[bytes, Sequence]) -> None:
                 'item_bytes input has size {},\n\t'
                 'but item_size has been defined as {}.'.format(len(value), self._item_size))
         self._item_bytes = value
-        self.item_size = len(value)
+        if self._item_size is None or self.item_size != len(value):
+            self.item_size = len(value)
+        
 
     @property
     def item_written(self) -> bool:
@@ -4125,9 +4127,7 @@ def get_data_segments(self) -> List[DataSegment]:
 
     def flush(self, force: bool = False) -> None:
         self._validate_closed()
-
         BaseWriter.flush(self, force=force)
-
         try:
             if self._in_memory:
                 if self._image_segment_data_segments is not None:

sarpy/io/general/slice_parsing.py

@@ -147,10 +147,12 @@ def verify_subscript(
                 subscript = subscript[:ellipsis_location]
             elif ellipsis_location == 0:
                 init_pad = ndim - len(subscript) + 1
-                subscript = tuple([None, ]*init_pad) + subscript[1:]
+                subscript = tuple([None, ]*init_pad) + tuple(subscript[1:])
             else:  # ellipsis in the middle
                 middle_pad = ndim - len(subscript) + 1
-                subscript = subscript[:ellipsis_location] + tuple([None, ]*middle_pad) + subscript[ellipsis_location+1:]
+                subscript = tuple(subscript[:ellipsis_location]) + \
+                    tuple([None, ]*middle_pad) + \
+                        tuple(subscript[ellipsis_location+1:])
 
         if len(subscript) > ndim:
             raise ValueError('More subscript entries ({}) than shape dimensions ({}).'.format(len(subscript), ndim))

sarpy/io/product/sidd.py

@@ -656,7 +656,17 @@ def _get_ftitle(self, index: int = 0) -> str:
             ftitle = 'SIDD: Unknown'
         return ftitle
 
+    # File Creation DateTime
     def _get_fdt(self, index: int) -> Optional[str]:
+        sidd = self.sidd_meta[index]
+        if sidd.ProductCreation.ProcessorInformation.ProcessingDateTime is not None:
+            the_time = sidd.ProductCreation.ProcessorInformation.ProcessingDateTime.astype('datetime64[s]')
+            return re.sub(r'[^0-9]', '', str(the_time))
+        else:
+            return None
+
+    # Image Acquisition (Collection) Datetime
+    def _get_collection_datetime(self, index: int) -> Optional[str]:   
         sidd = self.sidd_meta[index]
         if sidd.ExploitationFeatures.Collections[0].Information.CollectionDateTime is not None:
             the_time = sidd.ExploitationFeatures.Collections[0].Information.CollectionDateTime.astype('datetime64[s]')
@@ -730,7 +740,7 @@ def _create_image_segment_for_sidd(
             'IC': 'NC',
             'IID2': self._get_iid2(sidd_index),
             'ISORCE': self._get_isorce(sidd_index),
-            'IDATIM': self._get_fdt(sidd_index)
+            'IDATIM': self._get_collection_datetime(sidd_index)
         }
 
         if sidd.Display.PixelType == 'MONO8I':

sarpy/io/product/sidd2_elements/Compression.py

@@ -7,6 +7,7 @@
 
 from typing import Union
 
+import xml.etree.ElementTree
 import numpy
 
 from sarpy.io.xml.base import Serializable
@@ -16,6 +17,8 @@
 from .base import DEFAULT_STRICT, FLOAT_FORMAT
 
 
+# default_strict is set to False which is why invalid types don't throw an error for NumWaveletLevels, NumBands, or LayerInfo
+
 class J2KSubtype(Serializable):
     """
     The Jpeg 2000 subtype.
@@ -55,9 +58,38 @@ def __init__(self, NumWaveletLevels=None, NumBands=None, LayerInfo=None, **kwarg
             self._xml_ns_key = kwargs['_xml_ns_key']
         self.NumWaveletLevels = NumWaveletLevels
         self.NumBands = NumBands
-        self.LayerInfo = LayerInfo
+        self.setLayerInfoType(LayerInfo)
         super(J2KSubtype, self).__init__(**kwargs)
 
+    def setLayerInfoType(self, obj):
+        """
+        Since the LayerInfo is defined as an array of bit rates in the definition above and SarPy returns an
+        element tree with the bit rates nested within different layers, this function is used to parse and return
+        LayerInfo as an array of bit rates
+        """
+        # if LayerInfo is an ElementTree as expected, then it gets parsed to return an array of bit rates
+        ET = xml.etree.ElementTree
+        if isinstance( obj, ET.Element):
+            numLayers = int(obj.attrib['numLayers'])
+            if (numLayers == 0):
+                return
+            bitrates = numpy.zeros(numLayers)
+          
+            for i in range(numLayers):
+                bitrates[i] = float(obj[i][0].text)
+            self.LayerInfo = bitrates
+
+        # if LayerInfo is a numpy.ndarray, a  list, or a tuple per the above definition, return LayerInfo
+        elif isinstance(obj, (list, tuple, numpy.ndarray)):
+            self.LayerInfo = obj 
+
+        # none object handler since it states that LayerInfo can be None in the definition above and it isn't a required field
+        elif obj is None:
+            self.LayerInfo = None
+
+        # throw an error if LayerInfo is an invalid type and an array of bitrates is unable to be generated
+        else:
+            raise TypeError(f'Invalid input type for LayerInfo: {type(obj)}. Must be an ElementTree, list, tuple, ndarray, or None.')
 
 class J2KType(Serializable):
     """
@@ -110,4 +142,4 @@ def __init__(self, J2K=None, **kwargs):
         if '_xml_ns_key' in kwargs:
             self._xml_ns_key = kwargs['_xml_ns_key']
         self.J2K = J2K
-        super(CompressionType, self).__init__(**kwargs)
+        super(CompressionType, self).__init__(**kwargs)