TIME8 now represents datetime64

Author: jpswinski

sliderule/sliderule.py

@@ -119,7 +119,7 @@
     "BITFIELD": { "fmt": 'x', "size": 0, "nptype": numpy.byte   },  # unsupported
     "FLOAT":    { "fmt": 'f', "size": 4, "nptype": numpy.single },
     "DOUBLE":   { "fmt": 'd', "size": 8, "nptype": numpy.double },
-    "TIME8":    { "fmt": 'Q', "size": 8, "nptype": numpy.int64  },
+    "TIME8":    { "fmt": 'Q', "size": 8, "nptype": numpy.datetime64 },
     "STRING":   { "fmt": 's', "size": 1, "nptype": numpy.byte   }
 }
 

tests/test_geojson.py

@@ -10,7 +10,7 @@
 
 @pytest.mark.network
 class TestGeoJson:
-    def test_atl06(self, domain, asset, organization):
+    def test_atl03(self, domain, asset, organization):
         icesat2.init(domain, organization=organization)
         for testfile in ["data/grandmesa.geojson", "data/grandmesa.shp"]:
             region = sliderule.toregion(os.path.join(TESTDIR, testfile))

tests/test_parquet.py

@@ -2,6 +2,7 @@
 
 import pytest
 from pathlib import Path
+import numpy
 import os
 import os.path
 import sliderule
@@ -26,7 +27,7 @@ def test_atl06(self, domain, asset, organization):
                   "output": { "path": "testfile1.parquet", "format": "parquet", "open_on_complete": True } }
         gdf = icesat2.atl06p(parms, asset=asset, resources=[resource])
         assert len(gdf) == 964
-        assert len(gdf.keys()) == 17
+        assert len(gdf.keys()) == 16
         assert gdf["rgt"][0] == 1160
         assert gdf["cycle"][0] == 2
         assert gdf['segment_id'].describe()["min"] == 405240
@@ -48,9 +49,49 @@ def test_atl03(self, domain, asset, organization):
                   "output": { "path": "testfile2.parquet", "format": "parquet", "open_on_complete": True } }
         gdf = icesat2.atl03sp(parms, asset=asset, resources=[resource])
         assert len(gdf) == 194696
-        assert len(gdf.keys()) == 18
+        assert len(gdf.keys()) == 17
         assert gdf["rgt"][0] == 1160
         assert gdf["cycle"][0] == 2
         assert gdf['segment_id'].describe()["min"] == 405240
         assert gdf['segment_id'].describe()["max"] == 405915
         os.remove("testfile2.parquet")
+
+    def test_atl06_index(self, domain, asset, organization):
+        icesat2.init(domain, organization=organization)
+        resource = "ATL03_20181017222812_02950102_005_01.h5"
+        region = sliderule.toregion(os.path.join(TESTDIR, "data/grandmesa.geojson"))
+        parms = {
+            "poly": region["poly"],
+            "raster": region["raster"],
+            "srt": icesat2.SRT_LAND,
+            "cnf": icesat2.CNF_SURFACE_HIGH,
+            "ats": 10.0,
+            "cnt": 10,
+            "len": 40.0,
+            "res": 20.0,
+            "output": { "path": "testfile3.parquet", "format": "parquet", "open_on_complete": True } }
+        gdf = icesat2.atl06p(parms, asset=asset, resources=[resource])
+        assert len(gdf) == 275
+        assert gdf.index.values.min() == numpy.datetime64('2018-10-17T22:31:35.330187264')
+        assert gdf.index.values.max() == numpy.datetime64('2018-10-17T22:31:37.693747456')
+        os.remove("testfile3.parquet")
+
+    def test_atl03_index(self, domain, asset, organization):
+        icesat2.init(domain, organization=organization)
+        resource = "ATL03_20181017222812_02950102_005_01.h5"
+        region = sliderule.toregion(os.path.join(TESTDIR, "data/grandmesa.geojson"))
+        parms = {
+            "poly": region["poly"],
+            "raster": region["raster"],
+            "srt": icesat2.SRT_LAND,
+            "cnf": icesat2.CNF_SURFACE_HIGH,
+            "ats": 10.0,
+            "cnt": 10,
+            "len": 40.0,
+            "res": 20.0,
+            "output": { "path": "testfile4.parquet", "format": "parquet", "open_on_complete": True } }
+        gdf = icesat2.atl03sp(parms, asset=asset, resources=[resource])
+        assert len(gdf) == 21029
+        assert gdf.index.values.min() == numpy.datetime64('2018-10-17T22:31:35.330047488')
+        assert gdf.index.values.max() == numpy.datetime64('2018-10-17T22:31:37.695347456')
+        os.remove("testfile4.parquet")