sentinelsat · j08lue · Jan 31, 2021 · Jul 7, 2020 · Jul 7, 2020 · Jul 7, 2020
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -9,7 +9,8 @@ All notable changes to ``sentinelsat`` will be listed here.
 Added
 ~~~~~
 * Display DHuS server version with CLI flag ``--info`` (#367 @thomasyoung-audet)
-* Added seraching by placenames with the CLI flag ``--location`` (#372 @thomasyoung-audet)
+* Added searching by placenames with the CLI flag ``--location`` (#372 @thomasyoung-audet)
+* Added CLI support for ``--geometry`` input as a string (#381 @thomasyoung-audet)
 
 Changed
 ~~~~~~~

diff --git a/CONTRIBUTE.rst b/CONTRIBUTE.rst
@@ -85,6 +85,13 @@ To run the tests
 
   pytest -v
 
+You can run individual tests with the syntax:
+
+.. code-block:: console
+
+  pytest -v /tests/test_file.py::test_you_want_to_run
+
+This can be useful for recording or modifying individual vcr cassettes.
 
 By default, prerecorded responses to Copernicus Open Access Hub queries are used to not be affected by its downtime.
 Furthermore, any network accesses are blocked as well (by raising a ``pytest_socket.SocketBlockedError: A test tried to use socket.socket`` exception) to guarantee that all tests are indeed correctly covered by recorded queries.

diff --git a/sentinelsat/scripts/cli.py b/sentinelsat/scripts/cli.py
@@ -1,14 +1,26 @@
+import json
 import logging
 import os
+from json import JSONDecodeError
 
 import click
 import geojson as gj
 import requests.utils
 
 from sentinelsat import __version__ as sentinelsat_version
-from sentinelsat.sentinel import SentinelAPI, geojson_to_wkt, read_geojson, placename_to_wkt
+
+from sentinelsat.sentinel import (
+    SentinelAPI,
+    SentinelAPIError,
+    geojson_to_wkt,
+    read_geojson,
+    placename_to_wkt,
+    is_wkt,
+)
+
 from sentinelsat.exceptions import InvalidKeyError
 
+
 logger = logging.getLogger("sentinelsat")
 
 
@@ -69,7 +81,10 @@ def convert(self, value, param, ctx):
     help="End date of the query in the format YYYYMMDD.",
 )
 @click.option(
-    "--geometry", "-g", type=click.Path(exists=True), help="Search area geometry as GeoJSON file."
+    "--geometry",
+    "-g",
+    type=str,
+    help="Search area geometry as GeoJSON file, a GeoJSON string, or a WKT string. ",
 )
 @click.option(
     "--uuid",
@@ -217,7 +232,27 @@ def cli(
         search_kwargs["area"] = wkt
 
     if geometry is not None:
-        search_kwargs["area"] = geojson_to_wkt(read_geojson(geometry))
+        # check if the value is an existing path
+        if os.path.exists(geometry):
+            search_kwargs["area"] = geojson_to_wkt(read_geojson(geometry))
+        # check if the value is a GeoJSON
+        else:
+            if geometry.startswith("{"):
+                try:
+                    geometry = json.loads(geometry)
+                    search_kwargs["area"] = geojson_to_wkt(geometry)
+                except JSONDecodeError:
+                    logger.error("geometry string starts with '{' but is not a valid GeoJSON.")
+                    exit(1)
+            # check if the value is a WKT
+            elif is_wkt(geometry):
+                search_kwargs["area"] = geometry
+            else:
+                logger.error(
+                    "The geometry input is neither a GeoJSON file with a valid path, "
+                    "a GeoJSON String or a WKT string."
+                )
+                exit(1)
 
     if uuid is not None:
         uuid_list = [x.strip() for x in uuid]

diff --git a/sentinelsat/sentinel.py b/sentinelsat/sentinel.py
@@ -1457,3 +1457,8 @@ def placename_to_wkt(placename):
     footprint = "ENVELOPE({}, {}, {}, {})".format(minX, maxX, maxY, minY)
     placeinfo = feature["properties"]["display_name"]
     return footprint, placeinfo
+
+
+def is_wkt(possible_wkt):
+    pattern = r"^((MULTI)?(POINT|LINESTRING|POLYGON)|GEOMETRYCOLLECTION|ENVELOPE)\s*\(.+\)$"
+    return re.match(pattern, possible_wkt.strip().upper()) is not None
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -125,6 +125,56 @@ def geojson_path():
     return path
 
 
+@pytest.fixture(scope="session")
+def geojson_string():
+    string = """{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "properties": {},
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [
+              -66.26953125,
+              -8.05922962720018
+            ],
+            [
+              -66.26953125,
+              0.7031073524364909
+            ],
+            [
+              -57.30468749999999,
+              0.7031073524364909
+            ],
+            [
+              -57.30468749999999,
+              -8.05922962720018
+            ],
+            [
+              -66.26953125,
+              -8.05922962720018
+            ]
+          ]
+        ]
+      }
+    }
+  ]
+}"""
+    return string
+
+
+@pytest.fixture(scope="session")
+def wkt_string():
+    string = (
+        "POLYGON((-78.046875 46.377254205100286,-75.76171874999999 43.32517767999295,-71.279296875 "
+        "46.55886030311717,-78.046875 46.377254205100286))"
+    )
+    return string
+
+
 @pytest.fixture(scope="session")
 def test_wkt(geojson_path):
     return geojson_to_wkt(read_geojson(geojson_path))