mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Refs #25663 -- Fixed checking of the number of points for LineString if initialized from numpy.array.

Browse Source
This commit is contained in:
Sergey Fedoseev
2015-11-23 10:19:06 +05:00
committed by Tim Graham
parent 97e1d24330
commit 229fc793a0
2 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -325,11 +325,19 @@ class GEOSTest(SimpleTestCase, TestDataMixin):
if numpy:
self.assertEqual(ls, LineString(numpy.array(ls.tuple))) # as numpy array
with self.assertRaisesMessage(TypeError, 'Each coordinate should be a sequence (list or tuple)'):
LineString((0, 0))
with self.assertRaisesMessage(TypeError, 'Each coordinate should be a sequence (list or tuple)'):
LineString((0, 0))
with self.assertRaisesMessage(TypeError, 'LineString requires at least 2 points, got 1.'):
LineString([(0, 0)])
with self.assertRaisesMessage(ValueError, 'LineString requires at least 2 points, got 1.'):
LineString([(0, 0)])
if numpy:
with self.assertRaisesMessage(ValueError, 'LineString requires at least 2 points, got 1.'):
LineString(numpy.array([(0, 0)]))
with mock.patch('django.contrib.gis.geos.linestring.numpy', False):
with self.assertRaisesMessage(TypeError, 'Invalid initialization input for LineStrings.'):
LineString('wrong input')
def test_multilinestring(self):
"Testing MultiLineString objects."
@@ -374,12 +382,16 @@ class GEOSTest(SimpleTestCase, TestDataMixin):
if numpy:
self.assertEqual(lr, LinearRing(numpy.array(lr.tuple)))
with self.assertRaisesMessage(TypeError, 'LinearRing requires at least 4 points, got 3.'):
with self.assertRaisesMessage(ValueError, 'LinearRing requires at least 4 points, got 3.'):
LinearRing((0, 0), (1, 1), (0, 0))
with self.assertRaisesMessage(TypeError, 'LinearRing requires at least 4 points, got 1.'):
with self.assertRaisesMessage(ValueError, 'LinearRing requires at least 4 points, got 1.'):
LinearRing([(0, 0)])
if numpy:
with self.assertRaisesMessage(ValueError, 'LinearRing requires at least 4 points, got 1.'):
LinearRing(numpy.array([(0, 0)]))
def test_polygons_from_bbox(self):
"Testing `from_bbox` class method."
bbox = (-180, -90, 180, 90)