Skip to content

Commit

Permalink
Merge pull request #9624 from pblottiere/server_context_3
Browse files Browse the repository at this point in the history 
[server] Add a WMS render context
  • Loading branch information
@pblottiere
pblottiere committed Mar 28, 2019
2 parents 5b5cc50 + 131b659 commit d7f12ea
Show file tree
Hide file tree
Showing 14 changed files with 1,035 additions and 688 deletions.
1 change: 1 addition & 0 deletions src/server/services/wms/CMakeLists.txt
View file
Expand Up @@ -20,6 +20,7 @@ SET (wms_SRCS
qgswmsrenderer.cpp
qgswmsparameters.cpp
qgslayerrestorer.cpp
qgswmsrendercontext.cpp
)

SET (wms_MOC_HDRS
Expand Down
17 changes: 12 additions & 5 deletions src/server/services/wms/qgsdxfwriter.cpp
View file
Expand Up @@ -22,17 +22,24 @@ email : david dot marteau at 3liz dot com
namespace QgsWms
{
void writeAsDxf( QgsServerInterface *serverIface, const QgsProject *project,
const QString &version, const QgsServerRequest &request,
const QString &, const QgsServerRequest &request,
QgsServerResponse &response )
{
Q_UNUSED( version );
// get wms parameters from query
QgsWmsParameters parameters( QUrlQuery( request.url() ) );

QgsWmsParameters wmsParameters( QUrlQuery( request.url() ) );
QgsRenderer renderer( serverIface, project, wmsParameters );
// prepare render context
QgsWmsRenderContext context( project, serverIface );
context.setFlag( QgsWmsRenderContext::UseWfsLayersOnly );
context.setFlag( QgsWmsRenderContext::UseOpacity );
context.setFlag( QgsWmsRenderContext::UseFilter );
context.setFlag( QgsWmsRenderContext::SetAccessControl );
context.setParameters( parameters );

// Write output
QgsRenderer renderer( context );
QgsDxfExport dxf = renderer.getDxf();
response.setHeader( "Content-Type", "application/dxf" );
dxf.writeToFile( response.io(), wmsParameters.dxfCodec() );
dxf.writeToFile( response.io(), parameters.dxfCodec() );
}
} // namespace QgsWms
29 changes: 14 additions & 15 deletions src/server/services/wms/qgswmsgetfeatureinfo.cpp
View file
Expand Up @@ -24,26 +24,25 @@

namespace QgsWms
{

void writeGetFeatureInfo( QgsServerInterface *serverIface, const QgsProject *project,
const QString &version, const QgsServerRequest &request,
QgsServerResponse &response )
{
Q_UNUSED( version );
QgsServerRequest::Parameters params = request.parameters();

QgsWmsParameters wmsParameters( QUrlQuery( request.url() ) );
QgsRenderer renderer( serverIface, project, wmsParameters );

QString infoFormat = params.value( QStringLiteral( "INFO_FORMAT" ), QStringLiteral( "text/plain" ) );

// get wms parameters from query
QgsWmsParameters parameters( QUrlQuery( request.url() ) );

// prepare render context
QgsWmsRenderContext context( project, serverIface );
context.setFlag( QgsWmsRenderContext::AddQueryLayers );
context.setFlag( QgsWmsRenderContext::UseFilter );
context.setFlag( QgsWmsRenderContext::UseScaleDenominator );
context.setFlag( QgsWmsRenderContext::SetAccessControl );
context.setParameters( parameters );

const QString infoFormat = request.parameters().value( QStringLiteral( "INFO_FORMAT" ), QStringLiteral( "text/plain" ) );
response.setHeader( QStringLiteral( "Content-Type" ), infoFormat + QStringLiteral( "; charset=utf-8" ) );

QgsRenderer renderer( context );
response.write( renderer.getFeatureInfo( version ) );
}


} // namespace QgsWms




26 changes: 10 additions & 16 deletions src/server/services/wms/qgswmsgetlegendgraphics.cpp
View file
Expand Up @@ -26,19 +26,20 @@

namespace QgsWms
{

void writeGetLegendGraphics( QgsServerInterface *serverIface, const QgsProject *project,
const QString &version, const QgsServerRequest &request,
const QString &, const QgsServerRequest &request,
QgsServerResponse &response )
{
Q_UNUSED( version );

QgsServerRequest::Parameters params = request.parameters();
QString format = params.value( QStringLiteral( "FORMAT" ), QStringLiteral( "PNG" ) );
// get parameters from query
QgsWmsParameters parameters( QUrlQuery( request.url() ) );

QgsWmsParameters wmsParameters( QUrlQuery( request.url() ) );
// init render context
QgsWmsRenderContext context( project, serverIface );
context.setFlag( QgsWmsRenderContext::UseScaleDenominator );
context.setParameters( parameters );

// Get cached image
const QString format = request.parameters().value( QStringLiteral( "FORMAT" ), QStringLiteral( "PNG" ) );
QgsAccessControl *accessControl = nullptr;
QgsServerCacheManager *cacheManager = nullptr;
#ifdef HAVE_SERVER_PYTHON_PLUGINS
Expand Down Expand Up @@ -79,13 +80,12 @@ namespace QgsWms
}
}

QgsRenderer renderer( serverIface, project, wmsParameters );

QgsRenderer renderer( context );
std::unique_ptr<QImage> result( renderer.getLegendGraphics() );

if ( result )
{
writeImage( response, *result, format, renderer.imageQuality() );
writeImage( response, *result, format, context.imageQuality() );
if ( cacheManager )
{
QByteArray content = response.data();
Expand All @@ -99,10 +99,4 @@ namespace QgsWms
QStringLiteral( "Failed to compute GetLegendGraphics image" ) );
}
}


} // namespace QgsWms




35 changes: 20 additions & 15 deletions src/server/services/wms/qgswmsgetmap.cpp
View file
Expand Up @@ -28,31 +28,36 @@ namespace QgsWms
{

void writeGetMap( QgsServerInterface *serverIface, const QgsProject *project,
const QString &version, const QgsServerRequest &request,
const QString &, const QgsServerRequest &request,
QgsServerResponse &response )
{
Q_UNUSED( version );

QgsServerRequest::Parameters params = request.parameters();

QgsWmsParameters wmsParameters( QUrlQuery( request.url() ) );
QgsRenderer renderer( serverIface, project, wmsParameters );

// get wms parameters from query
const QgsWmsParameters parameters( QUrlQuery( request.url() ) );

// prepare render context
QgsWmsRenderContext context( project, serverIface );
context.setFlag( QgsWmsRenderContext::UpdateExtent );
context.setFlag( QgsWmsRenderContext::UseOpacity );
context.setFlag( QgsWmsRenderContext::UseFilter );
context.setFlag( QgsWmsRenderContext::UseSelection );
context.setFlag( QgsWmsRenderContext::AddHighlightLayers );
context.setFlag( QgsWmsRenderContext::AddExternalLayers );
context.setFlag( QgsWmsRenderContext::SetAccessControl );
context.setParameters( parameters );

// rendering
QgsRenderer renderer( context );
std::unique_ptr<QImage> result( renderer.getMap() );

if ( result )
{
QString format = params.value( QStringLiteral( "FORMAT" ), QStringLiteral( "PNG" ) );
writeImage( response, *result, format, renderer.imageQuality() );
const QString format = request.parameters().value( QStringLiteral( "FORMAT" ), QStringLiteral( "PNG" ) );
writeImage( response, *result, format, context.imageQuality() );
}
else
{
throw QgsServiceException( QStringLiteral( "UnknownError" ),
QStringLiteral( "Failed to compute GetMap image" ) );
}
}

} // namespace QgsWms




19 changes: 15 additions & 4 deletions src/server/services/wms/qgswmsgetprint.cpp
View file
Expand Up @@ -28,13 +28,12 @@ namespace QgsWms
const QString &, const QgsServerRequest &request,
QgsServerResponse &response )
{
// get wms parameters from query
const QgsWmsParameters wmsParameters( QUrlQuery( request.url() ) );
QgsRenderer renderer( serverIface, project, wmsParameters );

// GetPrint supports svg/png/pdf
const QgsWmsParameters::Format format = wmsParameters.format();
QString contentType;

// GetPrint supports svg/png/pdf
switch ( format )
{
case QgsWmsParameters::PNG:
Expand All @@ -55,8 +54,20 @@ namespace QgsWms
break;
}

// prepare render context
QgsWmsRenderContext context( project, serverIface );
context.setFlag( QgsWmsRenderContext::UpdateExtent );
context.setFlag( QgsWmsRenderContext::UseOpacity );
context.setFlag( QgsWmsRenderContext::UseFilter );
context.setFlag( QgsWmsRenderContext::UseSelection );
context.setFlag( QgsWmsRenderContext::SetAccessControl );
context.setFlag( QgsWmsRenderContext::AddHighlightLayers );
context.setFlag( QgsWmsRenderContext::AddExternalLayers );
context.setParameters( wmsParameters );

// rendering
QgsRenderer renderer( context );
response.setHeader( QStringLiteral( "Content-Type" ), contentType );
response.write( renderer.getPrint() );
}

} // namespace QgsWms
4 changes: 3 additions & 1 deletion src/server/services/wms/qgswmsparameters.cpp
View file
Expand Up @@ -1534,10 +1534,12 @@ namespace QgsWms

QList<QgsWmsParametersExternalLayer> QgsWmsParameters::externalLayersParameters() const
{
auto notExternalLayer = []( const QString & name ) { return ! QgsWmsParameters::isExternalLayer( name ); };

QList<QgsWmsParametersExternalLayer> externalLayers;

QStringList layers = allLayersNickname();
QStringList::const_iterator rit = std::remove_if( layers.begin(), layers.end(), QgsWmsParameters::isExternalLayer );
QStringList::const_iterator rit = std::remove_if( layers.begin(), layers.end(), notExternalLayer );

for ( QStringList::const_iterator it = layers.begin(); it != rit; ++it )
{
Expand Down

0 comments on commit d7f12ea

Please sign in to comment.