From 1071c08387ffbc949e44c40f63811b6d64da0bfd Mon Sep 17 00:00:00 2001 From: Erik van Onselen Date: Thu, 7 Mar 2024 10:01:40 +0100 Subject: [PATCH] Removed obsolete test.py file; updated projections.py --- geost/bro/api.py | 4 ++-- geost/projections.py | 14 ++------------ geost/test.py | 8 -------- tests/test_projections.py | 2 +- 4 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 geost/test.py diff --git a/geost/bro/api.py b/geost/bro/api.py index db145b9..cc8c3a0 100644 --- a/geost/bro/api.py +++ b/geost/bro/api.py @@ -149,8 +149,8 @@ def __response_to_bbox( epsg: str = "28992", object_type: str = "CPT", ): - xmin_ll, ymin_ll = xy_to_ll(xmin, ymin, epsg) - xmax_ll, ymax_ll = xy_to_ll(xmax, ymax, epsg) + ymin_ll, xmin_ll = xy_to_ll(xmin, ymin, epsg) + ymax_ll, xmax_ll = xy_to_ll(xmax, ymax, epsg) criteria = get_bbox_criteria(xmin_ll, xmax_ll, ymin_ll, ymax_ll) api_url = self.server_url + self.apis[object_type] + self.search_url response = self.session.post(api_url, json=criteria) diff --git a/geost/projections.py b/geost/projections.py index 9e02437..c8aa76e 100644 --- a/geost/projections.py +++ b/geost/projections.py @@ -8,15 +8,5 @@ def get_transformer(epsg_from, epsg_to): def xy_to_ll(x, y, epsg): t = get_transformer(epsg, 4326) - transformed = list(t.itransform([(x, y)])) - return transformed[0][1], transformed[0][0] - - -def get_coors(xy_gen): - x = [] - y = [] - xy = list(xy_gen) - for coor in xy: - x.append(coor[0]) - y.append(coor[1]) - return x, y + transformed = t.transform(x, y) + return transformed diff --git a/geost/test.py b/geost/test.py deleted file mode 100644 index 76ea978..0000000 --- a/geost/test.py +++ /dev/null @@ -1,8 +0,0 @@ -import numpy as np -from numpy.polynomial.polynomial import polyfit - -x = np.arange(0, 10) -y = np.random.random(10) -deg = 2 - -data = polyfit(x, y, deg) diff --git a/tests/test_projections.py b/tests/test_projections.py index a605bb1..f070fc4 100644 --- a/tests/test_projections.py +++ b/tests/test_projections.py @@ -13,6 +13,6 @@ def test_get_transformer(self): @pytest.mark.unittest def test_xy_to_ll(self): - lon_dec, lat_dec = projections.xy_to_ll(141000, 455000, 28992) + lat_dec, lon_dec = projections.xy_to_ll(141000, 455000, 28992) assert_almost_equal(lon_dec, 5.182956740521864) assert_almost_equal(lat_dec, 52.083091710433095)