ecoscape-utilities 0.0.33__py3-none-any.whl → 0.0.35__py3-none-any.whl

ecoscape_utilities/ebird_db.py

@@ -607,19 +607,20 @@ class Validation(object):
         :param hab_tif: habitat geotiff used to compute repop
         :param tile_scale: size of the tile around square
         """
-        df = self.observations.copy()
+        df = pd.read_csv(self.obs_fn)
         def f(row):
             square = row["Square"]
             if (isinstance(square, str)):
                 coords = format_coords(square)
             else:
                 coords = square
+            lat, lng = coords
             repop_pix_coords = transform_coords(repop_tif, coords)
             hab_pix_coords = transform_coords(hab_tif, coords)
             repop_tile = repop_tif.get_tile_from_coord(repop_pix_coords, tile_scale=tile_scale)
             hab_tile = hab_tif.get_tile_from_coord(hab_pix_coords, tile_scale=tile_scale)
             if repop_tile is None or hab_tile is None:
-                return pd.NA, pd.NA, pd.NA, pd.NA
+                return pd.NA, pd.NA, pd.NA, pd.NA, lat, lng
             avg_repop = np.average(repop_tile.m)
             avg_hab = np.average(hab_tile.m)
             max_repop = np.max(repop_tile.m)
@@ -627,7 +628,7 @@ class Validation(object):
             if div_by_255:
                 avg_repop /= 255.
                 max_repop /= 255.
-            return avg_repop, avg_hab, max_repop, max_hab
-        df["avg_repop"], df["avg_hab"], df["max_repop"], df["max_hab"] = zip(*df.apply(f, axis=1))
+            return avg_repop, avg_hab, max_repop, max_hab, lat, lng
+        df["avg_repop"], df["avg_hab"], df["max_repop"], df["max_hab"], df["lat"], df["lng"] = zip(*df.apply(f, axis=1))
         return df
 

{ecoscape_utilities-0.0.33.dist-info → ecoscape_utilities-0.0.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecoscape-utilities
-Version: 0.0.33
+Version: 0.0.35
 Summary: A collection of EcoScape utilities.
 Author-email: Luca de Alfaro <luca@ucsc.edu>, Coen Adler <ctadler@ucsc.edu>, Artie Nazarov <anazarov@ucsc.edu>, Natalia Ocampo-Peñuela <nocampop@ucsc.edu>, Jasmine Tai <cjtai@ucsc.edu>, Natalie Valett <nvalett@ucsc.edu>
 Project-URL: Homepage, https://github.com/ecoscape-earth/ecoscape-utilities

ecoscape_utilities-0.0.35.dist-info/RECORD

@@ -0,0 +1,8 @@
+ecoscape_utilities/__init__.py,sha256=LXt1rL9JVsjnCmsNZwZ2aoElphIK-koaEDdW6ffZsMQ,50
+ecoscape_utilities/bird_runs.py,sha256=v43PfH_4ojpkTE-EFOJxr0oOW3M9suNm_1zMjZ9P-eI,5409
+ecoscape_utilities/ebird_db.py,sha256=KGtSXADu3VwnXHUDp_bGPDGJhRoLmVXbzduwYufRo1M,30134
+ecoscape_utilities-0.0.35.dist-info/licenses/LICENSE.md,sha256=3vh2mpA_XIR3FJot6a5F9DqktAoq45sEGIRkYjvAEeU,1304
+ecoscape_utilities-0.0.35.dist-info/METADATA,sha256=8J6OO_NUghRQzmLs2EwxdDIPwIuRlh6W_bxAOdyRKto,1382
+ecoscape_utilities-0.0.35.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+ecoscape_utilities-0.0.35.dist-info/top_level.txt,sha256=jLf7iMlySaJg0Vh8z4lbAaqOc5W5ruMgKFvp797CryQ,19
+ecoscape_utilities-0.0.35.dist-info/RECORD,,

ecoscape_utilities-0.0.33.dist-info/RECORD

@@ -1,8 +0,0 @@
-ecoscape_utilities/__init__.py,sha256=LXt1rL9JVsjnCmsNZwZ2aoElphIK-koaEDdW6ffZsMQ,50
-ecoscape_utilities/bird_runs.py,sha256=v43PfH_4ojpkTE-EFOJxr0oOW3M9suNm_1zMjZ9P-eI,5409
-ecoscape_utilities/ebird_db.py,sha256=qtnAjc4mid7bcwVTrg0h30UyuyydWbfh2Ogaei4_WuA,30062
-ecoscape_utilities-0.0.33.dist-info/licenses/LICENSE.md,sha256=3vh2mpA_XIR3FJot6a5F9DqktAoq45sEGIRkYjvAEeU,1304
-ecoscape_utilities-0.0.33.dist-info/METADATA,sha256=_IF2EBqPc-R9FvnaDnuR5SRut2JSi5J7d5PanptTz4E,1382
-ecoscape_utilities-0.0.33.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-ecoscape_utilities-0.0.33.dist-info/top_level.txt,sha256=jLf7iMlySaJg0Vh8z4lbAaqOc5W5ruMgKFvp797CryQ,19
-ecoscape_utilities-0.0.33.dist-info/RECORD,,