RSPY550: Remove default geometry from cadip/auxip (#878)

* Removed default geometry from CADIP/AUXIP

* Handling of geom in catalog side

* Fix GET response

* Fix for tests

* Small comment

Author: Padeanu

services/catalog/rs_server_catalog/user_catalog.py

@@ -90,7 +90,11 @@
 
 PRESIGNED_URL_EXPIRATION_TIME = int(os.environ.get("RSPY_PRESIGNED_URL_EXPIRATION_TIME", "1800"))  # 30 minutes
 CATALOG_BUCKET = os.environ.get("RSPY_CATALOG_BUCKET", "rs-cluster-catalog")
-
+DEFAULT_GEOM = {
+    "type": "Polygon",
+    "coordinates": [[[-180, -90], [180, -90], [180, 90], [-180, 90], [-180, -90]]],
+}
+DEFAULT_BBOX = (-180.0, -90.0, 180.0, 90.0)
 # pylint: disable=too-many-lines
 logger = Logging.default(__name__)
 
@@ -697,6 +701,7 @@ async def manage_put_post_request(  # pylint: disable=too-many-statements,too-ma
             content = await request.json()
             if not self.request_ids["owner_id"]:
                 self.request_ids["owner_id"] = get_user(None, self.request_ids["user_login"])
+            # If item is not geolocated, add a default one to comply pgstac format.
             if (  # If we are in cluster mode and the user_login is not authorized
                 # to put/post returns a HTTP_401_UNAUTHORIZED status.
                 common_settings.CLUSTER_MODE
@@ -768,6 +773,11 @@ async def manage_put_post_request(  # pylint: disable=too-many-statements,too-ma
                             original_published=published,
                             original_expires=expires,
                         )
+                    # If item doesn't contain a geometry/bbox, just fill with a default one.
+                    if not content.get("geometry", None):
+                        content["geometry"] = DEFAULT_GEOM
+                    if not content.get("bbox", None):
+                        content["bbox"] = DEFAULT_BBOX
                 if hasattr(content, "status_code"):
                     return content
 
@@ -885,6 +895,11 @@ async def manage_get_response(  # pylint: disable=too-many-locals, too-many-bran
         auth_roles = []
         user_login = ""
 
+        if content.get("geometry") == DEFAULT_GEOM:
+            content["geometry"] = None
+        if content.get("bbox") == DEFAULT_BBOX:
+            content["bbox"] = None
+
         if common_settings.CLUSTER_MODE:  # Get the list of access and the user_login calling the endpoint.
             auth_roles = request.state.auth_roles
             user_login = request.state.user_login
@@ -1044,7 +1059,7 @@ async def manage_put_post_response(self, request: Request, response: StreamingRe
             user = self.request_ids["owner_id"]
             body = [chunk async for chunk in response.body_iterator]
             response_content = json.loads(b"".join(body).decode())  # type: ignore
-
+            # Don't display geometry and bbox for default case since it was added just for compliance.
             if request.scope["path"] == "/collections":
                 response_content = remove_user_from_collection(response_content, user)
                 response_content = self.adapt_object_links(response_content, user)
@@ -1054,6 +1069,10 @@ async def manage_put_post_response(self, request: Request, response: StreamingRe
             ):
                 response_content = remove_user_from_feature(response_content, user)
                 response_content = self.adapt_object_links(response_content, user)
+                if response_content.get("geometry") == DEFAULT_GEOM:
+                    response_content["geometry"] = None
+                if response_content.get("bbox") == DEFAULT_BBOX:
+                    response_content["bbox"] = None
             delete_s3_files(self.s3_files_to_be_deleted)
             self.s3_files_to_be_deleted.clear()
         except RuntimeError as exc:

services/common/rs_server_common/stac_api_common.py

@@ -867,12 +867,6 @@ def create_stac_collection(
         feature_tmp = odata_to_stac(copy.deepcopy(feature_template), product_data, stac_mapper)
         try:
             item = Item(**feature_tmp)
-            # Add a default bbox and geometry, since L0 chunks items are not geo-located.
-            item.bbox = (-180.0, -90.0, 180.0, 90.0)
-            item.geometry = {
-                "type": "Polygon",
-                "coordinates": [[[-180, -90], [180, -90], [180, 90], [-180, 90], [-180, -90]]],
-            }
             item.stac_extensions = [str(se) for se in item.stac_extensions]  # type: ignore
             items.append(item)
         except ValidationError as e:

tests/resources/endpoints/adgs_feature.json

@@ -1,38 +1,6 @@
 {
-    "bbox": [
-        -180.0,
-        -90.0,
-        180.0,
-        90.0
-    ],
     "type": "Feature",
-    "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-            [
-                [
-                    -180,
-                    -90
-                ],
-                [
-                    180,
-                    -90
-                ],
-                [
-                    180,
-                    90
-                ],
-                [
-                    -180,
-                    90
-                ],
-                [
-                    -180,
-                    -90
-                ]
-            ]
-        ]
-    },
+    "geometry": null,
     "properties": {
         "datetime": "2021-02-21T10:21:05.821Z",
         "created": "2021-02-14T10:21:05.821Z",

tests/resources/endpoints/cadip_feature.json

@@ -1,38 +1,6 @@
 {
-    "bbox": [
-        -180.0,
-        -90.0,
-        180.0,
-        90.0
-    ],
     "type": "Feature",
-    "geometry": {
-        "type": "Polygon",
-        "coordinates": [
-            [
-                [
-                    -180,
-                    -90
-                ],
-                [
-                    180,
-                    -90
-                ],
-                [
-                    180,
-                    90
-                ],
-                [
-                    -180,
-                    90
-                ],
-                [
-                    -180,
-                    -90
-                ]
-            ]
-        ]
-    },
+    "geometry": null,
     "properties": {
         "datetime": "2020-01-05T18:52:26.165Z",
         "start_datetime": "2020-01-05T07:22:04.051Z",