ecoscape-utilities 0.0.34__tar.gz → 0.0.36__tar.gz

{ecoscape_utilities-0.0.34 → ecoscape_utilities-0.0.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecoscape-utilities
-Version: 0.0.34
+Version: 0.0.36
 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.34 → ecoscape_utilities-0.0.36}/ecoscape_utilities/ebird_db.py

@@ -73,7 +73,7 @@ class EbirdObservations(Connection):
 
     def get_all_squares(self, state=None,
                         breeding=True, date_range=None,
-                        lat_range=None, lng_range=None, max_dist=2,
+                        lat_range=None, lng_range=None, max_dist=2, min_time=None,
                         verbose=False):
         """
         Gets all squares with bird (any bird) observations, for a certain state,
@@ -85,12 +85,16 @@ class EbirdObservations(Connection):
         :param lng_range: tuple of 2 floats for the lower and upper bounds for longitude
         :param max_dist (int): max kilometers traveled for the checklist for any observation we consider
             (any of further distance will be too noisy, and should be disreguarded)
+        :param min_time (int): minimum time in minutes for the checklist for any observation we consider
         :returns: list of squares which fall within the query parameters
         """
         query_string=['select DISTINCT SQUARE from checklist where "ALL SPECIES REPORTED" = 1']
         query_string.append('and "PROTOCOL TYPE" != "Incidental"')
         query_string.append('and "EFFORT DISTANCE KM" <= :dist')
         d = {"dist": max_dist}
+        if min_time is not None:
+            query_string.append('and "DURATION MINUTES" >= :min_time')
+            d["min_time"] = min_time
         if state is not None:
             query_string.append('and "STATE CODE" = :state')
             d['state'] = state
@@ -121,7 +125,7 @@ class EbirdObservations(Connection):
 
     def get_square_observations(self, square, bird,
                           breeding=True, date_range=None,
-                          lat_range=None, lng_range=None, max_dist=2,
+                          lat_range=None, lng_range=None, max_dist=2, min_time=None,
                           verbose=False):
         """
         Get the number of checklists, number of checklists with a bird,
@@ -134,6 +138,7 @@ class EbirdObservations(Connection):
         :param lng_range: tuple of 2 floats for the lower and upper bounds for longitude
         :param max_dist (int): max kilometers traveled for the checklist for any observation we consider
             (any of further distance will be too noisy, and should be disreguarded)
+        :param min_time (int): minimum time in minutes for the checklist for any observation we consider
         :returns: num_checklists, num_bird_checklists, num_birds for the given square.
         """
         # Gets the number of checklists, the total time, the total distance, and the total number of birds.
@@ -144,6 +149,9 @@ class EbirdObservations(Connection):
         query_string.append('and "PROTOCOL TYPE" != "Incidental"')
         query_string.append('and "EFFORT DISTANCE KM" <= :dist')
         d["dist"] = max_dist
+        if min_time is not None:
+            query_string.append('and "DURATION MINUTES" >= :min_time')
+            d["min_time"] = min_time
         # Adds breeding portion
         if breeding:
             query_string.extend([
@@ -620,7 +628,7 @@ class Validation(object):
             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)

{ecoscape_utilities-0.0.34 → ecoscape_utilities-0.0.36}/ecoscape_utilities.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecoscape-utilities
-Version: 0.0.34
+Version: 0.0.36
 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.34 → ecoscape_utilities-0.0.36}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ecoscape-utilities"
-version = "0.0.34"
+version = "0.0.36"
 authors = [
   {name="Luca de Alfaro", email="luca@ucsc.edu"},
   {name="Coen Adler", email="ctadler@ucsc.edu"},