Skip to content

Update serializers #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 4, 2022
Merged

Update serializers #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7664bc
update serializer mongo
jonhealy1 Feb 4, 2022
efe6968
update es serializers
jonhealy1 Feb 4, 2022
20c955c
run pre-commit
jonhealy1 Feb 4, 2022
27994b3
update mongo version
jonhealy1 Feb 4, 2022
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
47 changes: 26 additions & 21 deletions stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,17 @@ def db_to_stac(cls, item: dict, base_url: str) -> stac_types.Item:

return stac_types.Item(
type="Feature",
stac_version=item["stac_version"],
stac_extensions=item["stac_extensions"] or [],
id=item["id"],
collection=item["collection"],
geometry=item["geometry"],
bbox=item["bbox"],
properties=item["properties"],
links=item_links,
assets=item["assets"],
stac_version=item["stac_version"] if "stac_version" in item else "",
stac_extensions=item["stac_extensions"]
if "stac_extensions" in item
else [],
id=item_id,
collection=item["collection"] if "collection" in item else "",
geometry=item["geometry"] if "geometry" in item else {},
bbox=item["bbox"] if "bbox" in item else [],
properties=item["properties"] if "properties" in item else {},
links=item_links if "links" in item else [],
assets=item["assets"] if "assets" in item else {},
)


Expand All @@ -63,20 +65,23 @@ def db_to_stac(cls, collection: dict, base_url: str) -> stac_types.Collection:
if original_links:
collection_links += resolve_links(original_links, base_url)

if "providers" not in collection:
collection["providers"] = {}

return stac_types.Collection(
type="Collection",
id=collection["id"],
stac_extensions=collection["stac_extensions"] or [],
stac_version=collection["stac_version"],
title=collection["title"],
description=collection["description"],
keywords=collection["keywords"],
license=collection["license"],
providers=collection["providers"],
summaries=collection["summaries"],
extent=collection["extent"],
stac_extensions=collection["stac_extensions"]
if "stac_extensions" in collection
else [],
stac_version=collection["stac_version"]
if "stac_version" in collection
else "",
title=collection["title"] if "title" in collection else "",
description=collection["description"]
if "description" in collection
else "",
keywords=collection["keywords"] if "keywords" in collection else [],
license=collection["license"] if "license" in collection else "",
providers=collection["providers"] if "providers" in collection else {},
summaries=collection["summaries"] if "summaries" in collection else {},
extent=collection["extent"] if "extent" in collection else {},
links=collection_links,
)
47 changes: 26 additions & 21 deletions stac_fastapi/mongo/stac_fastapi/mongo/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,17 @@ def db_to_stac(cls, item: dict, base_url: str) -> stac_types.Item:

return stac_types.Item(
type="Feature",
stac_version=item["stac_version"],
stac_extensions=item["stac_extensions"] or [],
id=item["id"],
collection=item["collection"],
geometry=item["geometry"],
bbox=item["bbox"],
properties=item["properties"],
links=item_links,
assets=item["assets"],
stac_version=item["stac_version"] if "stac_version" in item else "",
stac_extensions=item["stac_extensions"]
if "stac_extensions" in item
else [],
id=item_id,
collection=item["collection"] if "collection" in item else "",
geometry=item["geometry"] if "geometry" in item else {},
bbox=item["bbox"] if "bbox" in item else [],
properties=item["properties"] if "properties" in item else {},
links=item_links if "links" in item else [],
assets=item["assets"] if "assets" in item else {},
)


Expand All @@ -63,20 +65,23 @@ def db_to_stac(cls, collection: dict, base_url: str) -> stac_types.Collection:
if original_links:
collection_links += resolve_links(original_links, base_url)

if "providers" not in collection:
collection["providers"] = {}

return stac_types.Collection(
type="Collection",
id=collection["id"],
stac_extensions=collection["stac_extensions"] or [],
stac_version=collection["stac_version"],
title=collection["title"],
description=collection["description"],
keywords=collection["keywords"],
license=collection["license"],
providers=collection["providers"],
summaries=collection["summaries"],
extent=collection["extent"],
stac_extensions=collection["stac_extensions"]
if "stac_extensions" in collection
else [],
stac_version=collection["stac_version"]
if "stac_version" in collection
else "",
title=collection["title"] if "title" in collection else "",
description=collection["description"]
if "description" in collection
else "",
keywords=collection["keywords"] if "keywords" in collection else [],
license=collection["license"] if "license" in collection else "",
providers=collection["providers"] if "providers" in collection else {},
summaries=collection["summaries"] if "summaries" in collection else {},
extent=collection["extent"] if "extent" in collection else {},
links=collection_links,
)
2 changes: 1 addition & 1 deletion stac_fastapi/mongo/stac_fastapi/mongo/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
"""library version."""
__version__ = "2.3.1"
__version__ = "2.3.0"