ecoscape-utilities 0.0.38__py3-none-any.whl → 0.0.39__py3-none-any.whl

ecoscape_utilities/ebird_db.py

@@ -226,10 +226,13 @@ class EbirdObservations(Connection):
         # Adds breeding portion
         if breeding is not None:
             query_string.extend([
-                'and substr("OBSERVATION DATE", 6, 2) >= ":br1"',
-                'and substr("OBSERVATION DATE", 6, 2) <= ":br2"',
+                'and substr(checklist."OBSERVATION DATE", 6, 2) >= ":br1"',
+                'and substr(checklist."OBSERVATION DATE", 6, 2) <= ":br2"',
                 ])
             d['br1'], d['br2'] = breeding
+        if min_time is not None:
+            query_string.append('and "checklist.DURATION MINUTES" >= :min_time')
+            d["min_time"] = min_time
         if date_range is not None:
             query_string.append('and checklist."OBSERVATION DATE" >= :min_date')
             query_string.append('and checklist."OBSERVATION DATE" <= :max_date')
@@ -267,7 +270,7 @@ class EbirdObservations(Connection):
         )
 
     def get_square_individual_checklists(self, square, bird,
-                          breeding=None, date_range=None,
+                          breeding=None, date_range=None, min_time=None,
                           lat_range=None, lng_range=None, max_dist=2,
                           verbose=False):
         """
@@ -300,6 +303,9 @@ class EbirdObservations(Connection):
                 'and substr("OBSERVATION DATE", 6, 2) <= ":br2"',
                 ])
             d['br1'], d['br2'] = breeding
+        if min_time is not None:
+            query_string.append('and "DURATION MINUTES" >= :min_time')
+            d["min_time"] = min_time
         if date_range is not None:
             query_string.append('and "OBSERVATION DATE" >= :min_date')
             query_string.append('and "OBSERVATION DATE" <= :max_date')
@@ -331,14 +337,17 @@ class EbirdObservations(Connection):
         # Adds breeding portion
         if breeding is not None:
             query_string.extend([
-                'and substr("OBSERVATION DATE", 6, 2) >= ":br1"',
-                'and substr("OBSERVATION DATE", 6, 2) <= ":br2"',
+                'and substr(checklist."OBSERVATION DATE", 6, 2) >= ":br1"',
+                'and substr(checklist."OBSERVATION DATE", 6, 2) <= ":br2"',
                 ])
             d['br1'], d['br2'] = breeding
         if date_range is not None:
             query_string.append('and checklist."OBSERVATION DATE" >= :min_date')
             query_string.append('and checklist."OBSERVATION DATE" <= :max_date')
             d["min_date"], d["max_date"] = date_range
+        if min_time is not None:
+            query_string.append('and checklist."DURATION MINUTES" >= :min_time')
+            d["min_time"] = min_time
         if lat_range is not None:
             query_string.append('and checklist."LATITUDE" >= :min_lat')
             query_string.append('and checklist."LATITUDE" <= :max_lat')
@@ -362,7 +371,7 @@ class EbirdObservations(Connection):
         checklists_df["Count"] = checklists_df.apply(lambda row : counts[row["SAMPLING EVENT IDENTIFIER"]], axis=1)
         return checklists_df
 
-    def get_squares_with_bird(self, bird, max_dist=1, breeding=None,
+    def get_squares_with_bird(self, bird, max_dist=1, breeding=None, min_time=None,
                               date_range=None, lat_range=None, lng_range=None,
                               state=None, verbose=False):
         """Gets all the squares where a bird has been sighted.  This is used
@@ -395,6 +404,9 @@ class EbirdObservations(Connection):
                 'and substr("OBSERVATION DATE", 6, 2) <= ":br2"',
                 ])
             d['br1'], d['br2'] = breeding
+        if min_time is not None:
+            query_string.append('and "DURATION MINUTES" >= :min_time')
+            d["min_time"] = min_time
         if date_range is not None:
             query_string.append('and checklist."OBSERVATION DATE" >= :min_date')
             query_string.append('and checklist."OBSERVATION DATE" <= :max_date')

{ecoscape_utilities-0.0.38.dist-info → ecoscape_utilities-0.0.39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecoscape-utilities
-Version: 0.0.38
+Version: 0.0.39
 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.39.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=-bMfpBPIPFu7x4jEIQ746DYqXudtUSH8pnCaBqD05gk,28721
+ecoscape_utilities-0.0.39.dist-info/licenses/LICENSE.md,sha256=3vh2mpA_XIR3FJot6a5F9DqktAoq45sEGIRkYjvAEeU,1304
+ecoscape_utilities-0.0.39.dist-info/METADATA,sha256=Xqa6xZIPtHg1PmF3QCUwiKG-ofz5JsNYEGJrLG-0n6w,1382
+ecoscape_utilities-0.0.39.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ecoscape_utilities-0.0.39.dist-info/top_level.txt,sha256=jLf7iMlySaJg0Vh8z4lbAaqOc5W5ruMgKFvp797CryQ,19
+ecoscape_utilities-0.0.39.dist-info/RECORD,,

ecoscape_utilities-0.0.38.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=vMezw5AFIrd4RVITWbLpsZlDGBxig5CoVQMzT7XDeNk,28067
-ecoscape_utilities-0.0.38.dist-info/licenses/LICENSE.md,sha256=3vh2mpA_XIR3FJot6a5F9DqktAoq45sEGIRkYjvAEeU,1304
-ecoscape_utilities-0.0.38.dist-info/METADATA,sha256=E9tCnd-2Ipwy9tzDGz30uICoVmJ2mzuxrGUcuuZFGSs,1382
-ecoscape_utilities-0.0.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ecoscape_utilities-0.0.38.dist-info/top_level.txt,sha256=jLf7iMlySaJg0Vh8z4lbAaqOc5W5ruMgKFvp797CryQ,19
-ecoscape_utilities-0.0.38.dist-info/RECORD,,