Merge pull request #142 from jmfee-usgs/negative-urlinterval

Add check for negative size when generating intervals

geomagio/Util.py

@@ -70,6 +70,7 @@ def get_intervals(starttime, endtime, size=86400, align=True, trim=False):
         end of time interval to divide
     size : int
         size of each interval in seconds.
+        when <= 0, returns one interval from start to end.
     align : bool
         align intervals to unix epoch.
         (works best when size evenly divides a day)
@@ -82,6 +83,11 @@ def get_intervals(starttime, endtime, size=86400, align=True, trim=False):
         each dictionary has the keys "starttime" and "endtime"
         which represent [intervalstart, intervalend).
     """
+    if size <= 0:
+        return [{
+            'start': starttime,
+            'end': endtime
+        }]
     if align:
         # align based on size
         time = starttime - (starttime.timestamp % size)

test/Util_test.py

@@ -57,6 +57,17 @@ def test_get_interval__custom_size():
     assert_equals(len(intervals), 24)
 
 
+def test_get_interval__negative_size():
+    """Util_test.test_get_interval__negative_size()
+    """
+    starttime = UTCDateTime('2015-01-01T00:00:00Z')
+    endtime = UTCDateTime('2015-01-02T00:00:00Z')
+    intervals = Util.get_intervals(starttime, endtime, size=-1)
+    assert_equals(len(intervals), 1)
+    assert_equals(intervals[0]['start'], starttime)
+    assert_equals(intervals[0]['end'], endtime)
+
+
 def test_get_interval__trim():
     """Util_test.test_get_interval__trim()
     """