Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #5153 from nyalldawson/geonode
[FEATURE] QGIS - GeoNode Integration
  • Loading branch information
nyalldawson committed Sep 12, 2017
2 parents 5614df4 + 220c5e8 commit 5796783
Show file tree
Hide file tree
Showing 84 changed files with 4,949 additions and 462 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -23,7 +23,7 @@
/CMakeLists.txt.user
/CMakeLists.txt.user.*
api_doc
build*
*build*
debian/*.debhelper
debian/*.substvars
desktop.ini
Expand Down
1 change: 1 addition & 0 deletions debian/qgis-providers.install.in
Expand Up @@ -2,6 +2,7 @@ usr/lib/qgis/crssync
usr/lib/qgis/plugins/libbasicauthmethod.so
usr/lib/qgis/plugins/libdelimitedtextprovider.so
usr/lib/qgis/plugins/libgdalprovider.so
usr/lib/qgis/plugins/libgeonodeprovider.so
usr/lib/qgis/plugins/libgpxprovider.so
usr/lib/qgis/plugins/libidentcertauthmethod.so
usr/lib/qgis/plugins/libmssqlprovider.so
Expand Down
2 changes: 2 additions & 0 deletions doc/CMakeLists.txt
Expand Up @@ -61,6 +61,8 @@ IF(WITH_APIDOC)
${CMAKE_SOURCE_DIR}/src/core/effects
${CMAKE_SOURCE_DIR}/src/core/fieldformatter
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/geocms
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
${CMAKE_SOURCE_DIR}/src/core/gps
${CMAKE_SOURCE_DIR}/src/core/layertree
${CMAKE_SOURCE_DIR}/src/core/layout
Expand Down
2 changes: 2 additions & 0 deletions images/images.qrc
Expand Up @@ -135,6 +135,7 @@
<file>themes/default/mActionAddWcsLayer.svg</file>
<file>themes/default/mActionAddWfsLayer.svg</file>
<file>themes/default/mActionAddWmsLayer.svg</file>
<file>themes/default/mActionAddGeonodeLayer.svg</file>
<file>themes/default/mActionAddDelimitedTextLayer.svg</file>
<file>themes/default/mActionAddVirtualLayer.svg</file>
<file>themes/default/mActionAlignBottom.svg</file>
Expand Down Expand Up @@ -359,6 +360,7 @@
<file>themes/default/mIconFieldInteger.svg</file>
<file>themes/default/mIconFieldText.svg</file>
<file>themes/default/mIconFieldTime.svg</file>
<file>themes/default/mIconGeonode.svg</file>
<file>themes/default/mIconInfo.svg</file>
<file>themes/default/mIconImport.gif</file>
<file>themes/default/mIconLabelQuadrantCenter.svg</file>
Expand Down
407 changes: 407 additions & 0 deletions images/themes/default/mActionAddGeonodeLayer.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions images/themes/default/mIconGeonode.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions ms-windows/osgeo4w/package.cmd
Expand Up @@ -301,6 +301,7 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-common/%PACKAGENAME
"apps/%PACKAGENAME%/plugins/basicauthmethod.dll" ^
"apps/%PACKAGENAME%/plugins/delimitedtextprovider.dll" ^
"apps/%PACKAGENAME%/plugins/gdalprovider.dll" ^
"apps/%PACKAGENAME%/plugins/geonodeprovider.dll" ^
"apps/%PACKAGENAME%/plugins/gpxprovider.dll" ^
"apps/%PACKAGENAME%/plugins/identcertauthmethod.dll" ^
"apps/%PACKAGENAME%/plugins/mssqlprovider.dll" ^
Expand Down
2 changes: 2 additions & 0 deletions python/CMakeLists.txt
Expand Up @@ -112,6 +112,8 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core/fieldformatter
${CMAKE_SOURCE_DIR}/src/core/dxf
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/geocms
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
${CMAKE_SOURCE_DIR}/src/core/gps
${CMAKE_SOURCE_DIR}/src/core/layertree
${CMAKE_SOURCE_DIR}/src/core/layout
Expand Down
2 changes: 2 additions & 0 deletions python/core/core_auto.sip
Expand Up @@ -284,6 +284,7 @@
%Include fieldformatter/qgsrelationreferencefieldformatter.sip
%Include fieldformatter/qgsvaluemapfieldformatter.sip
%Include fieldformatter/qgsvaluerelationfieldformatter.sip
%Include geocms/geonode/qgsgeonodeconnection.sip
%Include gps/qgsqtlocationconnection.sip
%Include gps/qgsgpsconnectionregistry.sip
%Include qgsapplication.sip
Expand Down Expand Up @@ -382,6 +383,7 @@
%Include raster/qgsrasterdataprovider.sip
%Include raster/qgsrasterinterface.sip
%Include geometry/qgspoint.sip
%Include geocms/geonode/qgsgeonoderequest.sip
%Include gps/qgsgpsconnection.sip
%Include gps/qgsgpsdetector.sip
%Include gps/qgsnmeaconnection.sip
Expand Down
115 changes: 115 additions & 0 deletions python/core/geocms/geonode/qgsgeonodeconnection.sip
@@ -0,0 +1,115 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/geocms/geonode/qgsgeonodeconnection.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/



class QgsGeoNodeConnection
{
%Docstring
Encapsulates settings related to a single GeoNode connection.
.. versionadded:: 3.0
%End

%TypeHeaderCode
#include "qgsgeonodeconnection.h"
%End
public:

explicit QgsGeoNodeConnection( const QString &name );
%Docstring
Constructor for a QgsGeoNodeConnection with the specified ``name``.
%End

QString connectionName() const;
%Docstring
Returns the name of the connection.
.. seealso:: setConnectionName()
:rtype: str
%End

void setConnectionName( const QString &connectionName );
%Docstring
Sets the ``name`` of the connection.
.. seealso:: connectionName()
%End

QgsDataSourceUri uri() const;
%Docstring
Returns the URI for the GeoNode connection.
.. seealso:: setUri()
:rtype: QgsDataSourceUri
%End

void setUri( const QgsDataSourceUri &uri );
%Docstring
Sets the ``uri`` for the GeoNode connection.
.. seealso:: uri()
%End

QgsDataSourceUri &addWmsConnectionSettings( QgsDataSourceUri &uri ) const;
%Docstring
Adds uri parameters relating to the settings for a WMS layer on the connection to a QgsDataSourceUri ``uri``.
.. seealso:: addWmsWcsConnectionSettings()
:rtype: QgsDataSourceUri
%End

QgsDataSourceUri &addWfsConnectionSettings( QgsDataSourceUri &uri ) const;
%Docstring
Adds uri parameters relating to the settings for a WFS layer on the connection to a QgsDataSourceUri ``uri``.
.. seealso:: addWmsWcsConnectionSettings()
:rtype: QgsDataSourceUri
%End

};

class QgsGeoNodeConnectionUtils
{
%Docstring
Contains various utilities for managing the known collection of
GeoNode servers associated with a QGIS install.
.. versionadded:: 3.0
%End

%TypeHeaderCode
#include "qgsgeonodeconnection.h"
%End
public:

static QStringList connectionList();
%Docstring
Returns a list of all known GeoNode connection names.
:rtype: list of str
%End

static void deleteConnection( const QString &name );
%Docstring
Deletes the GeoNode connection with matching ``name``.
%End

static QString pathGeoNodeConnection();
%Docstring
Returns the base path for settings related to GeoNode connections.
:rtype: str
%End

static QString pathGeoNodeConnectionDetails();
%Docstring
Returns the base path for settings related to GeoNode connection details.
:rtype: str
%End

};


/************************************************************************
* This file has been generated automatically from *
* *
* src/core/geocms/geonode/qgsgeonodeconnection.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/

0 comments on commit 5796783

Please sign in to comment.