p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #25664 -- Fixed `dims` for `Point`

This commit is contained in:
Sergey Fedoseev 2015-11-02 20:20:53 +05:00 committed by Claude Paroz
parent 7127eb287f
commit 03c6ad7ad4
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/geos/prototypes/geom.py
View File

@ -82,7 +82,7 @@ to_wkt = StringFromGeom('GEOSGeomToWKT')
geos_normalize = IntFromGeom('GEOSNormalize') geos_normalize = IntFromGeom('GEOSNormalize')
geos_type = StringFromGeom('GEOSGeomType') geos_type = StringFromGeom('GEOSGeomType')
geos_typeid = IntFromGeom('GEOSGeomTypeId') geos_typeid = IntFromGeom('GEOSGeomTypeId')
get_dims = IntFromGeom('GEOSGeom_getDimensions', zero=True) get_dims = GEOSFuncFactory('GEOSGeom_getDimensions', argtypes=[GEOM_PTR], restype=c_int)
get_num_coords = IntFromGeom('GEOSGetNumCoordinates') get_num_coords = IntFromGeom('GEOSGetNumCoordinates')
get_num_geoms = IntFromGeom('GEOSGetNumGeometries') get_num_geoms = IntFromGeom('GEOSGetNumGeometries')

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

@ -228,6 +228,7 @@ class GEOSTest(unittest.TestCase, TestDataMixin):
pnt = fromstr(p.wkt) pnt = fromstr(p.wkt)
self.assertEqual(pnt.geom_type, 'Point') self.assertEqual(pnt.geom_type, 'Point')
self.assertEqual(pnt.geom_typeid, 0) self.assertEqual(pnt.geom_typeid, 0)
self.assertEqual(pnt.dims, 0)
self.assertEqual(p.x, pnt.x) self.assertEqual(p.x, pnt.x)
self.assertEqual(p.y, pnt.y) self.assertEqual(p.y, pnt.y)
self.assertEqual(pnt, fromstr(p.wkt)) self.assertEqual(pnt, fromstr(p.wkt))
@ -281,6 +282,7 @@ class GEOSTest(unittest.TestCase, TestDataMixin):
mpnt = fromstr(mp.wkt) mpnt = fromstr(mp.wkt)
self.assertEqual(mpnt.geom_type, 'MultiPoint') self.assertEqual(mpnt.geom_type, 'MultiPoint')
self.assertEqual(mpnt.geom_typeid, 4) self.assertEqual(mpnt.geom_typeid, 4)
self.assertEqual(mpnt.dims, 0)
self.assertAlmostEqual(mp.centroid[0], mpnt.centroid.tuple[0], 9) self.assertAlmostEqual(mp.centroid[0], mpnt.centroid.tuple[0], 9)
self.assertAlmostEqual(mp.centroid[1], mpnt.centroid.tuple[1], 9) self.assertAlmostEqual(mp.centroid[1], mpnt.centroid.tuple[1], 9)
@ -301,6 +303,7 @@ class GEOSTest(unittest.TestCase, TestDataMixin):
ls = fromstr(l.wkt) ls = fromstr(l.wkt)
self.assertEqual(ls.geom_type, 'LineString') self.assertEqual(ls.geom_type, 'LineString')
self.assertEqual(ls.geom_typeid, 1) self.assertEqual(ls.geom_typeid, 1)
self.assertEqual(ls.dims, 1)
self.assertEqual(ls.empty, False) self.assertEqual(ls.empty, False)
self.assertEqual(ls.ring, False) self.assertEqual(ls.ring, False)
if hasattr(l, 'centroid'): if hasattr(l, 'centroid'):
@ -329,6 +332,7 @@ class GEOSTest(unittest.TestCase, TestDataMixin):
ml = fromstr(l.wkt) ml = fromstr(l.wkt)
self.assertEqual(ml.geom_type, 'MultiLineString') self.assertEqual(ml.geom_type, 'MultiLineString')
self.assertEqual(ml.geom_typeid, 5) self.assertEqual(ml.geom_typeid, 5)
self.assertEqual(ml.dims, 1)
self.assertAlmostEqual(l.centroid[0], ml.centroid.x, 9) self.assertAlmostEqual(l.centroid[0], ml.centroid.x, 9)
self.assertAlmostEqual(l.centroid[1], ml.centroid.y, 9) self.assertAlmostEqual(l.centroid[1], ml.centroid.y, 9)
@ -352,6 +356,7 @@ class GEOSTest(unittest.TestCase, TestDataMixin):
lr = fromstr(rr.wkt) lr = fromstr(rr.wkt)
self.assertEqual(lr.geom_type, 'LinearRing') self.assertEqual(lr.geom_type, 'LinearRing')
self.assertEqual(lr.geom_typeid, 2) self.assertEqual(lr.geom_typeid, 2)
self.assertEqual(lr.dims, 1)
self.assertEqual(rr.n_p, len(lr)) self.assertEqual(rr.n_p, len(lr))
self.assertEqual(True, lr.valid) self.assertEqual(True, lr.valid)
self.assertEqual(False, lr.empty) self.assertEqual(False, lr.empty)
@ -385,6 +390,7 @@ class GEOSTest(unittest.TestCase, TestDataMixin):
poly = fromstr(p.wkt) poly = fromstr(p.wkt)
self.assertEqual(poly.geom_type, 'Polygon') self.assertEqual(poly.geom_type, 'Polygon')
self.assertEqual(poly.geom_typeid, 3) self.assertEqual(poly.geom_typeid, 3)
self.assertEqual(poly.dims, 2)
self.assertEqual(poly.empty, False) self.assertEqual(poly.empty, False)
self.assertEqual(poly.ring, False) self.assertEqual(poly.ring, False)
self.assertEqual(p.n_i, poly.num_interior_rings) self.assertEqual(p.n_i, poly.num_interior_rings)
@ -462,6 +468,7 @@ class GEOSTest(unittest.TestCase, TestDataMixin):
mpoly = fromstr(mp.wkt) mpoly = fromstr(mp.wkt)
self.assertEqual(mpoly.geom_type, 'MultiPolygon') self.assertEqual(mpoly.geom_type, 'MultiPolygon')
self.assertEqual(mpoly.geom_typeid, 6) self.assertEqual(mpoly.geom_typeid, 6)
self.assertEqual(mpoly.dims, 2)
self.assertEqual(mp.valid, mpoly.valid) self.assertEqual(mp.valid, mpoly.valid)
if mp.valid: if mp.valid:
@ -831,6 +838,19 @@ class GEOSTest(unittest.TestCase, TestDataMixin):
else: else:
self.assertRaises(IndexError, g.__getitem__, 0) self.assertRaises(IndexError, g.__getitem__, 0)
def test_collection_dims(self):
gc = GeometryCollection([])
self.assertEqual(gc.dims, -1)
gc = GeometryCollection(Point(0, 0))
self.assertEqual(gc.dims, 0)
gc = GeometryCollection(LineString((0, 0), (1, 1)), Point(0, 0))
self.assertEqual(gc.dims, 1)
gc = GeometryCollection(LineString((0, 0), (1, 1)), Polygon(((0, 0), (0, 1), (1, 1), (0, 0))), Point(0, 0))
self.assertEqual(gc.dims, 2)
def test_collections_of_collections(self): def test_collections_of_collections(self):
"Testing GeometryCollection handling of other collections." "Testing GeometryCollection handling of other collections."
# Creating a GeometryCollection WKT string composed of other # Creating a GeometryCollection WKT string composed of other