Skip to content
Permalink
Browse files
Merge pull request #4004 from dmarteau/wfs_as_module
WFS & WCS as module
  • Loading branch information
rldhont committed Jan 18, 2017
2 parents 08e0eac + e17a7d4 commit 07c54e5496077e758b7931850c0902e894c4327e
Show file tree
Hide file tree
Showing 52 changed files with 3,756 additions and 3,397 deletions.
@@ -84,11 +84,16 @@ IF(WITH_APIDOC)
${DOXYGEN_INPUT}
${CMAKE_SOURCE_DIR}/src/server/qgsserver.h
${CMAKE_SOURCE_DIR}/src/server/qgscapabilitiescache.h
${CMAKE_SOURCE_DIR}/src/server/qgsmapserviceexception.h
${CMAKE_SOURCE_DIR}/src/server/qgsserverexception.h
${CMAKE_SOURCE_DIR}/src/server/qgsrequesthandler.h
${CMAKE_SOURCE_DIR}/src/server/qgsserverfilter.h
${CMAKE_SOURCE_DIR}/src/server/qgsaccesscontrolfilter.h
${CMAKE_SOURCE_DIR}/src/server/qgsserverinterface.h
${CMAKE_SOURCE_DIR}/src/server/qgsserverrequest.h
${CMAKE_SOURCE_DIR}/src/server/qgsserverresponse.h
${CMAKE_SOURCE_DIR}/src/server/qgsserverrequest.h
${CMAKE_SOURCE_DIR}/src/server/qgsservice.h
${CMAKE_SOURCE_DIR}/src/server/qgsserviceregistry.h
)
ENDIF(WITH_SERVER_PLUGINS)

@@ -1905,6 +1905,13 @@ optional property map passing down layer level properties to the SLD encoders. I
- usedAttributes is now a const method and returns QSet<QString> instead of QStringList


QgsRequestHandler {#qgis_api_break_3_0_QgsRequestHandler}
-----------------

- Removed infoFormat and setInfoFormat methods: the format of the response is given and set with the "Content-Type" header.
- Removed setCoverageResponse


Processing {#qgis_api_break_3_0_Processing}
----------

@@ -29,12 +29,6 @@ class QgsRequestHandler /Abstract/
/** Allow plugins to return a QgsServerException*/
void setServiceException( const QgsServerException& ex );

//! @note not available in Python bindings
void endGetFeatureResponse( QByteArray* ba );

//! @note not available in Python bindings
void setGetCoverageResponse( QByteArray* ba );

/** Set an HTTP header*/
void setHeader( const QString &name, const QString &value );

@@ -53,9 +47,6 @@ class QgsRequestHandler /Abstract/
/** Append the bytestream to response body*/
void appendBody( const QByteArray &body );

/** Set the info format string such as "text/xml"*/
void setInfoFormat( const QString &format );

/** Send out HTTP headers and flush output buffer*/
void sendResponse();

@@ -80,9 +71,6 @@ class QgsRequestHandler /Abstract/
/** Return the requested format string*/
QString format() const;

/** Return the mime type for the response*/
QString infoFormat() const;

/** Return true if the HTTP headers were already sent to the client*/
bool headersSent() const;
};
@@ -47,6 +47,7 @@ class QgsOgcServiceException
QString message() const;
QString code() const;
QString locator() const;
QString version() const;

virtual QByteArray formatResponse( QString& responseFormat / Out / ) const;
};
@@ -79,6 +79,21 @@ class QgsServerRequest
*/
QMap<QString, QString> parameters() const;

/**
* Set a parameter
*/
void setParameter( const QString& key, const QString& value );

/**
* Get a parameter value
*/
QString getParameter( const QString& key ) const;

/**
* Remove a parameter
*/
void removeParameter( const QString& key );

/**
* Return post/put data
* Check for QByteArray::isNull() to check if data
@@ -24,9 +24,6 @@ SET ( qgis_mapserv_SRCS
qgscapabilitiescache.cpp
qgsconfigcache.cpp
qgsrequesthandler.cpp
qgsowsserver.cpp
qgswfsserver.cpp
qgswcsserver.cpp
qgsserversettings.cpp
qgsserverexception.cpp
qgsmslayercache.cpp
@@ -43,7 +40,6 @@ SET ( qgis_mapserv_SRCS
qgswmsconfigparser.cpp
qgswmsprojectparser.cpp
qgsserverprojectparser.cpp
qgsserverstreamingdevice.cpp
qgssldconfigparser.cpp
qgsconfigparserutils.cpp
qgsserver.cpp
@@ -56,6 +52,7 @@ SET ( qgis_mapserv_SRCS
qgsfcgiserverresponse.cpp
qgsbufferserverresponse.cpp
qgsfilterresponsedecorator.cpp
qgsfilterrestorer.cpp
#----------------------------
)
IF("${Qt5Network_VERSION}" VERSION_LESS "5.0.0")
@@ -76,7 +73,6 @@ SET (qgis_mapserv_MOC_HDRS
qgsmslayercache.h
qgsserverlogger.h
qgsserversettings.h
qgsserverstreamingdevice.h
)

IF("${Qt5Network_VERSION}" VERSION_LESS "5.0.0")
File renamed without changes.
@@ -19,14 +19,15 @@
#define QGSFILTERRESTORER_H

#include "qgsaccesscontrol.h"
#include "qgis_server.h"

#include <QHash>

class QgsMapLayer;

/** RAII class to restore layer filters on destruction
*/
class QgsOWSServerFilterRestorer
class SERVER_EXPORT QgsOWSServerFilterRestorer
{
public:

This file was deleted.

This file was deleted.

0 comments on commit 07c54e5

Please sign in to comment.