@@ -237,30 +237,6 @@ def test_transform_bbox():
237237 ),
238238 id = 'nested-geometry-name'
239239 ),
240- pytest .param (
241- '(some_attribute = 10 AND S_INTERSECTS(geometry, POINT(1 1))) OR '
242- 'DWITHIN(geometry, POINT(2 2), 10, meters)' ,
243- 'http://www.opengis.net/def/crs/OGC/1.3/CRS84' ,
244- None ,
245- 'custom_geom_name' ,
246- pygeofilter .ast .Or (
247- pygeofilter .ast .And (
248- pygeofilter .ast .Equal (
249- pygeofilter .ast .Attribute (name = 'some_attribute' ), 10 ),
250- pygeofilter .ast .GeometryIntersects (
251- pygeofilter .ast .Attribute (name = 'custom_geom_name' ),
252- Geometry ({'type' : 'Point' , 'coordinates' : (1 , 1 )})
253- ),
254- ),
255- pygeofilter .ast .DistanceWithin (
256- pygeofilter .ast .Attribute (name = 'custom_geom_name' ),
257- Geometry ({'type' : 'Point' , 'coordinates' : (2 , 2 )}),
258- distance = 10 ,
259- units = 'meters' ,
260- )
261- ),
262- id = 'complex-filter-name'
263- ),
264240 pytest .param (
265241 'S_INTERSECTS(geometry, POINT(12.512829 41.896698))' ,
266242 'http://www.opengis.net/def/crs/OGC/1.3/CRS84' ,
@@ -287,30 +263,6 @@ def test_transform_bbox():
287263 ),
288264 id = 'nested-geometry-transformed-coords'
289265 ),
290- pytest .param (
291- '(some_attribute = 10 AND S_INTERSECTS(geometry, POINT(12.512829 41.896698))) OR ' # noqa
292- 'DWITHIN(geometry, POINT(12 41), 10, meters)' ,
293- 'http://www.opengis.net/def/crs/OGC/1.3/CRS84' ,
294- 'http://www.opengis.net/def/crs/EPSG/0/3004' ,
295- None ,
296- pygeofilter .ast .Or (
297- pygeofilter .ast .And (
298- pygeofilter .ast .Equal (
299- pygeofilter .ast .Attribute (name = 'some_attribute' ), 10 ),
300- pygeofilter .ast .GeometryIntersects (
301- pygeofilter .ast .Attribute (name = 'geometry' ),
302- Geometry ({'type' : 'Point' , 'coordinates' : (2313682.387730346 , 4641308.550187246 )}) # noqa
303- ),
304- ),
305- pygeofilter .ast .DistanceWithin (
306- pygeofilter .ast .Attribute (name = 'geometry' ),
307- Geometry ({'type' : 'Point' , 'coordinates' : (2267681.8892602 , 4543101.513292163 )}), # noqa
308- distance = 10 ,
309- units = 'meters' ,
310- )
311- ),
312- id = 'complex-filter-transformed-coords'
313- ),
314266 pytest .param (
315267 'S_INTERSECTS(geometry, SRID=3857;POINT(1392921 5145517))' ,
316268 'http://www.opengis.net/def/crs/OGC/1.3/CRS84' ,
0 commit comments