From 95a5ccefabe195a587012c0b9d5e9ab509ddf4e2 Mon Sep 17 00:00:00 2001 From: rldhont Date: Thu, 25 May 2017 14:55:04 +0200 Subject: [PATCH] [Server] fix wmsInspireActivated to wmsInspireActivate --- python/server/qgsserverprojectutils.sip | 2 +- src/server/qgsserverprojectutils.cpp | 2 +- src/server/qgsserverprojectutils.h | 2 +- src/server/services/wms/qgswmsgetcapabilities.cpp | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/python/server/qgsserverprojectutils.sip b/python/server/qgsserverprojectutils.sip index e8f9d215136..4855c1e69cb 100644 --- a/python/server/qgsserverprojectutils.sip +++ b/python/server/qgsserverprojectutils.sip @@ -127,7 +127,7 @@ namespace QgsServerProjectUtils * \param project the QGIS project * \returns if Inspire is activated. */ - bool wmsInspireActivated( const QgsProject &project ); + bool wmsInspireActivate( const QgsProject &project ); /** Returns the Inspire language. * \param project the QGIS project diff --git a/src/server/qgsserverprojectutils.cpp b/src/server/qgsserverprojectutils.cpp index 15c3ea01fd2..00e33f90395 100644 --- a/src/server/qgsserverprojectutils.cpp +++ b/src/server/qgsserverprojectutils.cpp @@ -104,7 +104,7 @@ bool QgsServerProjectUtils::wmsInfoFormatSia2045( const QgsProject &project ) return false; } -bool QgsServerProjectUtils::wmsInspireActivated( const QgsProject &project ) +bool QgsServerProjectUtils::wmsInspireActivate( const QgsProject &project ) { return project.readBoolEntry( QStringLiteral( "WMSInspire" ), QStringLiteral( "/activated" ) ); } diff --git a/src/server/qgsserverprojectutils.h b/src/server/qgsserverprojectutils.h index f223dccf992..79a988d6d99 100644 --- a/src/server/qgsserverprojectutils.h +++ b/src/server/qgsserverprojectutils.h @@ -129,7 +129,7 @@ namespace QgsServerProjectUtils * \param project the QGIS project * \returns if Inspire is activated. */ - SERVER_EXPORT bool wmsInspireActivated( const QgsProject &project ); + SERVER_EXPORT bool wmsInspireActivate( const QgsProject &project ); /** Returns the Inspire language. * \param project the QGIS project diff --git a/src/server/services/wms/qgswmsgetcapabilities.cpp b/src/server/services/wms/qgswmsgetcapabilities.cpp index a21501918bd..904e57b4c83 100644 --- a/src/server/services/wms/qgswmsgetcapabilities.cpp +++ b/src/server/services/wms/qgswmsgetcapabilities.cpp @@ -34,10 +34,10 @@ #include "qgslayertreelayer.h" #include "qgslayertreemodel.h" #include "qgslayertree.h" +#include "qgsmaplayerstylemanager.h" #include "qgscsexception.h" #include "qgsexpressionnodeimpl.h" -#include "qgsmaplayerstylemanager.h" namespace QgsWms @@ -180,7 +180,7 @@ namespace QgsWms schemaLocation += QLatin1String( " http://www.opengis.net/sld" ); schemaLocation += QLatin1String( " http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd" ); 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_vs" ), QStringLiteral( "http://inspire.ec.europa.eu/schemas/inspire_vs/1.0" ) ); @@ -533,7 +533,7 @@ namespace QgsWms elem.setAttribute( QStringLiteral( "RemoteWCS" ), QStringLiteral( "0" ) ); capabilityElem.appendChild( elem ); - if ( QgsServerProjectUtils::wmsInspireActivated( *project ) ) + if ( QgsServerProjectUtils::wmsInspireActivate( *project ) ) { capabilityElem.appendChild( getInspireCapabilitiesElement( doc, project ) ); } @@ -546,7 +546,7 @@ namespace QgsWms { QDomElement inspireCapabilitiesElem; - if ( !QgsServerProjectUtils::wmsInspireActivated( *project ) ) + if ( !QgsServerProjectUtils::wmsInspireActivate( *project ) ) return inspireCapabilitiesElem; inspireCapabilitiesElem = doc.createElement( QStringLiteral( "inspire_vs:ExtendedCapabilities" ) ); @@ -993,7 +993,7 @@ namespace QgsWms // add details about supported styles of the layer appendLayerStyles( doc, layerElem, l, project, version, request ); - //min/max scale denominatormScaleBasedVisibility + //min/max scale denominatorScaleBasedVisibility if ( l->hasScaleBasedVisibility() ) { if ( version == QLatin1String( "1.1.1" ) )