-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Update openapi and landing page info * Set new contact info * Fix imports * Use openapi metadata in ladingpage metadata
- Loading branch information
1 parent
a32542d
commit 9a28654
Showing
3 changed files
with
65 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,7 +26,12 @@ | |
from grpc_getter import get_ts_ag_request | ||
|
||
import datastore_pb2 as dstore | ||
from utilities import get_unique_values_for_metadata, seconds_to_iso_8601_duration, convert_cm_to_m | ||
from utilities import get_unique_values_for_metadata | ||
from utilities import seconds_to_iso_8601_duration | ||
from utilities import convert_cm_to_m | ||
|
||
from openapi.openapi_metadata import openapi_metadata | ||
|
||
|
||
logger = logging.getLogger(__name__) | ||
logger.setLevel(logging.INFO) | ||
|
@@ -56,14 +61,35 @@ def datetime_to_iso_string(value: datetime) -> str: | |
|
||
def get_landing_page(request): | ||
return LandingPageModel( | ||
title="E-SOH EDR API", | ||
description="The E-SOH EDR API", | ||
keywords=["weather", "temperature", "wind", "humidity", "pressure", "clouds", "radiation"], | ||
provider=Provider(name="RODEO", url="https://rodeo-project.eu/"), | ||
contact=Contact(email="[email protected]"), | ||
title=openapi_metadata["title"], | ||
description=openapi_metadata["description"], | ||
keywords=[ | ||
"weather", | ||
"temperature", | ||
"wind", | ||
"humidity", | ||
"pressure", | ||
"clouds", | ||
"radiation", | ||
], | ||
provider=Provider( | ||
name=openapi_metadata["contact"]["name"], | ||
url=openapi_metadata["contact"]["url"], | ||
), | ||
contact=Contact(email=openapi_metadata["contact"]["email"]), | ||
links=[ | ||
Link(href=f"{request.url}", rel="self", title="Landing Page in JSON", type="application/json"), | ||
Link(href=f"{request.url}docs", rel="service-doc", title="API description in HTML", type="text/html"), | ||
Link( | ||
href=f"{request.url}", | ||
rel="self", | ||
title="Landing Page in JSON", | ||
type="application/json", | ||
), | ||
Link( | ||
href=f"{request.url}docs", | ||
rel="service-doc", | ||
title="API description in HTML", | ||
type="text/html", | ||
), | ||
Link( | ||
href=f"{request.url}openapi.json", | ||
rel="service-desc", | ||
|
@@ -76,7 +102,11 @@ def get_landing_page(request): | |
title="Conformance Declaration in JSON", | ||
type="application/json", | ||
), | ||
Link(href=f"{request.url}collections", rel="data", title="Collections metadata in JSON"), | ||
Link( | ||
href=f"{request.url}collections", | ||
rel="data", | ||
title="Collections metadata in JSON", | ||
), | ||
], | ||
) | ||
|
||
|
@@ -155,7 +185,14 @@ async def get_collection_metadata(base_url: str, is_self) -> Collection: | |
], | ||
extent=Extent( | ||
spatial=Spatial( | ||
bbox=[[spatial_extent.left, spatial_extent.bottom, spatial_extent.right, spatial_extent.top]], | ||
bbox=[ | ||
[ | ||
spatial_extent.left, | ||
spatial_extent.bottom, | ||
spatial_extent.right, | ||
spatial_extent.top, | ||
] | ||
], | ||
crs="EPSG:4326", | ||
), | ||
temporal=Temporal( | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
openapi_metadata = { | ||
"title": "EDR Observations API Europe EUMETNET", | ||
"description": ( | ||
"OGC EDR API data service for European meteoroligical observations from EUMETNET," | ||
" co-funded by the European Union." | ||
), | ||
"contact": { | ||
"name": "EUMETNET", | ||
"url": "https://www.eumetnet.eu/about-us/", | ||
"email": "[email protected]", | ||
}, | ||
"license_info": { | ||
"name": "CC-BY-4.0", | ||
"url": "https://creativecommons.org/licenses/by/4.0/", | ||
}, | ||
} |
9a28654
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unit Test Coverage Report