mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-16 21:34:37 +00:00
Code Issues 32 Releases Wiki Activity

Refs #36036 -- Removed unsupported 4D GEOS tests.

Browse Source
This commit is contained in:
Andrew 2025-04-09 21:40:55 -04:00 committed by GitHub
parent 1429e722f2
commit 2d1ac1dce8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/gis_tests/gdal_tests/test_geom.py
View File

@ -1,6 +1,5 @@
import json
import pickle
from unittest import mock, skipIf
from django.contrib.gis.gdal import (
CoordTransform,
@ -11,7 +10,6 @@ from django.contrib.gis.gdal import (
)
from django.contrib.gis.gdal.geometries import CircularString, CurvePolygon
from django.contrib.gis.geos import GEOSException
from django.contrib.gis.geos.libgeos import geos_version_tuple
from django.template import Context
from django.template.engine import Engine
from django.test import SimpleTestCase
@ -873,19 +871,12 @@ class OGRGeomTest(SimpleTestCase, TestDataMixin):
self.assertEqual(geom.geom_type.name, "PointM")
self.assertEqual(geom.geom_type.num, 2001)
@skipIf(geos_version_tuple() < (3, 12), "GEOS >= 3.12.0 is required")
def test_point_m_dimension_geos(self):
geo_zm = OGRGeometry("POINT ZM (1 2 3 4)")
self.assertEqual(geo_zm.geos.wkt, "POINT ZM (1 2 3 4)")
geo_m = OGRGeometry("POINT M (1 2 3)")
self.assertEqual(geo_m.geos.wkt, "POINT M (1 2 3)")
@mock.patch("django.contrib.gis.geos.libgeos.geos_version", lambda: b"3.11.0")
def test_point_m_dimension_geos_version(self):
geo_zm = OGRGeometry("POINT ZM (1 2 3 4)")
self.assertEqual(geo_zm.geos.wkt, "POINT Z (1 2 3)")
geo_m = OGRGeometry("POINT M (1 2 3)")
self.assertEqual(geo_m.geos.wkt, "POINT (1 2)")
"""GEOSGeometry does not yet support the M dimension."""
geom = OGRGeometry("POINT ZM (1 2 3 4)")
self.assertEqual(geom.geos.wkt, "POINT Z (1 2 3)")
geom = OGRGeometry("POINT M (1 2 3)")
self.assertEqual(geom.geos.wkt, "POINT (1 2)")
def test_centroid(self):
point = OGRGeometry("POINT (1 2 3)")

22
tests/gis_tests/geos_tests/test_geos.py
View File

@ -86,22 +86,6 @@ class GEOSTest(SimpleTestCase, TestDataMixin):
# Redundant sanity check.
self.assertEqual(4326, GEOSGeometry(hexewkb_2d).srid)
@skipIf(geos_version_tuple() < (3, 12), "GEOS >= 3.12.0 is required")
def test_4d_hexewkb(self):
ogc_hex_4d = (
b"01010000C00000000000000000000000000000"
b"F03F00000000000000400000000000000000"
)
hexewkb_4d = (
b"01010000E0E61000000000000000000000000000000000"
b"F03F00000000000000400000000000000000"
)
pnt_4d = Point(0, 1, 2, 0, srid=4326)
self.assertEqual(ogc_hex_4d, pnt_4d.hex)
self.assertEqual(hexewkb_4d, pnt_4d.hexewkb)
self.assertIs(GEOSGeometry(hexewkb_4d).hasm, True)
self.assertEqual(memoryview(a2b_hex(hexewkb_4d)), pnt_4d.ewkb)
def test_kml(self):
"Testing KML output."
for tg in self.geometries.wkt_out:
@ -1285,12 +1269,6 @@ class GEOSTest(SimpleTestCase, TestDataMixin):
self.assertEqual(g2.hex, g2.ogr.hex)
self.assertEqual("WGS 84", g2.srs.name)
@skipIf(geos_version_tuple() < (3, 12), "GEOS >= 3.12.0 is required")
def test_gdal_4d(self):
g1_4d = fromstr("POINT(5 23 8 0)")
self.assertIsInstance(g1_4d.ogr, gdal.OGRGeometry)
self.assertEqual(g1_4d.ogr.m, 0)
def test_copy(self):
"Testing use with the Python `copy` module."
import copy