Skip to content

Commit

Permalink
Merge branch 'develop' into feature/issue-100
Browse files Browse the repository at this point in the history
  • Loading branch information
nikki-t committed May 8, 2024
2 parents b64fa6d + e4bacfb commit a3d73e8
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 2 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

### Added
- Issue 101 - Add support for HTTP Accept header
- Issue 100 - Add option to 'compact' GeoJSON result into single feature
- Issue 101 - Add support for HTTP Accept header
- Issue 102 - Enable compression for API Responses
### Deprecated
### Removed
### Fixed
Expand Down
9 changes: 9 additions & 0 deletions hydrocron/api/controllers/timeseries.py
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,15 @@ def add_units(gdf, columns):
def get_response(results, hits, elapsed, return_type, output, compact):
"""Create and return HTTP response based on results.
:param results: Dictionary of SWOT timeseries results
:type results: dict
:param hits: Number of results returned from query
:type hits: int
:param elapsed: Number of seconds it took to query for results
:type elapsed: float
:param return_type: Accept request header
:type return_type: str
:param output: Output to return in request
:param results: Dictionary of SWOT timeseries results
:type results: dict
:param hits: Number of results returned from query
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "hydrocron"
version = "1.3.0a2"
version = "1.3.0a4"
description = "OpenAPI access to Time Series data for SWOT features"
authors = ["PO.DAAC <podaac@jpl.nasa.gov>"]
license = "Apache-2.0"
Expand Down
1 change: 1 addition & 0 deletions terraform/hydrocron-apigw.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ resource "aws_api_gateway_rest_api" "hydrocron-api-gateway" {
lifecycle {
prevent_destroy = true
}
minimum_compression_size = 20480
}

resource "aws_api_gateway_rest_api_policy" "hydrocron-api-gateway-policy" {
Expand Down

0 comments on commit a3d73e8

Please sign in to comment.