Geo errors fix and test update

This commit is contained in:
Ross Lawley 2013-04-30 16:42:38 +00:00
parent 68f760b563
commit 473d5ead7b
2 changed files with 5 additions and 5 deletions

View File

@ -456,7 +456,7 @@ class GeoJsonBaseField(BaseField):
if error and error not in errors:
errors.append(error)
if errors:
return "Invalid Polygon:\n%s" % ", ".join(set(errors))
return "Invalid Polygon:\n%s" % ", ".join(errors)
def _validate_linestring(self, value, top_level=True):
"""Validates a linestring"""
@ -478,7 +478,7 @@ class GeoJsonBaseField(BaseField):
if top_level:
return "Invalid LineString:\n%s" % ", ".join(errors)
else:
return "%s" % ", ".join(set(errors))
return "%s" % ", ".join(errors)
def _validate_point(self, value):
"""Validate each set of coords"""

View File

@ -184,9 +184,9 @@ class GeoFieldTest(unittest.TestCase):
polygon = PolygonField()
geo_indicies = Event._geo_indices()
self.assertEqual(geo_indicies, [{'fields': [('line', '2dsphere')]},
{'fields': [('polygon', '2dsphere')]},
{'fields': [('point', '2dsphere')]}])
self.assertTrue({'fields': [('line', '2dsphere')]} in geo_indicies)
self.assertTrue({'fields': [('polygon', '2dsphere')]} in geo_indicies)
self.assertTrue({'fields': [('point', '2dsphere')]} in geo_indicies)
def test_indexes_2dsphere_embedded(self):
"""Ensure that indexes are created automatically for GeoPointFields.