Changeset 3715 for framework

Timestamp:

01/05/11 12:17:19 (17 months ago)

Author:

bbinet

Message:

fix error 500 when geometry is null and update mapfish protocol to allow to send features with null geometry, r=elemoine (closes #607)

Location:

framework/server/trunk/mapfish

Files:

• protocol.py (modified) (2 diffs)
• sqlalchemygeom.py (modified) (1 diff)
• tests/test_mysql.py (modified) (3 diffs)
• tests/test_oracle.py (modified) (4 diffs)
• tests/test_postgis.py (modified) (2 diffs)
• tests/test_spatialite.py (modified) (2 diffs)

framework/server/trunk/mapfish/protocol.py

@@ -279 +279 @@
             ret = FeatureCollection(
                     [self._filter_attrs(o.toFeature(), request) \
-                        for o in objs if o.geometry is not None])
+                        for o in objs])
         return ret
 
@@ -311 +311 @@
         response.status = 201
         if len(objects) > 0:
-            features = [o.toFeature() for o in objects \
-                            if o.geometry is not None]
+            features = [o.toFeature() for o in objects]
             return FeatureCollection(features)
         return

framework/server/trunk/mapfish/sqlalchemygeom.py

@@ -212 +212 @@
             # we already have the geometry as Shapely geometry (when updating/inserting)
             geometry = self.geometry.shape
-        else:
+        elif hasattr(self.geometry, 'geom_wkb') and self.geometry.geom_wkb is not None:
             # create a Shapely geometry from the WKB geometry returned from the database
             geometry = loads(str(self.geometry.geom_wkb))
+        else:
+            geometry = None
 
         return Feature(id=self.fid, 
                        geometry=geometry,
                        properties=attributes,
-                       bbox=geometry.bounds)
+                       bbox=None if geometry is None else geometry.bounds)
 
 

framework/server/trunk/mapfish/tests/test_mysql.py

@@ -60 +60 @@
     spot_id = Column(Integer, primary_key=True)
     spot_height = Column(Numeric(precision=10, scale=2, asdecimal=False))
-    spot_location = GeometryColumn(Point(2))
+    spot_location = GeometryColumn(Point(2, spatial_index=False), nullable=True)
 
 GeometryDDL(Spot.__table__)
@@ -91 +91 @@
             Spot(spot_height=783.55, spot_location='POINT(38 34)'),
             Spot(spot_height=3454.67, spot_location='POINT(-134 45)'),
-            Spot(spot_height=6454.23, spot_location='POINT(-135 56)')
+            Spot(spot_height=6454.23, spot_location=None)
             ])
         
@@ -337 +337 @@
         eq_(feature.geometry.coordinates, (0.0, 0.0))
         eq_(feature.properties["spot_height"], 420.39999999999998)
+
+
+    def test_protocol_read_one_null(self):
+        """Return one null feature"""
+        proto = Protocol(session, Spot)
+
+        feature = proto.read(FakeRequest({}), id=9)
+        ok_(feature is not None)
+        ok_(isinstance(feature, Feature))
+        eq_(feature.id, 9)
+        # make use of __geo_interface__ property since 'geometry'
+        # value is not the same in various versions of geojson lib
+        ok_(feature.__geo_interface__['geometry'] is None)
+        ok_(feature.__geo_interface__['bbox'] is None)
 
 

framework/server/trunk/mapfish/tests/test_oracle.py

@@ -37 +37 @@
 
 from geoalchemy import (Point, Polygon, GeometryColumn, GeometryDDL)
+from geoalchemy.oracle import ORACLE_NULL_GEOMETRY
 
 from mapfish.sqlalchemygeom import GeometryTableMixIn
@@ -107 +108 @@
             Spot(spot_height=783.55, spot_location='POINT(38 34)'),
             Spot(spot_height=3454.67, spot_location='POINT(-134 45)'),
-            Spot(spot_height=6454.23, spot_location='POINT(-135 56)')
+            Spot(spot_height=6454.23, spot_location=ORACLE_NULL_GEOMETRY)
             ])
         
@@ -295 +296 @@
         
         filter = create_default_filter(request, Spot, additional_params={'params': 'unit=KM'})
-        eq_(proto.count(request, filter=filter), '9')
+        eq_(proto.count(request, filter=filter), '8')
         
 
@@ -367 +368 @@
 
 
+    def test_protocol_read_one_null(self):
+        """Return one null feature"""
+        proto = Protocol(session, Spot)
+
+        feature = proto.read(FakeRequest({}), id=9)
+        ok_(feature is not None)
+        ok_(isinstance(feature, Feature))
+        eq_(feature.id, 9)
+        # make use of __geo_interface__ property since 'geometry'
+        # value is not the same in various versions of geojson lib
+        ok_(feature.__geo_interface__['geometry'] is None)
+        ok_(feature.__geo_interface__['bbox'] is None)
+
+
     @raises(HTTPNotFound)
     def test_protocol_read_one_fails(self):

framework/server/trunk/mapfish/tests/test_postgis.py

@@ -91 +91 @@
             Spot(spot_height=783.55, spot_location='POINT(38 34)'),
             Spot(spot_height=3454.67, spot_location='POINT(-134 45)'),
-            Spot(spot_height=6454.23, spot_location='POINT(-135 56)')
+            Spot(spot_height=6454.23, spot_location=None)
             ])
         
@@ -329 +329 @@
         eq_(feature.geometry.coordinates, (0.0, 0.0))
         eq_(feature.properties["spot_height"], 420.39999999999998)
+
+
+    def test_protocol_read_one_null(self):
+        """Return one null feature"""
+        proto = Protocol(session, Spot)
+
+        feature = proto.read(FakeRequest({}), id=9)
+        ok_(feature is not None)
+        ok_(isinstance(feature, Feature))
+        eq_(feature.id, 9)
+        # make use of __geo_interface__ property since 'geometry'
+        # value is not the same in various versions of geojson lib
+        ok_(feature.__geo_interface__['geometry'] is None)
+        ok_(feature.__geo_interface__['bbox'] is None)
 
 

framework/server/trunk/mapfish/tests/test_spatialite.py

@@ -110 +110 @@
             Spot(spot_height=783.55, spot_location='POINT(38 34)'),
             Spot(spot_height=3454.67, spot_location='POINT(-134 45)'),
-            Spot(spot_height=6454.23, spot_location='POINT(-135 56)')
+            Spot(spot_height=6454.23, spot_location=None)
             ])
         
@@ -349 +349 @@
         eq_(feature.properties["spot_height"], 420.39999999999998)
         proto = Protocol(session, Spot)
+
+
+    def test_protocol_read_one_null(self):
+        """Return one null feature"""
+        proto = Protocol(session, Spot)
+
+        feature = proto.read(FakeRequest({}), id=9)
+        ok_(feature is not None)
+        ok_(isinstance(feature, Feature))
+        eq_(feature.id, 9)
+        # make use of __geo_interface__ property since 'geometry'
+        # value is not the same in various versions of geojson lib
+        ok_(feature.__geo_interface__['geometry'] is None)
+        ok_(feature.__geo_interface__['bbox'] is None)