Changeset 9060

Timestamp:

Jun 1, 2009, 8:12:48 PM (15 years ago)

Author:

sdlime

Message:

Fixed whichShapes() to respect filters AND return all items. (#2689)

File:

• branches/branch-5-4/mapserver/mapscript/swiginc/layer.i (modified) (1 diff)

branches/branch-5-4/mapserver/mapscript/swiginc/layer.i

@@ -157 +157 @@
     int whichShapes(rectObj rect)
     {
-        /* 
-        ** We assume folks use this like a simple query so retrieve all items with each shape.
-        */
-        if(msLayerWhichItems(self, MS_TRUE, MS_FALSE, NULL) != MS_SUCCESS) return MS_FAILURE;
+        int oldconnectiontype = self->connectiontype;
+        self->connectiontype = MS_INLINE;
+
+        if(msLayerWhichItems(self, MS_TRUE, MS_FALSE, NULL) != MS_SUCCESS) {
+            self->connectiontype = oldconnectiontype;
+            return MS_FAILURE;
+        }
+        self->connectiontype = oldconnectiontype;
+
         return msLayerWhichShapes(self, rect);
-    }   
+    }
 
     %newobject nextShape;