Ticket #10380: gis_envelope_min_max.diff

django/contrib/gis/tests/test_gdal_envelope.py

@@ -15 +15 @@
         self.assertRaises(OGRException, Envelope, ())
         self.assertRaises(ValueError, Envelope, 0, 'a', 5, 5)
         self.assertRaises(TypeError, Envelope, u'foo')
+        self.assertRaises(OGRException, Envelope, (1, 1, 0, 0))
+        try:
+            Envelope(0, 0, 0, 0)
+        except OGRException:
+            self.fail('shouldn\'t raise an exception for min_x == max_x or min_y == max_y')
 
     def test02_properties(self):
         "Testing Envelope properties."

django/contrib/gis/gdal/envelope.py

@@ -58 +58 @@
             raise OGRException('Incorrect number (%d) of arguments.' % len(args))
 
         # Checking the x,y coordinates
-        if self.min_x >= self.max_x:
-            raise OGRException('Envelope minimum X >= maximum X.')
-        if self.min_y >= self.max_y:
-            raise OGRException('Envelope minimum Y >= maximum Y.')
+        if self.min_x > self.max_x:
+            raise OGRException('Envelope minimum X > maximum X.')
+        if self.min_y > self.max_y:
+            raise OGRException('Envelope minimum Y > maximum Y.')
 
     def __eq__(self, other):
         """