Skip to content

Commit 5796783

Browse files
nyalldawsonnyalldawson
authored
Merge pull request #5153 from nyalldawson/geonode
[FEATURE] QGIS - GeoNode Integration
2 parents 5614df4 + 220c5e8 commit 5796783

File tree

84 files changed

+4949
-462
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+4949
-462
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/CMakeLists.txt.user
2424
/CMakeLists.txt.user.*
2525
api_doc
26-
build*
26+
*build*
2727
debian/*.debhelper
2828
debian/*.substvars
2929
desktop.ini

‎debian/qgis-providers.install.in

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ usr/lib/qgis/crssync
22
usr/lib/qgis/plugins/libbasicauthmethod.so
33
usr/lib/qgis/plugins/libdelimitedtextprovider.so
44
usr/lib/qgis/plugins/libgdalprovider.so
5+
usr/lib/qgis/plugins/libgeonodeprovider.so
56
usr/lib/qgis/plugins/libgpxprovider.so
67
usr/lib/qgis/plugins/libidentcertauthmethod.so
78
usr/lib/qgis/plugins/libmssqlprovider.so

‎doc/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ IF(WITH_APIDOC)
6161
${CMAKE_SOURCE_DIR}/src/core/effects
6262
${CMAKE_SOURCE_DIR}/src/core/fieldformatter
6363
${CMAKE_SOURCE_DIR}/src/core/geometry
64+
${CMAKE_SOURCE_DIR}/src/core/geocms
65+
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
6466
${CMAKE_SOURCE_DIR}/src/core/gps
6567
${CMAKE_SOURCE_DIR}/src/core/layertree
6668
${CMAKE_SOURCE_DIR}/src/core/layout

‎images/images.qrc

+2
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@
135135
<file>themes/default/mActionAddWcsLayer.svg</file>
136136
<file>themes/default/mActionAddWfsLayer.svg</file>
137137
<file>themes/default/mActionAddWmsLayer.svg</file>
138+
<file>themes/default/mActionAddGeonodeLayer.svg</file>
138139
<file>themes/default/mActionAddDelimitedTextLayer.svg</file>
139140
<file>themes/default/mActionAddVirtualLayer.svg</file>
140141
<file>themes/default/mActionAlignBottom.svg</file>
@@ -359,6 +360,7 @@
359360
<file>themes/default/mIconFieldInteger.svg</file>
360361
<file>themes/default/mIconFieldText.svg</file>
361362
<file>themes/default/mIconFieldTime.svg</file>
363+
<file>themes/default/mIconGeonode.svg</file>
362364
<file>themes/default/mIconInfo.svg</file>
363365
<file>themes/default/mIconImport.gif</file>
364366
<file>themes/default/mIconLabelQuadrantCenter.svg</file>

‎images/themes/default/mActionAddGeonodeLayer.svg

+407
Loading

‎images/themes/default/mIconGeonode.svg

+13
Loading

‎ms-windows/osgeo4w/package.cmd

+1
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ tar -C %OSGEO4W_ROOT% -cjf %ARCH%/release/qgis/%PACKAGENAME%-common/%PACKAGENAME
301301
"apps/%PACKAGENAME%/plugins/basicauthmethod.dll" ^
302302
"apps/%PACKAGENAME%/plugins/delimitedtextprovider.dll" ^
303303
"apps/%PACKAGENAME%/plugins/gdalprovider.dll" ^
304+
"apps/%PACKAGENAME%/plugins/geonodeprovider.dll" ^
304305
"apps/%PACKAGENAME%/plugins/gpxprovider.dll" ^
305306
"apps/%PACKAGENAME%/plugins/identcertauthmethod.dll" ^
306307
"apps/%PACKAGENAME%/plugins/mssqlprovider.dll" ^

‎python/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@ INCLUDE_DIRECTORIES(
112112
${CMAKE_SOURCE_DIR}/src/core/fieldformatter
113113
${CMAKE_SOURCE_DIR}/src/core/dxf
114114
${CMAKE_SOURCE_DIR}/src/core/geometry
115+
${CMAKE_SOURCE_DIR}/src/core/geocms
116+
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
115117
${CMAKE_SOURCE_DIR}/src/core/gps
116118
${CMAKE_SOURCE_DIR}/src/core/layertree
117119
${CMAKE_SOURCE_DIR}/src/core/layout

‎python/core/core_auto.sip

+2
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@
284284
%Include fieldformatter/qgsrelationreferencefieldformatter.sip
285285
%Include fieldformatter/qgsvaluemapfieldformatter.sip
286286
%Include fieldformatter/qgsvaluerelationfieldformatter.sip
287+
%Include geocms/geonode/qgsgeonodeconnection.sip
287288
%Include gps/qgsqtlocationconnection.sip
288289
%Include gps/qgsgpsconnectionregistry.sip
289290
%Include qgsapplication.sip
@@ -382,6 +383,7 @@
382383
%Include raster/qgsrasterdataprovider.sip
383384
%Include raster/qgsrasterinterface.sip
384385
%Include geometry/qgspoint.sip
386+
%Include geocms/geonode/qgsgeonoderequest.sip
385387
%Include gps/qgsgpsconnection.sip
386388
%Include gps/qgsgpsdetector.sip
387389
%Include gps/qgsnmeaconnection.sip

‎python/core/geocms/geonode/qgsgeonodeconnection.sip

+115
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
/************************************************************************
2+
* This file has been generated automatically from *
3+
* *
4+
* src/core/geocms/geonode/qgsgeonodeconnection.h *
5+
* *
6+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7+
************************************************************************/
8+
9+
10+
11+
class QgsGeoNodeConnection
12+
{
13+
%Docstring
14+
Encapsulates settings related to a single GeoNode connection.
15+
.. versionadded:: 3.0
16+
%End
17+
18+
%TypeHeaderCode
19+
#include "qgsgeonodeconnection.h"
20+
%End
21+
public:
22+
23+
explicit QgsGeoNodeConnection( const QString &name );
24+
%Docstring
25+
Constructor for a QgsGeoNodeConnection with the specified ``name``.
26+
%End
27+
28+
QString connectionName() const;
29+
%Docstring
30+
Returns the name of the connection.
31+
.. seealso:: setConnectionName()
32+
:rtype: str
33+
%End
34+
35+
void setConnectionName( const QString &connectionName );
36+
%Docstring
37+
Sets the ``name`` of the connection.
38+
.. seealso:: connectionName()
39+
%End
40+
41+
QgsDataSourceUri uri() const;
42+
%Docstring
43+
Returns the URI for the GeoNode connection.
44+
.. seealso:: setUri()
45+
:rtype: QgsDataSourceUri
46+
%End
47+
48+
void setUri( const QgsDataSourceUri &uri );
49+
%Docstring
50+
Sets the ``uri`` for the GeoNode connection.
51+
.. seealso:: uri()
52+
%End
53+
54+
QgsDataSourceUri &addWmsConnectionSettings( QgsDataSourceUri &uri ) const;
55+
%Docstring
56+
Adds uri parameters relating to the settings for a WMS layer on the connection to a QgsDataSourceUri ``uri``.
57+
.. seealso:: addWmsWcsConnectionSettings()
58+
:rtype: QgsDataSourceUri
59+
%End
60+
61+
QgsDataSourceUri &addWfsConnectionSettings( QgsDataSourceUri &uri ) const;
62+
%Docstring
63+
Adds uri parameters relating to the settings for a WFS layer on the connection to a QgsDataSourceUri ``uri``.
64+
.. seealso:: addWmsWcsConnectionSettings()
65+
:rtype: QgsDataSourceUri
66+
%End
67+
68+
};
69+
70+
class QgsGeoNodeConnectionUtils
71+
{
72+
%Docstring
73+
Contains various utilities for managing the known collection of
74+
GeoNode servers associated with a QGIS install.
75+
.. versionadded:: 3.0
76+
%End
77+
78+
%TypeHeaderCode
79+
#include "qgsgeonodeconnection.h"
80+
%End
81+
public:
82+
83+
static QStringList connectionList();
84+
%Docstring
85+
Returns a list of all known GeoNode connection names.
86+
:rtype: list of str
87+
%End
88+
89+
static void deleteConnection( const QString &name );
90+
%Docstring
91+
Deletes the GeoNode connection with matching ``name``.
92+
%End
93+
94+
static QString pathGeoNodeConnection();
95+
%Docstring
96+
Returns the base path for settings related to GeoNode connections.
97+
:rtype: str
98+
%End
99+
100+
static QString pathGeoNodeConnectionDetails();
101+
%Docstring
102+
Returns the base path for settings related to GeoNode connection details.
103+
:rtype: str
104+
%End
105+
106+
};
107+
108+
109+
/************************************************************************
110+
* This file has been generated automatically from *
111+
* *
112+
* src/core/geocms/geonode/qgsgeonodeconnection.h *
113+
* *
114+
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
115+
************************************************************************/

0 commit comments

Comments
 (0)