From 0196b63776b308d8ba73a23493d302e1c89e8a09 Mon Sep 17 00:00:00 2001 From: Wang Boyu Date: Fri, 1 Apr 2022 09:45:50 -0400 Subject: [PATCH 1/2] remove deprecated skip_equivalent from pyproj --- mesa_geo/geospace.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mesa_geo/geospace.py b/mesa_geo/geospace.py index a2ab2b17..8eb07d20 100644 --- a/mesa_geo/geospace.py +++ b/mesa_geo/geospace.py @@ -37,9 +37,7 @@ def __init__(self, crs="epsg:3857"): """ self.crs = pyproj.CRS(crs) self.WGS84 = pyproj.CRS("epsg:4326") - self.Transformer = pyproj.Transformer.from_crs( - self.crs, self.WGS84, skip_equivalent=True, always_xy=True - ) + self.Transformer = pyproj.Transformer.from_crs(self.crs, self.WGS84, always_xy=True) self.bbox = None self._neighborhood = None @@ -96,7 +94,7 @@ def get_intersecting_agents(self, agent, other_agents=None): return intersecting_agents def get_neighbors_within_distance( - self, agent, distance, center=False, relation="intersects" + self, agent, distance, center=False, relation="intersects" ): """Return a list of agents within `distance` of `agent`. From b9e468b29296760e4aafc7d367e574a45646ef2f Mon Sep 17 00:00:00 2001 From: Wang Boyu Date: Fri, 1 Apr 2022 20:43:24 -0400 Subject: [PATCH 2/2] fix indentation --- mesa_geo/geospace.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mesa_geo/geospace.py b/mesa_geo/geospace.py index 8eb07d20..a77da950 100644 --- a/mesa_geo/geospace.py +++ b/mesa_geo/geospace.py @@ -93,9 +93,7 @@ def get_intersecting_agents(self, agent, other_agents=None): intersecting_agents = self.get_relation(agent, "intersects") return intersecting_agents - def get_neighbors_within_distance( - self, agent, distance, center=False, relation="intersects" - ): + def get_neighbors_within_distance(self, agent, distance, center=False, relation="intersects"): """Return a list of agents within `distance` of `agent`. Distance is measured as a buffer around the agent's shape,