Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions marble_api/versions/v1/data_request/models.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from collections.abc import Sized
from datetime import timezone
from typing import Required, TypedDict

from bson import ObjectId
Expand Down Expand Up @@ -124,11 +125,11 @@ def stac_item(self) -> Item:

# STAC spec recommends including datetime even if using start_datetime and end_datetime
# See: https://github.com/radiantearth/stac-spec/blob/master/best-practices.md#datetime-selection
item["properties"]["datetime"] = self.temporal[0].isoformat()
item["properties"]["datetime"] = self.temporal[0].astimezone(timezone.utc).isoformat()

if len(set(self.temporal)) > 1:
item["properties"]["start_datetime"], item["properties"]["end_datetime"] = [
t.isoformat() for t in self.temporal
t.astimezone(timezone.utc).isoformat() for t in self.temporal
]

if self.geometry:
Expand Down
22 changes: 22 additions & 0 deletions test/unit/versions/v1/data_request/test_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,28 @@ def test_range_temporal(self, fake_class):
assert request.stac_item["properties"]["start_datetime"] == temporal[0].isoformat()
assert request.stac_item["properties"]["end_datetime"] == temporal[1].isoformat()

def test_temporal_to_utc(self, fake_class):
now = datetime.datetime.now(tz=datetime.timezone.utc)
offset = datetime.timezone(datetime.timedelta(hours=3))
temporal = [now, now + datetime.timedelta(hours=1)]
temporal_offset = [t.astimezone(offset) for t in temporal]
request = fake_class(temporal=temporal_offset)
assert (
request.stac_item["properties"]["datetime"]
== temporal[0].isoformat()
== temporal_offset[0].astimezone(datetime.timezone.utc).isoformat()
)
assert (
request.stac_item["properties"]["start_datetime"]
== temporal[0].isoformat()
== temporal_offset[0].astimezone(datetime.timezone.utc).isoformat()
)
assert (
request.stac_item["properties"]["end_datetime"]
== temporal[1].isoformat()
== temporal_offset[1].astimezone(datetime.timezone.utc).isoformat()
)

def test_extra_properties(self, fake_class):
request = fake_class()
item = request.stac_item
Expand Down