Skip to content

Commit

Permalink
Allow differences in precision
Browse files Browse the repository at this point in the history
  • Loading branch information
James McKinney committed Feb 13, 2017
1 parent 90c6714 commit a64b296
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion boundaries/tests/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ class GeoTests(object):
def test_wkt(self):
response = self.client.get(self.url, {'format': 'wkt'})
self.assertResponse(response, content_type='text/plain')
self.assertEqual(response.content, b'MULTIPOLYGON (((0.0000000000000000 0.0000000000000000, 0.0000000000000000 5.0000000000000000, 5.0000000000000000 5.0000000000000000, 0.0000000000000000 0.0000000000000000)))')
self.assertEqual(response.content, b'MULTIPOLYGON (((0 0, 0 5, 5 5, 0 0)))')

def test_kml(self):
response = self.client.get(self.url, {'format': 'kml'})
Expand Down
5 changes: 3 additions & 2 deletions boundaries/tests/test_geometry.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

from django.contrib.gis.gdal import OGRGeometry, SpatialReference
from django.test import TestCase
from django.utils.six import assertRegex

from boundaries.models import Geometry

Expand All @@ -26,13 +27,13 @@ def test_transform_polygon(self):
geometry = Geometry(OGRGeometry('POLYGON ((0 0,0 5,5 5,0 0))')).transform(SpatialReference(26917))
self.assertIsInstance(geometry, Geometry)
self.assertEqual(geometry.geometry.geom_name, 'MULTIPOLYGON')
self.assertEqual(geometry.wkt, 'MULTIPOLYGON (((-85.488743884706892 0.0,-85.488743884708271 0.000045096879048,-85.488699089723454 0.000045096881835,-85.488743884706892 0.0)))')
assertRegex(self, geometry.wkt, r'MULTIPOLYGON \(\(\(-85.488743884\d{6} 0.0,-85.488743884\d{6} 0.000045096\d{6},-85.488699089\d{6} 0.000045096\d{6},-85.488743884\d{6} 0.0\)\)\)')

def test_transform_multipolygon(self):
geometry = Geometry(OGRGeometry('MULTIPOLYGON (((0 0,0 5,5 5,0 0)))')).transform(SpatialReference(26917))
self.assertIsInstance(geometry, Geometry)
self.assertEqual(geometry.geometry.geom_name, 'MULTIPOLYGON')
self.assertEqual(geometry.wkt, 'MULTIPOLYGON (((-85.488743884706892 0.0,-85.488743884708271 0.000045096879048,-85.488699089723454 0.000045096881835,-85.488743884706892 0.0)))')
assertRegex(self, geometry.wkt, r'MULTIPOLYGON \(\(\(-85.488743884\d{6} 0.0,-85.488743884\d{6} 0.000045096\d{6},-85.488699089\d{6} 0.000045096\d{6},-85.488743884\d{6} 0.0\)\)\)')

def test_transform_nonpolygon(self):
self.assertRaisesRegexp(ValueError, r'\AThe geometry is a Point but must be a Polygon or a MultiPolygon\.\Z', Geometry(OGRGeometry('POINT (0 0)')).transform, SpatialReference(26917))
Expand Down

0 comments on commit a64b296

Please sign in to comment.