diff --git a/docs/user/notebook.html b/docs/user/notebook.html index 9d414de..84bf614 100644 --- a/docs/user/notebook.html +++ b/docs/user/notebook.html @@ -1,13 +1,9 @@ - - - + + + tutorial - - - - - - - +.jp-Cell-Placeholder { + padding-left: 55px; +} + +.jp-Cell-Placeholder-wrapper { + background: #fff; + border: 1px solid; + border-color: #e5e6e9 #dfe0e4 #d0d1d5; + border-radius: 4px; + -webkit-border-radius: 4px; + margin: 10px 15px; +} + +.jp-Cell-Placeholder-wrapper-inner { + padding: 15px; + position: relative; +} + +.jp-Cell-Placeholder-wrapper-body { + background-repeat: repeat; + background-size: 50% auto; +} + +.jp-Cell-Placeholder-wrapper-body div { + background: #f6f7f8; + background-image: -webkit-linear-gradient( + left, + #f6f7f8 0%, + #edeef1 20%, + #f6f7f8 40%, + #f6f7f8 100% + ); + background-repeat: no-repeat; + background-size: 800px 104px; + height: 104px; + position: absolute; + right: 15px; + left: 15px; + top: 15px; +} + +div.jp-Cell-Placeholder-h1 { + top: 20px; + height: 20px; + left: 15px; + width: 150px; +} + +div.jp-Cell-Placeholder-h2 { + left: 15px; + top: 50px; + height: 10px; + width: 100px; +} + +div.jp-Cell-Placeholder-content-1, +div.jp-Cell-Placeholder-content-2, +div.jp-Cell-Placeholder-content-3 { + left: 15px; + right: 15px; + height: 10px; +} + +div.jp-Cell-Placeholder-content-1 { + top: 100px; +} + +div.jp-Cell-Placeholder-content-2 { + top: 120px; +} + +div.jp-Cell-Placeholder-content-3 { + top: 140px; +} - + - +/* Hiding the collapser by default */ +.jp-Collapser { + display: none; +} +@page { + margin: 0.5in; /* Margin for each printed piece of paper */ +} +@media print { + .jp-Cell-inputWrapper, + .jp-Cell-outputWrapper { + display: block; + } +} + - - - + + - - + + + + +
+
+ +
+
- - - - - - - diff --git a/examples/tutorial.ipynb b/examples/tutorial.ipynb index 94eb9cc..0019382 100644 --- a/examples/tutorial.ipynb +++ b/examples/tutorial.ipynb @@ -215,7 +215,7 @@ " collection=collection,\n", " granule_id='G1233860486-EEDTEST',\n", " interpolation='near',\n", - " grid='LambertExample'\n", + " grid='GEOS1x1test'\n", ")\n", "\n", "request.is_valid()" @@ -287,11 +287,8 @@ "\n", "request = Request(\n", " collection=collection,\n", - " spatial=BBox(-140, 20, -50, 60),\n", - " crs='EPSG:31975',\n", - " format='image/jpg',\n", " max_results=1,\n", - " variables=['blue_var']\n", + " variables=['all']\n", ")\n", "response = harmony_client.submit(request)\n", "response" @@ -317,7 +314,8 @@ "results = harmony_client.download_all(response, directory='/tmp', overwrite=True)\n", "file_names = [f.result() for f in results]\n", "for filename in file_names:\n", - " print(nc4.Dataset(filename))" + " if filename.endswith(\"nc\"):\n", + " print(nc4.Dataset(filename))" ] }, { @@ -380,18 +378,10 @@ "metadata": {}, "outputs": [], "source": [ - "for filename in [f.result() for f in harmony_client.download_all(response)]:\n", + "for filename in [f.result() for f in harmony_client.download_all(response, directory='/tmp', overwrite=True)]:\n", " if filename.endswith(\"png\"):\n", " helper.show_result(filename)" ] - }, - { - "cell_type": "code", - "execution_count": null, - "id": "09f132f3-6117-4ca0-b2b6-ae41c6b48981", - "metadata": {}, - "outputs": [], - "source": [] } ], "metadata": { diff --git a/harmony/harmony.py b/harmony/harmony.py index 9dfef88..6fbc14a 100644 --- a/harmony/harmony.py +++ b/harmony/harmony.py @@ -152,7 +152,8 @@ def __repr__(self) -> str: class WKT: """The Well Known Text (WKT) representation of Spatial. - Supported WKT geometry types are: POINT, MULTIPOINT, POLYGON, MULTIPOLYGON. + Supported WKT geometry types are: + POINT, MULTIPOINT, POLYGON, MULTIPOLYGON, LINESTRING and MULTILINESTRING. Example: spatial=WKT('POINT(-40 10)') @@ -162,6 +163,10 @@ class WKT: spatial=WKT('POLYGON((-140 20, -50 20, -50 60, -140 60, -140 20))') spatial=WKT('MULTIPOLYGON(((10 10, 20 20, 30 10, 10 10)),((40 40, 50 50, 60 40, 40 40)))') + + spatial=WKT('LINESTRING(-155.75 19.26, -155.3 19.94)') + + spatial=WKT('MULTILINESTRING((-155.75 19.26, -155.3 19.94),(10 1, 10 30))') """ def __init__(self, wkt: str):