diff --git a/aosstower/level_00/parser.py b/aosstower/level_00/parser.py index d30fcef7e2adaf229ef2ed56175431c5c60ca833..b5413ad360b867a6e2ae97e621c31f579d8ec202 100644 --- a/aosstower/level_00/parser.py +++ b/aosstower/level_00/parser.py @@ -45,7 +45,7 @@ import time import logging from datetime import datetime, timedelta -from metobscommon.data.data_time import hhmm_to_offset +from metobscommon.util.mytime import hhmm_to_offset from aosstower.schema import database LOG = logging.getLogger(__name__) diff --git a/aosstower/level_00/rrd.py b/aosstower/level_00/rrd.py index 2c70f5e0b9546b3f3088c5280a0b9d34ee7bb8ff..084911197b85d28d29d7570b10a78a699a8dbe29 100644 --- a/aosstower/level_00/rrd.py +++ b/aosstower/level_00/rrd.py @@ -7,7 +7,7 @@ from datetime import datetime, timedelta import rrdtool from metobscommon.data.calc import altimeter, dewpoint, wind_vector_components -from metobscommon.data.data_time import to_unix_timestamp +from metobscommon.util.mytime import to_epoch from aosstower import station @@ -42,7 +42,7 @@ def initialize_rrd(filepath, start=None, days=365, data_interval=5): assert not os.path.exists(filepath), "DB already exists" start = start or (datetime.utcnow() - timedelta(days=days)) # normalize start to data interval - secs = to_unix_timestamp(start) + secs = to_epoch(start) secs -= secs % data_interval rrdtool.create(filepath,