Merge pull request #428 from jbouffard/bug-fix/metadata-serialization

 Bounds Containing SpaceTimeKeys Can Now be Serialized

Author: jbouffard

geopyspark/geotrellis/__init__.py

@@ -1,6 +1,7 @@
 """This subpackage contains the code that reads, writes, and processes data using GeoTrellis."""
 from collections import namedtuple
 import warnings
+import datetime
 import functools
 import datetime
 from shapely.geometry import box
@@ -9,6 +10,13 @@
 from geopyspark.geotrellis.constants import CellType, NO_DATA_INT
 
 
+_EPOCH = datetime.datetime.utcfromtimestamp(0)
+
+
+def _convert_to_unix_time(date_time):
+    return int((date_time - _EPOCH).total_seconds() * 1000)
+
+
 def deprecated(func):
     """This is a decorator which can be used to mark functions
     as deprecated. It will result in a warning being emmitted
@@ -399,15 +407,12 @@ class Bounds(namedtuple("Bounds", 'minKey maxKey')):
     __slots__ = []
 
     def _asdict(self):
-        if isinstance(self.minKey, dict):
-            min_key_dict = self.minKey
-        else:
-            min_key_dict = self.minKey._asdict()
+        min_key_dict = self.minKey._asdict()
+        max_key_dict = self.maxKey._asdict()
 
-        if isinstance(self.maxKey, dict):
-            max_key_dict = self.maxKey
-        else:
-            max_key_dict = self.maxKey._asdict()
+        if hasattr(self.minKey, 'instant'):
+            min_key_dict['instant'] = _convert_to_unix_time(min_key_dict['instant'])
+            max_key_dict['instant'] = _convert_to_unix_time(max_key_dict['instant'])
 
         return {'minKey': min_key_dict, 'maxKey': max_key_dict}
 

geopyspark/geotrellis/protobufcodecs.py

@@ -6,7 +6,7 @@
 ensure_pyspark()
 
 from geopyspark.geotrellis import (Extent, ProjectedExtent, TemporalProjectedExtent, SpatialKey,
-                                   SpaceTimeKey, Tile)
+                                   SpaceTimeKey, Tile, _convert_to_unix_time)
 
 from geopyspark.geotrellis.protobuf.tileMessages_pb2 import ProtoTile, ProtoMultibandTile, ProtoCellType
 from geopyspark.geotrellis.protobuf import keyMessages_pb2
@@ -25,12 +25,6 @@
     7: 'DOUBLE'
 }
 
-_EPOCH = datetime.datetime.utcfromtimestamp(0)
-
-
-def _convert_to_unix_time(date_time):
-    return int((date_time - _EPOCH).total_seconds() * 1000)
-
 
 # DECODERS