[mapserver-commits] r10993 - trunk/msautotest/mspython

[svn at osgeo.org]

Author: warmerdam
Date: 2011-02-16 10:25:23 -0800 (Wed, 16 Feb 2011)
New Revision: 10993

Modified:
   trunk/msautotest/mspython/rqtest.py
Log:
update to account for RFC 65 query changes

Modified: trunk/msautotest/mspython/rqtest.py
===================================================================
--- trunk/msautotest/mspython/rqtest.py	2011-02-15 17:21:06 UTC (rev 10992)
+++ trunk/msautotest/mspython/rqtest.py	2011-02-16 18:25:23 UTC (rev 10993)
@@ -47,8 +47,9 @@
             break
         
         print '(%d,%d)' % (result.shapeindex, result.tileindex)
-        
-        s = layer.getFeature( result.shapeindex, result.tileindex )
+
+        s = layer.getShape( result )
+
         for i in range(layer.numitems):
             print '%s: %s' % (layer.getItem(i), s.getValue(i))
             
@@ -108,7 +109,7 @@
     # Check first shape attributes.
     
     result = layer.getResult( 0 )
-    s = layer.getFeature( result.shapeindex, result.tileindex )
+    s = layer.getShape( result )
     
     if pmstestlib.check_items( layer, s,
                                [('value_0','115'),
@@ -150,7 +151,7 @@
     # Check last shape attributes.
 
     result = layer.getResult( 54 )
-    s = layer.getFeature( result.shapeindex, result.tileindex )
+    s = layer.getShape( result )
 
     if pmstestlib.check_items( layer, s,
                                [('value_0','132'),
@@ -203,7 +204,7 @@
     # Check first shape attributes.
     
     result = layer.getResult( 0 )
-    s = layer.getFeature( result.shapeindex, result.tileindex )
+    s = layer.getShape( result )
     
     if pmstestlib.check_items( layer, s,
                                [('value_0','123'),
@@ -215,7 +216,7 @@
     # Check last shape attributes.
 
     result = layer.getResult( 8 )
-    s = layer.getFeature( result.shapeindex, result.tileindex )
+    s = layer.getShape( result )
 
     if pmstestlib.check_items( layer, s,
                                [('value_0','107'),
@@ -268,7 +269,7 @@
     # Check first shape attributes.
     
     result = layer.getResult( 0 )
-    s = layer.getFeature( result.shapeindex, result.tileindex )
+    s = layer.getShape( result )
     
     if pmstestlib.check_items( layer, s,
                                [('value_0','115'),
@@ -322,7 +323,7 @@
     # Check first shape attributes.
     
     result = layer.getResult( 0 )
-    s = layer.getFeature( result.shapeindex, result.tileindex )
+    s = layer.getShape( result )
     
     if pmstestlib.check_items( layer, s,
                                [('value_0','148'),
@@ -338,7 +339,7 @@
     # Check last shape attributes.
 
     result = layer.getResult( 99 )
-    s = layer.getFeature( result.shapeindex, result.tileindex )
+    s = layer.getShape( result )
 
     if pmstestlib.check_items( layer, s,
                                [('value_0','132'),
@@ -399,7 +400,7 @@
     # Check first shape attributes.
     
     result = layer.getResult( 0 )
-    s = layer.getFeature( result.shapeindex, result.tileindex )
+    s = layer.getShape( result )
     
     if pmstestlib.check_items( layer, s,
                                [('value_0','115'),
@@ -441,7 +442,7 @@
     # Check last shape attributes.
 
     result = layer.getResult( 46 )
-    s = layer.getFeature( result.shapeindex, result.tileindex )
+    s = layer.getShape( result )
 
     if pmstestlib.check_items( layer, s,
                                [('value_0','148'),
@@ -502,7 +503,7 @@
     # Check first shape attributes.
     
     result = layer.getResult( 0 )
-    s = layer.getFeature( result.shapeindex, result.tileindex )
+    s = layer.getShape( result )
     
     if pmstestlib.check_items( layer, s,
                                [('value_0','0'),
@@ -558,7 +559,7 @@
         return 'fail'
 
     result = layer.getResult( 0 )
-    s = layer.getFeature( result.shapeindex, result.tileindex )
+    s = layer.getShape( result )
     
     if pmstestlib.check_items( layer, s,
                                [('value_0','1'),
@@ -618,7 +619,7 @@
 
         count = count + 1
 
-        s = layer.getFeature( result.shapeindex, result.tileindex )
+        s = layer.getShape( result )
         x = float(pmstestlib.get_item_value( layer, s, 'x' ))
         y = float(pmstestlib.get_item_value( layer, s, 'y' ))
         dist_sq = (x-pnt.x) * (x-pnt.x) + (y-pnt.y) * (y-pnt.y)
@@ -682,7 +683,7 @@
 
         count = count + 1
 
-        s = layer.getFeature( result.shapeindex, result.tileindex )
+        s = layer.getShape( result )
         x = float(pmstestlib.get_item_value( layer, s, 'x' ))
         y = float(pmstestlib.get_item_value( layer, s, 'y' ))
         dist_sq = (x-pnt.x) * (x-pnt.x) + (y-pnt.y) * (y-pnt.y)