Skip to content

Commit

Permalink
formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
jjimenezshaw committed May 16, 2023
1 parent dd4e456 commit 3180e72
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 13 deletions.
4 changes: 3 additions & 1 deletion pyproj/crs/crs.py
Original file line number Diff line number Diff line change
Expand Up @@ -1227,7 +1227,9 @@ def to_wkt(
-------
str
"""
wkt = self._crs.to_wkt(version=version, pretty=pretty, output_axis_rule=output_axis_rule)
wkt = self._crs.to_wkt(
version=version, pretty=pretty, output_axis_rule=output_axis_rule
)
if wkt is None:
raise CRSError(
f"CRS cannot be converted to a WKT string of a '{version}' version. "
Expand Down
35 changes: 23 additions & 12 deletions test/crs/test_crs.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,29 +230,40 @@ def test_to_wkt_pretty():
assert "\n" in crs.to_wkt(pretty=True)
assert "\n" not in crs.to_wkt()

@pytest.mark.parametrize("version, expected", [
("WKT1_GDAL", False),
("WKT1_ESRI", False),
("WKT2_2019", True),])

@pytest.mark.parametrize(
"version, expected",
[
("WKT1_GDAL", False),
("WKT1_ESRI", False),
("WKT2_2019", True),
],
)
def test_to_wkt_with_axis_rule_4326(version, expected):
crs = CRS.from_epsg(4326)
axis = "AXIS"
assert (axis in crs.to_wkt(version)) == expected
assert (axis in crs.to_wkt(version, output_axis_rule=None)) == expected
assert (axis in crs.to_wkt(version, output_axis_rule=True)) == True
assert (axis in crs.to_wkt(version, output_axis_rule=False)) == False
assert axis in crs.to_wkt(version, output_axis_rule=True)
assert axis not in crs.to_wkt(version, output_axis_rule=False)


@pytest.mark.parametrize("version, expected", [
("WKT1_GDAL", True),
("WKT1_ESRI", False),
("WKT2_2019", True),])
@pytest.mark.parametrize(
"version, expected",
[
("WKT1_GDAL", True),
("WKT1_ESRI", False),
("WKT2_2019", True),
],
)
def test_to_wkt_with_axis_rule_32630(version, expected):
crs = CRS.from_epsg(32630)
axis = "AXIS"
assert (axis in crs.to_wkt(version)) == expected
assert (axis in crs.to_wkt(version, output_axis_rule=None)) == expected
assert (axis in crs.to_wkt(version, output_axis_rule=True)) == True
assert (axis in crs.to_wkt(version, output_axis_rule=False)) == False
assert axis in crs.to_wkt(version, output_axis_rule=True)
assert axis not in crs.to_wkt(version, output_axis_rule=False)


def test_repr():
with pytest.warns(FutureWarning):
Expand Down

0 comments on commit 3180e72

Please sign in to comment.