If hdate in tree use hdate instead of date

covjsonkit/__init__.py

@@ -1,7 +0,0 @@
-import covjsonkit.api
-import covjsonkit.decoder.TimeSeries
-import covjsonkit.decoder.VerticalProfile
-import covjsonkit.encoder.TimeSeries
-import covjsonkit.encoder.VerticalProfile
-
-from .version import __version__

covjsonkit/encoder/BoundingBox.py

@@ -131,7 +131,8 @@ def from_polytope(self, result):
         fields["levels"] = [0]
 
         self.walk_tree(result, fields, coords, mars_metadata, range_dict)
-
+        if "hdate" in mars_metadata:
+            fields["dates"].remove(mars_metadata["Forecast date"] + "Z")
         logging.debug("The values returned from walking tree: %s", range_dict)  # noqa: E501
         logging.debug("The coordinates returned from walking tree: %s", coords)  # noqa: E501
 

covjsonkit/encoder/Circle.py

@@ -129,6 +129,8 @@ def from_polytope(self, result):
 
         self.walk_tree(result, fields, coords, mars_metadata, range_dict)
 
+        if "hdate" in mars_metadata:
+            fields["dates"].remove(mars_metadata["Forecast date"] + "Z")
         logging.debug("The values returned from walking tree: %s", range_dict)  # noqa: E501
         logging.debug("The coordinates returned from walking tree: %s", coords)  # noqa: E501
 

covjsonkit/encoder/Frame.py

@@ -129,6 +129,8 @@ def from_polytope(self, result):
 
         self.walk_tree(result, fields, coords, mars_metadata, range_dict)
 
+        if "hdate" in mars_metadata:
+            fields["dates"].remove(mars_metadata["Forecast date"] + "Z")
         logging.debug("The values returned from walking tree: %s", range_dict)  # noqa: E501
         logging.debug("The coordinates returned from walking tree: %s", coords)  # noqa: E501
 

covjsonkit/encoder/Grid.py

@@ -135,6 +135,8 @@ def from_polytope(self, result):
 
         self.walk_tree(result, fields, coords, mars_metadata, range_dict)
 
+        if "hdate" in mars_metadata:
+            fields["dates"].remove(mars_metadata["Forecast date"] + "Z")
         logging.debug("The values returned from walking tree: %s", range_dict)  # noqa: E501
         logging.debug("The coordinates returned from walking tree: %s", coords)  # noqa: E501
 

covjsonkit/encoder/Path.py

@@ -131,6 +131,8 @@ def from_polytope(self, result):
 
         self.walk_tree(result, fields, coords, mars_metadata, range_dict)
 
+        if "hdate" in mars_metadata:
+            fields["dates"].remove(mars_metadata["Forecast date"] + "Z")
         if len(fields["l"]) == 0:
             fields["l"] = [0]
 

covjsonkit/encoder/Position.py

@@ -150,6 +150,9 @@ def from_polytope(self, result):
         logging.debug("Tree walking ends at: %s", end)  # noqa: E501
         logging.debug("Tree walking takes: %s", delta)  # noqa: E501
 
+        if "hdate" in mars_metadata:
+            fields["dates"].remove(mars_metadata["Forecast date"] + "Z")
+
         start = time.time()
         logging.debug("Coords creation: %s", start)  # noqa: E501
 

covjsonkit/encoder/Shapefile.py

@@ -129,6 +129,9 @@ def from_polytope(self, result):
 
         self.walk_tree(result, fields, coords, mars_metadata, range_dict)
 
+        if "hdate" in mars_metadata:
+            fields["dates"].remove(mars_metadata["Forecast date"] + "Z")
+
         logging.debug("The values returned from walking tree: %s", range_dict)  # noqa: E501
         logging.debug("The coordinates returned from walking tree: %s", coords)  # noqa: E501
 

covjsonkit/encoder/TimeSeries.py

@@ -145,6 +145,12 @@ def from_polytope(self, result):
         start = time.time()
         logging.debug("Tree walking starts at: %s", start)  # noqa: E501
         self.walk_tree(result, fields, coords, mars_metadata, range_dict)
+        print("coords: ", coords)
+        print("fields: ", fields)
+        print("mars_metadata: ", mars_metadata)
+        print("range_dict: ", range_dict)
+        if "hdate" in mars_metadata:
+            fields["dates"].remove(mars_metadata["Forecast date"] + "Z")
         end = time.time()
         delta = end - start
         logging.debug("Tree walking ends at: %s", end)  # noqa: E501

covjsonkit/encoder/VerticalProfile.py

@@ -141,6 +141,9 @@ def from_polytope(self, result):
         logging.debug("Tree walking ends at: %s", end)  # noqa: E501
         logging.debug("Tree walking takes: %s", delta)  # noqa: E501
 
+        if "hdate" in mars_metadata:
+            fields["dates"].remove(mars_metadata["Forecast date"] + "Z")
+
         start = time.time()
         logging.debug("Coords creation: %s", start)  # noqa: E501
 

covjsonkit/encoder/encoder.py

@@ -173,6 +173,13 @@ def handle_specific_axes(child):
                     coords[date]["composite"] = []
                     coords[date]["t"] = [date]
                 return dates
+            if child.axis.name == "hdate":
+                hdates = [f"{hdate}Z" for hdate in child.values]
+                for hdate in hdates:
+                    coords[hdate] = {}
+                    coords[hdate]["composite"] = []
+                    coords[hdate]["t"] = [hdate]
+                return hdates
             if child.axis.name == "number":
                 return child.values
             if child.axis.name == "step":
@@ -202,6 +209,8 @@ def append_composite_coords(dates, tree_values, lat, coords):
                             fields["l"].extend(result)
                     elif child.axis.name == "param":
                         fields["param"] = result
+                    elif child.axis.name in "hdate":
+                        fields["dates"].extend(result)
                     elif child.axis.name in ["date", "time"]:
                         fields["dates"].extend(result)
                     elif child.axis.name == "number":