Skip to content

Commit 394e1a1

Browse files
nyalldawsonnyalldawson
committed
[afs] Remove unused code
1 parent 1e95433 commit 394e1a1

File tree

4 files changed

+4
-224
lines changed

4 files changed

+4
-224
lines changed

‎src/providers/arcgisrest/qgsafsfeatureiterator.cpp

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,9 @@ bool QgsAfsFeatureIterator::fetchFeature( QgsFeature &f )
7070
if ( mFeatureIterator >= mSource->sharedData()->featureCount() )
7171
return false;
7272

73-
QgsAttributeList fetchAttribures;
74-
if ( ( mRequest.flags() & QgsFeatureRequest::SubsetOfAttributes ) != 0 )
75-
fetchAttribures = mRequest.subsetOfAttributes();
76-
else
77-
{
78-
for ( int i = 0; i < mSource->sharedData()->fields().size(); ++i )
79-
fetchAttribures.append( i );
80-
}
81-
8273
if ( mRequest.filterType() == QgsFeatureRequest::FilterFid )
8374
{
84-
bool result = mSource->sharedData()->getFeature( mRequest.filterFid(), f, fetchAttribures );
75+
bool result = mSource->sharedData()->getFeature( mRequest.filterFid(), f );
8576
geometryToDestinationCrs( f, mTransform );
8677
f.setValid( result );
8778
return result;
@@ -93,7 +84,7 @@ bool QgsAfsFeatureIterator::fetchFeature( QgsFeature &f )
9384
filterRect = filterRect.intersect( &mFilterRect );
9485
while ( mFeatureIterator < mSource->sharedData()->featureCount() )
9586
{
96-
bool success = mSource->sharedData()->getFeature( mFeatureIterator, f, fetchAttribures, filterRect );
87+
bool success = mSource->sharedData()->getFeature( mFeatureIterator, f, filterRect );
9788
++mFeatureIterator;
9889
if ( !success )
9990
continue;

‎src/providers/arcgisrest/qgsafsshareddata.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ void QgsAfsSharedData::clearCache()
2323
mCache.clear();
2424
}
2525

26-
bool QgsAfsSharedData::getFeature( QgsFeatureId id, QgsFeature &f, const QList<int> & /*fetchAttributes*/, const QgsRectangle &filterRect )
26+
bool QgsAfsSharedData::getFeature( QgsFeatureId id, QgsFeature &f, const QgsRectangle &filterRect )
2727
{
2828
QMutexLocker locker( &mMutex );
2929

‎src/providers/arcgisrest/qgsafsshareddata.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class QgsAfsSharedData : public QObject
3636
QgsCoordinateReferenceSystem crs() const { return mSourceCRS; }
3737
void clearCache();
3838

39-
bool getFeature( QgsFeatureId id, QgsFeature &f, const QList<int> &fetchAttributes, const QgsRectangle &filterRect = QgsRectangle() );
39+
bool getFeature( QgsFeatureId id, QgsFeature &f, const QgsRectangle &filterRect = QgsRectangle() );
4040

4141
private:
4242
friend class QgsAfsProvider;

‎tests/src/python/test_provider_afs.py

Lines changed: 0 additions & 211 deletions
Original file line numberDiff line numberDiff line change
@@ -223,217 +223,6 @@ def setUpClass(cls):
223223
]
224224
}""".encode('UTF-8'))
225225

226-
with open(sanitize(endpoint, '?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=my:typename&RESULTTYPE=hits'), 'wb') as f:
227-
f.write("""
228-
<wfs:FeatureCollection
229-
xmlns:wfs="http://www.opengis.net/wfs/2.0"
230-
xmlns:gml="http://www.opengis.net/gml/3.2"
231-
xmlns:my="http://my"
232-
numberMatched="5" numberReturned="0" timeStamp="2016-03-25T14:51:48.998Z">
233-
</wfs:FeatureCollection>""".encode('UTF-8'))
234-
235-
with open(sanitize(endpoint, """?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=my:typename&FILTER=<fes:Filter xmlns:fes="http://www.opengis.net/fes/2.0">
236-
<fes:And>
237-
<fes:PropertyIsGreaterThan>
238-
<fes:ValueReference>cnt</fes:ValueReference>
239-
<fes:Literal>100</fes:Literal>
240-
</fes:PropertyIsGreaterThan>
241-
<fes:PropertyIsLessThan>
242-
<fes:ValueReference>cnt</fes:ValueReference>
243-
<fes:Literal>410</fes:Literal>
244-
</fes:PropertyIsLessThan>
245-
</fes:And>
246-
</fes:Filter>
247-
&RESULTTYPE=hits"""), 'wb') as f:
248-
f.write("""
249-
<wfs:FeatureCollection
250-
xmlns:wfs="http://www.opengis.net/wfs/2.0"
251-
xmlns:gml="http://www.opengis.net/gml/3.2"
252-
numberMatched="3" numberReturned="0" timeStamp="2016-03-25T14:51:48.998Z">
253-
</wfs:FeatureCollection>""".encode('UTF-8'))
254-
255-
with open(sanitize(endpoint, """?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=my:typename&SRSNAME=urn:ogc:def:crs:EPSG::4326&FILTER=<fes:Filter xmlns:fes="http://www.opengis.net/fes/2.0">
256-
<fes:And>
257-
<fes:PropertyIsGreaterThan>
258-
<fes:ValueReference>cnt</fes:ValueReference>
259-
<fes:Literal>100</fes:Literal>
260-
</fes:PropertyIsGreaterThan>
261-
<fes:PropertyIsLessThan>
262-
<fes:ValueReference>cnt</fes:ValueReference>
263-
<fes:Literal>410</fes:Literal>
264-
</fes:PropertyIsLessThan>
265-
</fes:And>
266-
</fes:Filter>
267-
"""), 'wb') as f:
268-
f.write("""
269-
<wfs:FeatureCollection
270-
xmlns:wfs="http://www.opengis.net/wfs/2.0"
271-
xmlns:gml="http://www.opengis.net/gml/3.2"
272-
xmlns:my="http://my"
273-
numberMatched="3" numberReturned="3" timeStamp="2016-03-25T14:51:48.998Z">
274-
<wfs:member>
275-
<my:typename gml:id="typename.1">
276-
<gml:boundedBy><gml:Envelope srsName="urn:ogc:def:crs:EPSG::4326"><gml:lowerCorner>70.8 -68.2</gml:lowerCorner><gml:upperCorner>70.8 -68.2</gml:upperCorner></gml:Envelope></gml:boundedBy>
277-
<my:geometryProperty><gml:Point srsName="urn:ogc:def:crs:EPSG::4326" gml:id="typename.geom.1"><gml:pos>70.8 -68.2</gml:pos></gml:Point></my:geometryProperty>
278-
<my:pk>2</my:pk>
279-
<my:cnt>200</my:cnt>
280-
<my:name>Apple</my:name>
281-
<my:name2>Apple</my:name2>
282-
<my:num_char>2</my:num_char>
283-
</my:typename>
284-
</wfs:member>
285-
<wfs:member>
286-
<my:typename gml:id="typename.2">
287-
<gml:boundedBy><gml:Envelope srsName="urn:ogc:def:crs:EPSG::4326"><gml:lowerCorner>78.3 -65.32</gml:lowerCorner><gml:upperCorner>78.3 -65.32</gml:upperCorner></gml:Envelope></gml:boundedBy>
288-
<my:geometryProperty><gml:Point srsName="urn:ogc:def:crs:EPSG::4326" gml:id="typename.geom.2"><gml:pos>78.3 -65.32</gml:pos></gml:Point></my:geometryProperty>
289-
<my:pk>4</my:pk>
290-
<my:cnt>400</my:cnt>
291-
<my:name>Honey</my:name>
292-
<my:name2>Honey</my:name2>
293-
<my:num_char>4</my:num_char>
294-
</my:typename>
295-
</wfs:member>
296-
<wfs:member>
297-
<my:typename gml:id="typename.3">
298-
<my:pk>3</my:pk>
299-
<my:cnt>300</my:cnt>
300-
<my:name>Pear</my:name>
301-
<my:name2>PEaR</my:name2>
302-
<my:num_char>3</my:num_char>
303-
</my:typename>
304-
</wfs:member>
305-
</wfs:FeatureCollection>""".encode('UTF-8'))
306-
307-
with open(sanitize(endpoint, """?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=my:typename&FILTER=<fes:Filter xmlns:fes="http://www.opengis.net/fes/2.0">
308-
<fes:And>
309-
<fes:PropertyIsGreaterThan>
310-
<fes:ValueReference>cnt</fes:ValueReference>
311-
<fes:Literal>100</fes:Literal>
312-
</fes:PropertyIsGreaterThan>
313-
<fes:PropertyIsLessThan>
314-
<fes:ValueReference>cnt</fes:ValueReference>
315-
<fes:Literal>400</fes:Literal>
316-
</fes:PropertyIsLessThan>
317-
</fes:And>
318-
</fes:Filter>
319-
&RESULTTYPE=hits"""), 'wb') as f:
320-
f.write("""
321-
<wfs:FeatureCollection
322-
xmlns:wfs="http://www.opengis.net/wfs/2.0"
323-
xmlns:gml="http://www.opengis.net/gml/3.2"
324-
numberMatched="2" numberReturned="0" timeStamp="2016-03-25T14:51:48.998Z">
325-
</wfs:FeatureCollection>""".encode('UTF-8'))
326-
327-
with open(sanitize(endpoint, """?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=my:typename&SRSNAME=urn:ogc:def:crs:EPSG::4326&FILTER=<fes:Filter xmlns:fes="http://www.opengis.net/fes/2.0">
328-
<fes:And>
329-
<fes:PropertyIsGreaterThan>
330-
<fes:ValueReference>cnt</fes:ValueReference>
331-
<fes:Literal>100</fes:Literal>
332-
</fes:PropertyIsGreaterThan>
333-
<fes:PropertyIsLessThan>
334-
<fes:ValueReference>cnt</fes:ValueReference>
335-
<fes:Literal>400</fes:Literal>
336-
</fes:PropertyIsLessThan>
337-
</fes:And>
338-
</fes:Filter>
339-
"""), 'wb') as f:
340-
f.write("""
341-
<wfs:FeatureCollection
342-
xmlns:wfs="http://www.opengis.net/wfs/2.0"
343-
xmlns:gml="http://www.opengis.net/gml/3.2"
344-
xmlns:my="http://my"
345-
numberMatched="2" numberReturned="2" timeStamp="2016-03-25T14:51:48.998Z">
346-
<wfs:member>
347-
<my:typename gml:id="typename.1">
348-
<gml:boundedBy><gml:Envelope srsName="urn:ogc:def:crs:EPSG::4326"><gml:lowerCorner>70.8 -68.2</gml:lowerCorner><gml:upperCorner>70.8 -68.2</gml:upperCorner></gml:Envelope></gml:boundedBy>
349-
<my:geometryProperty><gml:Point srsName="urn:ogc:def:crs:EPSG::4326" gml:id="typename.geom.1"><gml:pos>70.8 -68.2</gml:pos></gml:Point></my:geometryProperty>
350-
<my:pk>2</my:pk>
351-
<my:cnt>200</my:cnt>
352-
<my:name>Apple</my:name>
353-
<my:name2>Apple</my:name2>
354-
<my:num_char>2</my:num_char>
355-
</my:typename>
356-
</wfs:member>
357-
<wfs:member>
358-
<my:typename gml:id="typename.3">
359-
<my:pk>3</my:pk>
360-
<my:cnt>300</my:cnt>
361-
<my:name>Pear</my:name>
362-
<my:name2>PEaR</my:name2>
363-
<my:num_char>3</my:num_char>
364-
</my:typename>
365-
</wfs:member>
366-
</wfs:FeatureCollection>""".encode('UTF-8'))
367-
368-
with open(sanitize(endpoint, """?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=my:typename&FILTER=<fes:Filter xmlns:fes="http://www.opengis.net/fes/2.0">
369-
<fes:PropertyIsEqualTo>
370-
<fes:ValueReference>name</fes:ValueReference>
371-
<fes:Literal>Apple</fes:Literal>
372-
</fes:PropertyIsEqualTo>
373-
</fes:Filter>
374-
&RESULTTYPE=hits"""), 'wb') as f:
375-
f.write("""
376-
<wfs:FeatureCollection
377-
xmlns:wfs="http://www.opengis.net/wfs/2.0"
378-
xmlns:gml="http://www.opengis.net/gml/3.2"
379-
numberMatched="1" numberReturned="0" timeStamp="2016-03-25T14:51:48.998Z">
380-
</wfs:FeatureCollection>""".encode('UTF-8'))
381-
382-
with open(sanitize(endpoint, """?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=my:typename&SRSNAME=urn:ogc:def:crs:EPSG::4326&FILTER=<fes:Filter xmlns:fes="http://www.opengis.net/fes/2.0">
383-
<fes:PropertyIsEqualTo>
384-
<fes:ValueReference>name</fes:ValueReference>
385-
<fes:Literal>Apple</fes:Literal>
386-
</fes:PropertyIsEqualTo>
387-
</fes:Filter>
388-
"""), 'wb') as f:
389-
f.write("""
390-
<wfs:FeatureCollection
391-
xmlns:wfs="http://www.opengis.net/wfs/2.0"
392-
xmlns:gml="http://www.opengis.net/gml/3.2"
393-
xmlns:my="http://my"
394-
numberMatched="1" numberReturned="1" timeStamp="2016-03-25T14:51:48.998Z">
395-
<wfs:member>
396-
<my:typename gml:id="typename.1">
397-
<gml:boundedBy><gml:Envelope srsName="urn:ogc:def:crs:EPSG::4326"><gml:lowerCorner>70.8 -68.2</gml:lowerCorner><gml:upperCorner>70.8 -68.2</gml:upperCorner></gml:Envelope></gml:boundedBy>
398-
<my:geometryProperty><gml:Point srsName="urn:ogc:def:crs:EPSG::4326" gml:id="typename.geom.1"><gml:pos>70.8 -68.2</gml:pos></gml:Point></my:geometryProperty>
399-
<my:pk>2</my:pk>
400-
<my:cnt>200</my:cnt>
401-
<my:name>Apple</my:name>
402-
<my:name2>Apple</my:name2>
403-
<my:num_char>2</my:num_char>
404-
</my:typename>
405-
</wfs:member>
406-
</wfs:FeatureCollection>""".encode('UTF-8'))
407-
408-
with open(sanitize(endpoint, """?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=my:typename&FILTER=<fes:Filter xmlns:fes="http://www.opengis.net/fes/2.0">
409-
<fes:PropertyIsEqualTo>
410-
<fes:ValueReference>name</fes:ValueReference>
411-
<fes:Literal>AppleBearOrangePear</fes:Literal>
412-
</fes:PropertyIsEqualTo>
413-
</fes:Filter>
414-
&RESULTTYPE=hits"""), 'wb') as f:
415-
f.write("""
416-
<wfs:FeatureCollection
417-
xmlns:wfs="http://www.opengis.net/wfs/2.0"
418-
xmlns:gml="http://www.opengis.net/gml/3.2"
419-
numberMatched="0" numberReturned="0" timeStamp="2016-03-25T14:51:48.998Z">
420-
</wfs:FeatureCollection>""".encode('UTF-8'))
421-
422-
with open(sanitize(endpoint, """?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=my:typename&SRSNAME=urn:ogc:def:crs:EPSG::4326&FILTER=<fes:Filter xmlns:fes="http://www.opengis.net/fes/2.0">
423-
<fes:PropertyIsEqualTo>
424-
<fes:ValueReference>name</fes:ValueReference>
425-
<fes:Literal>AppleBearOrangePear</fes:Literal>
426-
</fes:PropertyIsEqualTo>
427-
</fes:Filter>
428-
"""), 'wb') as f:
429-
f.write("""
430-
<wfs:FeatureCollection
431-
xmlns:wfs="http://www.opengis.net/wfs/2.0"
432-
xmlns:gml="http://www.opengis.net/gml/3.2"
433-
xmlns:my="http://my"
434-
numberMatched="0" numberReturned="0" timeStamp="2016-03-25T14:51:48.998Z">
435-
</wfs:FeatureCollection>""".encode('UTF-8'))
436-
437226
@classmethod
438227
def tearDownClass(cls):
439228
"""Run after all tests"""

0 commit comments

Comments
 (0)