sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Server] fix wmsInspireActivated to wmsInspireActivate

Browse Source
This commit is contained in:
rldhont 2017-05-25 14:55:04 +02:00
parent 13a3f2f88a
commit 95a5ccefab
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/server/qgsserverprojectutils.sip
View File

@ -127,7 +127,7 @@ namespace QgsServerProjectUtils
* \param project the QGIS project * \param project the QGIS project
* \returns if Inspire is activated. * \returns if Inspire is activated.
*/ */
bool wmsInspireActivated( const QgsProject &project ); bool wmsInspireActivate( const QgsProject &project );
/** Returns the Inspire language. /** Returns the Inspire language.
* \param project the QGIS project * \param project the QGIS project

2
src/server/qgsserverprojectutils.cpp
View File

@ -104,7 +104,7 @@ bool QgsServerProjectUtils::wmsInfoFormatSia2045( const QgsProject &project )
return false; return false;
} }
bool QgsServerProjectUtils::wmsInspireActivated( const QgsProject &project ) bool QgsServerProjectUtils::wmsInspireActivate( const QgsProject &project )
{ {
return project.readBoolEntry( QStringLiteral( "WMSInspire" ), QStringLiteral( "/activated" ) ); return project.readBoolEntry( QStringLiteral( "WMSInspire" ), QStringLiteral( "/activated" ) );
} }

2
src/server/qgsserverprojectutils.h
View File

@ -129,7 +129,7 @@ namespace QgsServerProjectUtils
* \param project the QGIS project * \param project the QGIS project
* \returns if Inspire is activated. * \returns if Inspire is activated.
*/ */
SERVER_EXPORT bool wmsInspireActivated( const QgsProject &project ); SERVER_EXPORT bool wmsInspireActivate( const QgsProject &project );
/** Returns the Inspire language. /** Returns the Inspire language.
* \param project the QGIS project * \param project the QGIS project

10
src/server/services/wms/qgswmsgetcapabilities.cpp
View File

@ -34,10 +34,10 @@
#include "qgslayertreelayer.h" #include "qgslayertreelayer.h"
#include "qgslayertreemodel.h" #include "qgslayertreemodel.h"
#include "qgslayertree.h" #include "qgslayertree.h"
#include "qgsmaplayerstylemanager.h"
#include "qgscsexception.h" #include "qgscsexception.h"
#include "qgsexpressionnodeimpl.h" #include "qgsexpressionnodeimpl.h"
#include "qgsmaplayerstylemanager.h"
namespace QgsWms namespace QgsWms
@ -180,7 +180,7 @@ namespace QgsWms
schemaLocation += QLatin1String( " http://www.opengis.net/sld" ); schemaLocation += QLatin1String( " http://www.opengis.net/sld" );
schemaLocation += QLatin1String( " http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd" ); schemaLocation += QLatin1String( " http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd" );
schemaLocation += QLatin1String( " http://www.qgis.org/wms" ); schemaLocation += QLatin1String( " http://www.qgis.org/wms" );
if ( QgsServerProjectUtils::wmsInspireActivated( *project ) ) if ( QgsServerProjectUtils::wmsInspireActivate( *project ) )
{ {
wmsCapabilitiesElement.setAttribute( QStringLiteral( "xmlns:inspire_common" ), QStringLiteral( "http://inspire.ec.europa.eu/schemas/common/1.0" ) ); wmsCapabilitiesElement.setAttribute( QStringLiteral( "xmlns:inspire_common" ), QStringLiteral( "http://inspire.ec.europa.eu/schemas/common/1.0" ) );
wmsCapabilitiesElement.setAttribute( QStringLiteral( "xmlns:inspire_vs" ), QStringLiteral( "http://inspire.ec.europa.eu/schemas/inspire_vs/1.0" ) ); wmsCapabilitiesElement.setAttribute( QStringLiteral( "xmlns:inspire_vs" ), QStringLiteral( "http://inspire.ec.europa.eu/schemas/inspire_vs/1.0" ) );
@ -533,7 +533,7 @@ namespace QgsWms
elem.setAttribute( QStringLiteral( "RemoteWCS" ), QStringLiteral( "0" ) ); elem.setAttribute( QStringLiteral( "RemoteWCS" ), QStringLiteral( "0" ) );
capabilityElem.appendChild( elem ); capabilityElem.appendChild( elem );
if ( QgsServerProjectUtils::wmsInspireActivated( *project ) ) if ( QgsServerProjectUtils::wmsInspireActivate( *project ) )
{ {
capabilityElem.appendChild( getInspireCapabilitiesElement( doc, project ) ); capabilityElem.appendChild( getInspireCapabilitiesElement( doc, project ) );
} }
@ -546,7 +546,7 @@ namespace QgsWms
{ {
QDomElement inspireCapabilitiesElem; QDomElement inspireCapabilitiesElem;
if ( !QgsServerProjectUtils::wmsInspireActivated( *project ) ) if ( !QgsServerProjectUtils::wmsInspireActivate( *project ) )
return inspireCapabilitiesElem; return inspireCapabilitiesElem;
inspireCapabilitiesElem = doc.createElement( QStringLiteral( "inspire_vs:ExtendedCapabilities" ) ); inspireCapabilitiesElem = doc.createElement( QStringLiteral( "inspire_vs:ExtendedCapabilities" ) );
@ -993,7 +993,7 @@ namespace QgsWms
// add details about supported styles of the layer // add details about supported styles of the layer
appendLayerStyles( doc, layerElem, l, project, version, request ); appendLayerStyles( doc, layerElem, l, project, version, request );
//min/max scale denominatormScaleBasedVisibility //min/max scale denominatorScaleBasedVisibility
if ( l->hasScaleBasedVisibility() ) if ( l->hasScaleBasedVisibility() )
{ {
if ( version == QLatin1String( "1.1.1" ) ) if ( version == QLatin1String( "1.1.1" ) )