Skip to content

Commit

Permalink
wfs provider: make wfs non-cached mode work (fixes #10413)
Browse files Browse the repository at this point in the history 
TODO: refactoring
  • Loading branch information
@jef-n
jef-n committed Jun 15, 2014
1 parent 37a0428 commit 945be40
Show file tree
Hide file tree
Showing 6 changed files with 121 additions and 29 deletions.
6 changes: 0 additions & 6 deletions src/core/qgsvectorlayer.cpp
View file
Expand Up @@ -388,9 +388,6 @@ void QgsVectorLayer::drawLabels( QgsRenderContext& rendererContext )
}
}




void QgsVectorLayer::reload()
{
if ( mDataProvider )
Expand All @@ -408,9 +405,6 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
{
QgsVectorLayerRenderer renderer( this, rendererContext );
return renderer.render();



}

void QgsVectorLayer::drawVertexMarker( double x, double y, QPainter& p, QgsVectorLayer::VertexMarkerType type, int m )
Expand Down
1 change: 1 addition & 0 deletions src/providers/wfs/CMakeLists.txt
View file
Expand Up @@ -14,6 +14,7 @@ SET (WFS_MOC_HDRS
qgswfscapabilities.h
qgswfsdataitems.h
qgswfsprovider.h
qgswfsfeatureiterator.h
qgswfssourceselect.h
)

Expand Down
5 changes: 4 additions & 1 deletion src/providers/wfs/qgswfsfeatureiterator.cpp
View file
Expand Up @@ -150,7 +150,8 @@ void QgsWFSFeatureIterator::copyFeature( const QgsFeature* f, QgsFeature& featur
// -------------------------

QgsWFSFeatureSource::QgsWFSFeatureSource( const QgsWFSProvider* p )
: mFields( p->mFields )
: QObject(( QgsWFSProvider* ) p )
, mFields( p->mFields )
, mFeatures( p->mFeatures )
, mSpatialIndex( p->mSpatialIndex ? new QgsSpatialIndex( *p->mSpatialIndex ) : 0 ) // just shallow copy
{
Expand All @@ -163,5 +164,7 @@ QgsWFSFeatureSource::~QgsWFSFeatureSource()

QgsFeatureIterator QgsWFSFeatureSource::getFeatures( const QgsFeatureRequest& request )
{
if ( request.filterType() == QgsFeatureRequest::FilterRect )
emit extentRequested( request.filterRect() );
return QgsFeatureIterator( new QgsWFSFeatureIterator( this, false, request ) );
}
8 changes: 6 additions & 2 deletions src/providers/wfs/qgswfsfeatureiterator.h
View file
Expand Up @@ -22,14 +22,19 @@ class QgsSpatialIndex;
typedef QMap<QgsFeatureId, QgsFeature*> QgsFeaturePtrMap;


class QgsWFSFeatureSource : public QgsAbstractFeatureSource
class QgsWFSFeatureSource : public QObject, public QgsAbstractFeatureSource
{
Q_OBJECT

public:
QgsWFSFeatureSource( const QgsWFSProvider* p );
~QgsWFSFeatureSource();

QgsFeatureIterator getFeatures( const QgsFeatureRequest& request );

signals:
void extentRequested( const QgsRectangle & );

protected:

QgsFields mFields;
Expand Down Expand Up @@ -57,7 +62,6 @@ class QgsWFSFeatureIterator : public QgsAbstractFeatureIteratorFromSource<QgsWFS
private:
QList<QgsFeatureId> mSelectedFeatures;
QList<QgsFeatureId>::const_iterator mFeatureIterator;

};

#endif // QGSWFSFEATUREITERATOR_H
109 changes: 94 additions & 15 deletions src/providers/wfs/qgswfsprovider.cpp
View file
Expand Up @@ -43,6 +43,8 @@
#include <QUrl>
#include <QWidget>
#include <QPair>
#include <QTimer>

#include <cfloat>

static const QString TEXT_PROVIDER_KEY = "WFS";
Expand All @@ -62,9 +64,12 @@ QgsWFSProvider::QgsWFSProvider( const QString& uri )
, mSourceCRS( 0 )
, mFeatureCount( 0 )
, mValid( true )
, mPendingRetrieval( false )
#if 0
, mLayer( 0 )
, mGetRenderedOnly( false )
, mInitGro( false )
#endif
{
mSpatialIndex = 0;
if ( uri.isEmpty() )
Expand Down Expand Up @@ -115,7 +120,8 @@ QgsWFSProvider::QgsWFSProvider( const QString& uri )
setDataSourceUri( bkUri );
}

if ( ! uri.contains( "BBOX=" ) )
mCached = !uri.contains( "BBOX=" );
if ( mCached )
{ //"Cache Features" option; get all features in layer immediately
reloadData();
} //otherwise, defer feature retrieval until layer is first rendered
Expand All @@ -124,6 +130,8 @@ QgsWFSProvider::QgsWFSProvider( const QString& uri )
{
getLayerCapabilities();
}

qRegisterMetaType<QgsRectangle>( "QgsRectangle" );
}

QgsWFSProvider::~QgsWFSProvider()
Expand All @@ -134,15 +142,22 @@ QgsWFSProvider::~QgsWFSProvider()

QgsAbstractFeatureSource* QgsWFSProvider::featureSource() const
{
return new QgsWFSFeatureSource( this );
QgsWFSFeatureSource *fs = new QgsWFSFeatureSource( this );
connect( fs, SIGNAL( extentRequested( const QgsRectangle & ) ),
this, SLOT( extendExtent( const QgsRectangle & ) ) );
return fs;
}

void QgsWFSProvider::reloadData()
{
mPendingRetrieval = false;
deleteData();
delete mSpatialIndex;
mSpatialIndex = new QgsSpatialIndex();
mValid = !getFeature( dataSourceUri() );

if ( !mCached )
emit dataChanged();
}

void QgsWFSProvider::deleteData()
Expand Down Expand Up @@ -193,6 +208,7 @@ bool QgsWFSProvider::isValid()

QgsFeatureIterator QgsWFSProvider::getFeatures( const QgsFeatureRequest& request )
{
#if 0
if ( !( request.flags() & QgsFeatureRequest::NoGeometry ) )
{
QgsRectangle rect = request.filterRect();
Expand Down Expand Up @@ -261,7 +277,8 @@ QgsFeatureIterator QgsWFSProvider::getFeatures( const QgsFeatureRequest& request
}

}
return QgsFeatureIterator( new QgsWFSFeatureIterator( new QgsWFSFeatureSource( this ), true, request ) );
#endif
return new QgsWFSFeatureIterator( new QgsWFSFeatureSource( this ), true, request );
}

int QgsWFSProvider::getFeature( const QString& uri )
Expand Down Expand Up @@ -658,7 +675,7 @@ int QgsWFSProvider::getFeatureGET( const QString& uri, const QString& geometryAt
QString typeName = parameterFromUrl( "typename" );
QgsGml dataReader( typeName, geometryAttribute, mFields );

QObject::connect( &dataReader, SIGNAL( dataProgressAndSteps( int , int ) ), this, SLOT( handleWFSProgressMessage( int, int ) ) );
connect( &dataReader, SIGNAL( dataProgressAndSteps( int , int ) ), this, SLOT( handleWFSProgressMessage( int, int ) ) );

//also connect to statusChanged signal of qgisapp (if it exists)
QWidget* mainWindow = 0;
Expand All @@ -675,14 +692,15 @@ int QgsWFSProvider::getFeatureGET( const QString& uri, const QString& geometryAt

if ( mainWindow )
{
QObject::connect( this, SIGNAL( dataReadProgressMessage( QString ) ), mainWindow, SLOT( showStatusMessage( QString ) ) );
connect( this, SIGNAL( dataReadProgressMessage( QString ) ), mainWindow, SLOT( showStatusMessage( QString ) ) );
}

//if ( dataReader.getWFSData() != 0 )
QUrl getFeatureUrl( uri );
getFeatureUrl.removeQueryItem( "username" );
getFeatureUrl.removeQueryItem( "password" );
if ( dataReader.getFeatures( getFeatureUrl.toString(), &mWKBType, &mExtent, mAuth.mUserName, mAuth.mPassword ) != 0 )
QgsRectangle extent;
if ( dataReader.getFeatures( getFeatureUrl.toString(), &mWKBType, mCached ? &mExtent : &extent, mAuth.mUserName, mAuth.mPassword ) != 0 )
{
QgsDebugMsg( "getWFSData returned with error" );
return 1;
Expand All @@ -691,7 +709,6 @@ int QgsWFSProvider::getFeatureGET( const QString& uri, const QString& geometryAt
mIdMap = dataReader.idsMap();

QgsDebugMsg( QString( "feature count after request is: %1" ).arg( mFeatures.size() ) );
QgsDebugMsg( QString( "mExtent after request is: %1" ).arg( mExtent.toString() ) );

if ( mWKBType != QGis::WKBNoGeometry )
{
Expand Down Expand Up @@ -726,7 +743,8 @@ int QgsWFSProvider::getFeatureFILE( const QString& uri, const QString& geometryA

QDomElement featureCollectionElement = gmlDoc.documentElement();
//get and set Extent
if ( mWKBType != QGis::WKBNoGeometry && getExtentFromGML2( &mExtent, featureCollectionElement ) != 0 )
QgsRectangle extent;
if ( mWKBType != QGis::WKBNoGeometry && getExtentFromGML2( mCached ? &mExtent : &extent, featureCollectionElement ) != 0 )
{
return 3;
}
Expand Down Expand Up @@ -1102,7 +1120,6 @@ int QgsWFSProvider::getExtentFromGML2( QgsRectangle* extent, const QDomElement&

int QgsWFSProvider::setCRSFromGML2( const QDomElement& wfsCollectionElement )
{
QgsDebugMsg( "entering." );
//search <gml:boundedBy>
QDomNodeList boundedByList = wfsCollectionElement.elementsByTagNameNS( GML_NAMESPACE, "boundedBy" );
if ( boundedByList.size() < 1 )
Expand Down Expand Up @@ -1523,6 +1540,26 @@ void QgsWFSProvider::getLayerCapabilities()
QString name = featureTypeList.at( i ).firstChildElement( "Name" ).text();
if ( name == thisLayerName )
{
if ( !mCached && mExtent.isEmpty() )
{
QDomElement e = featureTypeList.at( i ).firstChildElement( "LatLongBoundingBox" );
if ( !e.isNull() )
{
QgsRectangle r( e.attribute( "minx" ).toDouble(), e.attribute( "miny" ).toDouble(),
e.attribute( "maxx" ).toDouble(), e.attribute( "maxy" ).toDouble() );
QgsCoordinateReferenceSystem src;
src.createFromOgcWmsCrs( "CRS:84" );
QgsCoordinateTransform ct( src, mSourceCRS );

QgsDebugMsg( "latlon ext:" + r.toString() );
QgsDebugMsg( "src:" + src.authid() );
QgsDebugMsg( "dst:" + mSourceCRS.authid() );

mExtent = ct.transformBoundingBox( r, QgsCoordinateTransform::ForwardTransform );

QgsDebugMsg( "layer ext:" + mExtent.toString() );
}
}
appendSupportedOperations( featureTypeList.at( i ).firstChildElement( "Operations" ), capabilities );
break;
}
Expand Down Expand Up @@ -1558,6 +1595,7 @@ void QgsWFSProvider::appendSupportedOperations( const QDomElement& operationsEle
}
}

#if 0
//initialization for getRenderedOnly option
//(formerly "Only request features overlapping the current view extent")
bool QgsWFSProvider::initGetRenderedOnly( const QgsRectangle &rect )
Expand Down Expand Up @@ -1585,6 +1623,7 @@ bool QgsWFSProvider::initGetRenderedOnly( const QgsRectangle &rect )
}
return true;
}
#endif

QGis::WkbType QgsWFSProvider::geomTypeFromPropertyType( QString attName, QString propType )
{
Expand Down Expand Up @@ -1617,33 +1656,73 @@ void QgsWFSProvider::handleException( const QDomDocument& serverResponse )
QDomElement exceptionElem = serverResponse.documentElement();
if ( exceptionElem.isNull() )
{
pushError( QObject::tr( "empty response" ) );
pushError( tr( "empty response" ) );
return;
}

if ( exceptionElem.tagName() == "ServiceExceptionReport" )
{
pushError( QObject::tr( "WFS service exception:%1" ).arg( exceptionElem.firstChildElement( "ServiceException" ).text() ) );
pushError( tr( "WFS service exception:%1" ).arg( exceptionElem.firstChildElement( "ServiceException" ).text() ) );
return;
}

if ( exceptionElem.tagName() == "WFS_TransactionResponse" )
{
pushError( QObject::tr( "unsuccessful service response: %1" ).arg( exceptionElem.firstChildElement( "TransactionResult" ).firstChildElement( "Message" ).text() ) );
pushError( tr( "unsuccessful service response: %1" ).arg( exceptionElem.firstChildElement( "TransactionResult" ).firstChildElement( "Message" ).text() ) );
return;
}

if ( exceptionElem.tagName() == "ExceptionReport" )
{
QDomElement exception = exceptionElem.firstChildElement( "Exception" );
pushError( QObject::tr( "WFS exception report (code=%1 text=%2)" )
.arg( exception.attribute( "exceptionCode", QObject::tr( "missing" ) ) )
pushError( tr( "WFS exception report (code=%1 text=%2)" )
.arg( exception.attribute( "exceptionCode", tr( "missing" ) ) )
.arg( exception.firstChildElement( "ExceptionText" ).text() )
);
return;
}

pushError( QObject::tr( "unhandled response: %1" ).arg( exceptionElem.tagName() ) );
pushError( tr( "unhandled response: %1" ).arg( exceptionElem.tagName() ) );
}

void QgsWFSProvider::extendExtent( const QgsRectangle &extent )
{
if ( mCached )
return;

QgsRectangle r( mExtent.intersect( &extent ) );

if ( mGetExtent.contains( r ) )
return;

if ( mGetExtent.isEmpty() )
{
mGetExtent = r;
}
else if ( qgsDoubleNear( mGetExtent.xMinimum(), r.xMinimum() ) &&
qgsDoubleNear( mGetExtent.yMinimum(), r.yMinimum() ) &&
qgsDoubleNear( mGetExtent.xMaximum(), r.xMaximum() ) &&
qgsDoubleNear( mGetExtent.yMaximum(), r.yMaximum() ) )
{
return;
}
else
{
mGetExtent.combineExtentWith( &r );
}

setDataSourceUri( dataSourceUri().replace( QRegExp( "BBOX=[^&]*" ),
QString( "BBOX=%1,%2,%3,%4" )
.arg( qgsDoubleToString( mGetExtent.xMinimum() ) )
.arg( qgsDoubleToString( mGetExtent.yMinimum() ) )
.arg( qgsDoubleToString( mGetExtent.xMaximum() ) )
.arg( qgsDoubleToString( mGetExtent.yMaximum() ) ) ) );

if ( !mPendingRetrieval )
{
mPendingRetrieval = true;
QTimer::singleShot( 100, this, SLOT( reloadData() ) );
}
}

QGISEXTERN QgsWFSProvider* classFactory( const QString *uri )
Expand Down

0 comments on commit 945be40

Please sign in to comment.