From 0c9fc24c5125b3d5a9094b2b50ccc613d2238edb Mon Sep 17 00:00:00 2001 From: Alex Morling Date: Wed, 27 Nov 2024 21:44:50 +0200 Subject: [PATCH] properly handle include_details=False --- ecoscope/io/async_earthranger.py | 9 ++++----- ecoscope/io/earthranger.py | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ecoscope/io/async_earthranger.py b/ecoscope/io/async_earthranger.py index db1b5951..4c02fc1e 100644 --- a/ecoscope/io/async_earthranger.py +++ b/ecoscope/io/async_earthranger.py @@ -419,10 +419,7 @@ async def get_patrol_observations_with_patrol_filter( relocations : ecoscope.base.Relocations """ observations = ecoscope.base.Relocations() - df_pt = None - - if include_patrol_details: - df_pt = await self.get_patrol_types_dataframe() + df_pt = await self.get_patrol_types_dataframe() if include_patrol_details else None tasks = [] async for patrol in self.get_patrols(since=since, until=until, patrol_type=patrol_type, status=status): @@ -431,7 +428,9 @@ async def get_patrol_observations_with_patrol_filter( observations = await asyncio.gather(*tasks) observations = pd.concat(observations) - observations["groupby_col"] = observations["patrol_id"] + + if include_patrol_details: + observations["groupby_col"] = observations["patrol_id"] return observations diff --git a/ecoscope/io/earthranger.py b/ecoscope/io/earthranger.py index ac3254dc..fa30d8d3 100644 --- a/ecoscope/io/earthranger.py +++ b/ecoscope/io/earthranger.py @@ -895,6 +895,7 @@ def get_patrol_observations(self, patrols_df, include_patrol_details=False, **kw ) ) if len(observation) > 0: + observation["groupby_col"] = patrol["id"] observations.append(observation) except Exception as e: print( @@ -904,7 +905,6 @@ def get_patrol_observations(self, patrols_df, include_patrol_details=False, **kw df = pd.concat(observations) df = clean_time_cols(df) - df["groupby_col"] = df["patrol_id"] df = ecoscope.base.Relocations(df) if include_patrol_details: return df.set_index("id")