dea-tools 0.3.2.dev49__tar.gz → 0.3.2.dev54__tar.gz

{dea-tools-0.3.2.dev49/dea_tools.egg-info → dea-tools-0.3.2.dev54}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dea-tools
-Version: 0.3.2.dev49
+Version: 0.3.2.dev54
 Summary: Functions and algorithms for analysing Digital Earth Australia data.
 Home-page: https://github.com/GeoscienceAustralia/dea-notebooks
 Author: Geoscience Australia

{dea-tools-0.3.2.dev49 → dea-tools-0.3.2.dev54}/dea_tools/spatial.py

@@ -601,7 +601,7 @@ def xr_interpolate(
         A dataset of spatial points including at least one numeric column.
         By default all numeric columns in this dataset will be spatially
         interpolated into the extent of `ds`; specific columns can be
-        selected using `columns`. An error will be raised if the points
+        selected using `columns`. An warning will be raised if the points
         in `gdf` do not overlap with the extent of `ds`.
     columns : list, optional
         An optional list of specific columns in gdf` to run the
@@ -646,10 +646,10 @@ def xr_interpolate(
     ds = add_geobox(ds, crs)
     y_dim, x_dim = ds.odc.spatial_dims
 
-    # Reproject to match input `ds`, and raise error if there are no overlaps
+    # Reproject to match input `ds`, and raise warning if there are no overlaps
     gdf = gdf.to_crs(ds.odc.crs)
     if not gdf.dissolve().intersects(ds.odc.geobox.extent.geom).item():
-        raise ValueError("The supplied `gdf` does not overlap spatially with `ds`.")
+        warnings.warn("The supplied `gdf` does not overlap spatially with `ds`.", stacklevel=2)
 
     # Select subset of numeric columns (non-numeric are not supported)
     numeric_gdf = gdf.select_dtypes("number")

{dea-tools-0.3.2.dev49 → dea-tools-0.3.2.dev54}/dea_tools/waterbodies.py

@@ -16,7 +16,7 @@ here: https://gis.stackexchange.com/questions/tagged/open-data-cube).
 If you would like to report an issue with this script, file one on 
 GitHub: https://github.com/GeoscienceAustralia/dea-notebooks/issues/new
 
-Last modified: September 2021
+Last modified: March 2024
 """
 
 import geopandas as gpd
@@ -26,9 +26,12 @@ from owslib.etree import etree
 import pandas as pd
 
 WFS_ADDRESS = "https://geoserver.dea.ga.gov.au/geoserver/wfs"
+LAYER_SELECT = {
+    "v2" : "DigitalEarthAustraliaWaterbodies_v2",
+    "v3" : "DigitalEarthAustraliaWaterbodies_v3"
+}
 
-
-def get_waterbody(geohash: str) -> gpd.GeoDataFrame:
+def get_waterbody(geohash: str, version: str = "v3") -> gpd.GeoDataFrame:
     """Gets a waterbody polygon and metadata by geohash.
     
     Parameters
@@ -45,7 +48,7 @@ def get_waterbody(geohash: str) -> gpd.GeoDataFrame:
     filter_ = PropertyIsEqualTo(propertyname="uid", literal=geohash)
     filterxml = etree.tostring(filter_.toXML()).decode("utf-8")
     response = wfs.getfeature(
-        typename="DigitalEarthAustraliaWaterbodies_v2",
+        typename=LAYER_SELECT[version],
         filter=filterxml,
         outputFormat="json",
     )
@@ -53,7 +56,7 @@ def get_waterbody(geohash: str) -> gpd.GeoDataFrame:
     return wb_gpd
 
 
-def get_waterbodies(bbox: tuple, crs="EPSG:4326") -> gpd.GeoDataFrame:
+def get_waterbodies(bbox: tuple, crs="EPSG:4326", version: str = "v3") -> gpd.GeoDataFrame:
     """Gets the polygons and metadata for multiple waterbodies by bbox.
     
     Parameters
@@ -70,7 +73,7 @@ def get_waterbodies(bbox: tuple, crs="EPSG:4326") -> gpd.GeoDataFrame:
     """
     wfs = WebFeatureService(url=WFS_ADDRESS, version="1.1.0")
     response = wfs.getfeature(
-        typename="DigitalEarthAustraliaWaterbodies_v2",
+        typename=LAYER_SELECT[version],
         bbox=tuple(bbox) + (crs,),
         outputFormat="json",
     )
@@ -78,7 +81,7 @@ def get_waterbodies(bbox: tuple, crs="EPSG:4326") -> gpd.GeoDataFrame:
     return wb_gpd
 
 
-def get_geohashes(bbox: tuple = None, crs: str = "EPSG:4326") -> [str]:
+def get_geohashes(bbox: tuple = None, crs: str = "EPSG:4326", version: str = "v3") -> [str]:
     """Gets all waterbody geohashes.
     
     Parameters
@@ -97,7 +100,7 @@ def get_geohashes(bbox: tuple = None, crs: str = "EPSG:4326") -> [str]:
     if bbox is not None:
         bbox = tuple(bbox) + (crs,)
     response = wfs.getfeature(
-        typename="DigitalEarthAustraliaWaterbodies_v2",
+        typename=LAYER_SELECT[version],
         propertyname="uid",
         outputFormat="json",
         bbox=bbox,
@@ -106,7 +109,7 @@ def get_geohashes(bbox: tuple = None, crs: str = "EPSG:4326") -> [str]:
     return list(wb_gpd["uid"])
 
 
-def get_time_series(geohash: str = None, waterbody: pd.Series = None) -> pd.DataFrame:
+def get_time_series(geohash: str = None, waterbody: pd.Series = None, version: str = "v3") -> pd.DataFrame:
     """Gets the time series for a waterbody. Specify either a GeoDataFrame row or a geohash.
     
     Parameters
@@ -127,7 +130,7 @@ def get_time_series(geohash: str = None, waterbody: pd.Series = None) -> pd.Data
         raise ValueError("One of waterbody and geohash must be specified")
 
     if geohash is not None:
-        wb = get_waterbody(geohash)
+        wb = get_waterbody(geohash, version)
         url = wb.timeseries[0]
     else:
         url = waterbody.timeseries

{dea-tools-0.3.2.dev49 → dea-tools-0.3.2.dev54/dea_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dea-tools
-Version: 0.3.2.dev49
+Version: 0.3.2.dev54
 Summary: Functions and algorithms for analysing Digital Earth Australia data.
 Home-page: https://github.com/GeoscienceAustralia/dea-notebooks
 Author: Geoscience Australia