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
Showing with 3,756 additions and 3,397 deletions.
  1. +6 −1 doc/CMakeLists.txt
  2. +7 −0 doc/api_break.dox
  3. +0 −12 python/server/qgsrequesthandler.sip
  4. +1 −0 python/server/qgsserverexception.sip
  5. +15 −0 python/server/qgsserverrequest.sip
  6. +1 −5 src/server/CMakeLists.txt
  7. 0 src/server/{services/wms → }/qgsfilterrestorer.cpp
  8. +2 −1 src/server/{services/wms → }/qgsfilterrestorer.h
  9. +0 −66 src/server/qgsowsserver.cpp
  10. +0 −110 src/server/qgsowsserver.h
  11. +0 −129 src/server/qgsrequesthandler.cpp
  12. +0 −35 src/server/qgsrequesthandler.h
  13. +0 −54 src/server/qgsserver.cpp
  14. +16 −4 src/server/qgsserverexception.h
  15. +5 −0 src/server/qgsserverrequest.h
  16. +2 −0 src/server/qgsserverresponse.h
  17. +0 −58 src/server/qgsserverstreamingdevice.cpp
  18. +0 −45 src/server/qgsserverstreamingdevice.h
  19. +1 −0 src/server/qgsservice.h
  20. +1 −0 src/server/qgsserviceregistry.h
  21. +0 −493 src/server/qgswcsserver.cpp
  22. +0 −73 src/server/qgswcsserver.h
  23. +0 −2,172 src/server/qgswfsserver.cpp
  24. +0 −128 src/server/qgswfsserver.h
  25. +2 −0 src/server/services/CMakeLists.txt
  26. +59 −0 src/server/services/wcs/CMakeLists.txt
  27. +124 −0 src/server/services/wcs/qgswcs.cpp
  28. +83 −0 src/server/services/wcs/qgswcsdescribecoverage.cpp
  29. +41 −0 src/server/services/wcs/qgswcsdescribecoverage.h
  30. +121 −0 src/server/services/wcs/qgswcsgetcapabilities.cpp
  31. +41 −0 src/server/services/wcs/qgswcsgetcapabilities.h
  32. +205 −0 src/server/services/wcs/qgswcsgetcoverage.cpp
  33. +40 −0 src/server/services/wcs/qgswcsgetcoverage.h
  34. +80 −0 src/server/services/wcs/qgswcsserviceexception.h
  35. +94 −0 src/server/services/wcs/qgswcsutils.cpp
  36. +70 −0 src/server/services/wcs/qgswcsutils.h
  37. +60 −0 src/server/services/wfs/CMakeLists.txt
  38. +131 −0 src/server/services/wfs/qgswfs.cpp
  39. +102 −0 src/server/services/wfs/qgswfsdescribefeaturetype.cpp
  40. +43 −0 src/server/services/wfs/qgswfsdescribefeaturetype.h
  41. +175 −0 src/server/services/wfs/qgswfsgetcapabilities.cpp
  42. +44 −0 src/server/services/wfs/qgswfsgetcapabilities.h
  43. +1,289 −0 src/server/services/wfs/qgswfsgetfeature.cpp
  44. +36 −0 src/server/services/wfs/qgswfsgetfeature.h
  45. +80 −0 src/server/services/wfs/qgswfsserviceexception.h
  46. +576 −0 src/server/services/wfs/qgswfstransaction.cpp
  47. +44 −0 src/server/services/wfs/qgswfstransaction.h
  48. +80 −0 src/server/services/wfs/qgswfsutils.cpp
  49. +66 −0 src/server/services/wfs/qgswfsutils.h
  50. +0 −1 src/server/services/wms/CMakeLists.txt
  51. +9 −9 src/server/services/wms/qgswms.cpp
  52. +4 −1 src/server/services/wms/qgswmsgetcapabilities.h
@@ -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.
You can’t perform that action at this time.