From 6b9622661cb959d2cad43f35b1bc5627fbbc15bc Mon Sep 17 00:00:00 2001 From: Martin Fleischmann Date: Wed, 2 Jun 2021 14:35:39 +0100 Subject: [PATCH 1/2] TST: fix proj4strings test for PROJ 8.0.1 --- geopandas/tests/test_geoseries.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/geopandas/tests/test_geoseries.py b/geopandas/tests/test_geoseries.py index 80ffbbc0ce..1cb6796bab 100644 --- a/geopandas/tests/test_geoseries.py +++ b/geopandas/tests/test_geoseries.py @@ -262,25 +262,25 @@ def test_geoseries_geointerface(self): def test_proj4strings(self): # As string - reprojected = self.g3.to_crs("+proj=utm +zone=30N") + reprojected = self.g3.to_crs("+proj=utm +zone=30") reprojected_back = reprojected.to_crs(epsg=4326) assert np.all(self.g3.geom_almost_equals(reprojected_back)) # As dict - reprojected = self.g3.to_crs({"proj": "utm", "zone": "30N"}) + reprojected = self.g3.to_crs({"proj": "utm", "zone": "30"}) reprojected_back = reprojected.to_crs(epsg=4326) assert np.all(self.g3.geom_almost_equals(reprojected_back)) # Set to equivalent string, convert, compare to original copy = self.g3.copy() copy.crs = "epsg:4326" - reprojected = copy.to_crs({"proj": "utm", "zone": "30N"}) + reprojected = copy.to_crs({"proj": "utm", "zone": "30"}) reprojected_back = reprojected.to_crs(epsg=4326) assert np.all(self.g3.geom_almost_equals(reprojected_back)) # Conversions by different format - reprojected_string = self.g3.to_crs("+proj=utm +zone=30N") - reprojected_dict = self.g3.to_crs({"proj": "utm", "zone": "30N"}) + reprojected_string = self.g3.to_crs("+proj=utm +zone=30") + reprojected_dict = self.g3.to_crs({"proj": "utm", "zone": "30"}) assert np.all(reprojected_string.geom_almost_equals(reprojected_dict)) def test_from_wkb(self): From dbeba79fa32dd3b5aa3fc5463030912656a4a194 Mon Sep 17 00:00:00 2001 From: Martin Fleischmann Date: Wed, 2 Jun 2021 15:15:42 +0100 Subject: [PATCH 2/2] fix CRS output in docstring --- geopandas/geoseries.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/geopandas/geoseries.py b/geopandas/geoseries.py index 070a1df8a6..89f4dd4ed5 100644 --- a/geopandas/geoseries.py +++ b/geopandas/geoseries.py @@ -132,9 +132,9 @@ class GeoSeries(GeoPandasBase, Series): - Lat[north]: Geodetic latitude (degree) - Lon[east]: Geodetic longitude (degree) Area of Use: - - name: World + - name: World. - bounds: (-180.0, -90.0, 180.0, 90.0) - Datum: World Geodetic System 1984 + Datum: World Geodetic System 1984 ensemble - Ellipsoid: WGS 84 - Prime Meridian: Greenwich @@ -578,7 +578,7 @@ def apply(self, func, convert_dtype=True, args=(), **kwargs): return result def __finalize__(self, other, method=None, **kwargs): - """ propagate metadata from other to self """ + """propagate metadata from other to self""" # NOTE: backported from pandas master (upcoming v0.13) for name in self._metadata: object.__setattr__(self, name, getattr(other, name, None))