add support for subscription catalog source geometry_relation

Author: charcey

planet/cli/subscriptions.py

@@ -518,6 +518,16 @@ def request(name,
 @click.option('--time-range-type',
               type=click.Choice(["acquired", "published"]),
               help="Subscribe by acquisition time or time of publication.")
+@click.option(
+    '--geometry-relation',
+    type=click.Choice(["intersects", "contains", "within"]),
+    help=("The relationship between the subscription geometry and "
+          "the item geometry. Intersects (default): Returns items whose "
+          "footprint geometry partially or fully overlaps with the "
+          "subscription geometry. Contains: Returns items where the "
+          "footprint geometry fully encloses the AOI. Within: Returns "
+          "items whose entire footprint geometry is fully contained "
+          "within the AOI."))
 @pretty
 def request_catalog(item_types,
                     asset_types,
@@ -528,6 +538,7 @@ def request_catalog(item_types,
                     filter,
                     publishing_stages,
                     time_range_type,
+                    geometry_relation,
                     pretty):
     """Generate a subscriptions request catalog source description."""
 
@@ -540,7 +551,8 @@ def request_catalog(item_types,
         rrule=rrule,
         filter=filter,
         publishing_stages=publishing_stages,
-        time_range_type=time_range_type)
+        time_range_type=time_range_type,
+        geometry_relation=geometry_relation)
     echo_json(res, pretty)
 
 

planet/subscription_request.py

@@ -169,6 +169,8 @@ def catalog_source(
                                                  "standard",
                                                  "finalized"]]] = None,
     time_range_type: Optional[Literal["acquired", "published"]] = None,
+    geometry_relation: Optional[Literal["intersects", "contains",
+                                        "within"]] = None,
 ) -> dict:
     """Construct a Catalog subscription source.
 
@@ -195,6 +197,10 @@ def catalog_source(
         publishing_stages: A sequence of one or more of the values
             "preview", "standard", or "finalized".
         time_range_type: "acquired" (new in 2.1.0) or "published".
+        geometry_relation: The relationship between the subscription geometry and the item geometry. Intersects (default): Returns
+            items whose footprint geometry partially or fully overlaps with the subscription geometry.
+            Contains: Returns items where the footprint geometry fully encloses the AOI.
+            Within: Returns items whose entire footprint geometry is fully contained within the AOI.
 
     Returns:
         dict: a representation of a subscription source.
@@ -270,6 +276,9 @@ def catalog_source(
     if time_range_type:
         parameters['time_range_type'] = time_range_type
 
+    if geometry_relation:
+        parameters['geometry_relation'] = geometry_relation
+
     return {"parameters": parameters}
 
 

tests/integration/test_subscriptions_cli.py

@@ -487,6 +487,27 @@ def test_catalog_source_time_range_type(mock_bundles,
     assert req['parameters']['time_range_type'] == time_range_type
 
 
+@pytest.mark.parametrize("geometry_relation",
+                         ["intersects", "contains", "within"])
+def test_catalog_source_geometry_relation(mock_bundles,
+                                          invoke,
+                                          geom_geojson,
+                                          geometry_relation):
+    """Catalog source time range type is configured."""
+    result = invoke([
+        'request-catalog',
+        '--item-types=PSScene',
+        '--asset-types=ortho_analytic_4b',
+        f"--geometry={json.dumps(geom_geojson)}",
+        '--start-time=2021-03-01T00:00:00',
+        f'--geometry-relation={geometry_relation}',
+    ])
+
+    assert result.exit_code == 0  # success.
+    req = json.loads(result.output)
+    assert req['parameters']['geometry_relation'] == geometry_relation
+
+
 @pytest.mark.parametrize(
     "hosting_option, collection_id_option, configuration_option, expected_success",
     [

tests/unit/test_subscription_request.py

@@ -617,6 +617,20 @@ def test_catalog_source_time_range_type_acquired(geom_geojson, mock_bundles):
     assert source["parameters"]["time_range_type"] == "acquired"
 
 
+@respx.mock
+def test_catalog_source_geometry_relation_contains(geom_geojson, mock_bundles):
+    """Configure 'contains' geometry relation for a catalog source."""
+    source = subscription_request.catalog_source(
+        item_types=["PSScene"],
+        asset_types=["ortho_analytic_4b"],
+        start_time=datetime(2021, 3, 1),
+        geometry_relation="contains",
+        geometry=geom_geojson,
+    )
+
+    assert source["parameters"]["geometry_relation"] == "contains"
+
+
 def test_cloud_filter_tool_success():
     res = subscription_request.cloud_filter_tool(
         clear_percent=subscription_request.FilterValue(gte=90),