Commit 229fc793 authored by Sergey Fedoseev's avatar Sergey Fedoseev Committed by Tim Graham
Browse files

Refs #25663 -- Fixed checking of the number of points for LineString if... 

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

django/contrib/gis/geos/linestring.py

+14 −13
Original line number Diff line number Diff line
@@ -32,18 +32,22 @@ class LineString(ProjectInterpolateMixin, GEOSGeometry): 
        else:

            coords = args



        if isinstance(coords, (tuple, list)):

            # Getting the number of coords and the number of dimensions -- which

            #  must stay the same, e.g., no LineString((1, 2), (1, 2, 3)).

        if not (isinstance(coords, (tuple, list)) or numpy and isinstance(coords, numpy.ndarray)):

            raise TypeError('Invalid initialization input for LineStrings.')



        ncoords = len(coords)

        if ncoords < self._minlength:

                raise TypeError(

            raise ValueError(

                '%s requires at least %d points, got %s.' % (

                    self.__class__.__name__,

                    self._minlength,

                    ncoords,

                )

            )



        if isinstance(coords, (tuple, list)):

            # Getting the number of coords and the number of dimensions -- which

            #  must stay the same, e.g., no LineString((1, 2), (1, 2, 3)).

            ndim = None

            # Incrementing through each of the coordinates and verifying

            for coord in coords:
@@ -56,16 +60,13 @@ class LineString(ProjectInterpolateMixin, GEOSGeometry): 
                elif len(coord) != ndim:

                    raise TypeError('Dimension mismatch.')

            numpy_coords = False

        elif numpy and isinstance(coords, numpy.ndarray):

        else:

            shape = coords.shape  # Using numpy's shape.

            if len(shape) != 2:

                raise TypeError('Too many dimensions.')

            self._checkdim(shape[1])

            ncoords = shape[0]

            ndim = shape[1]

            numpy_coords = True

        else:

            raise TypeError('Invalid initialization input for LineStrings.')



        # Creating a coordinate sequence object because it is easier to

        # set the points using GEOSCoordSeq.__setitem__().

tests/gis_tests/geos_tests/test_geos.py

+18 −6
Original line number Diff line number Diff line
@@ -328,9 +328,17 @@ class GEOSTest(SimpleTestCase, TestDataMixin): 
        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.'):

        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."

        prev = fromstr('POINT(0 0)')
@@ -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)