Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add unittest for map-json function with qgis-server backend #373

Open
wants to merge 96 commits into
base: 2.8.x-qgis_server
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
3ab2287
Migrate qgis_server code to geonode 2.6.x (#164)
lucernae Apr 12, 2017
776c093
Refactor package name
lucernae Apr 12, 2017
ab593c8
code quality cleanup
lucernae Apr 12, 2017
faa059f
include QGIS Server integration in Travis
lucernae Apr 12, 2017
e535bf2
issue #172: skip some tests for qgis-server
lucernae Apr 20, 2017
2014ae8
Include branch master-qgis_server to travis.yml
lucernae Apr 27, 2017
9b1aa20
Add json file acceptance for qgis-server backend
lucernae May 2, 2017
6dd3c93
Fix QGIS-Server thumbnail
lucernae May 1, 2017
ca28ea9
improve geonode API:
lucernae Apr 27, 2017
4299184
Add decorator to check ogc backend used.
lucernae May 16, 2017
439c06c
Comment out core geonode developer notification
lucernae May 30, 2017
85b0df4
Add tests for qgis integration
lucernae May 30, 2017
9ff4742
Add codecov for coverage tests
lucernae May 30, 2017
3239193
add test about qgis server plugin
Gustry May 31, 2017
aebe837
Adapt context processors for qgis_server
lucernae Jun 1, 2017
4961453
refactor qgis views
Gustry Jun 2, 2017
b2c8171
use django as proxy for every OGC requests
Gustry Jun 2, 2017
76a6407
Fix maps test for qgis_server
lucernae Jun 1, 2017
a7ec2f2
Add ASCII file to geonode. (#232)
ismailsunni Jun 3, 2017
cf6883b
Fix leaflet map to not show tile and wms at the same time
lucernae Jun 5, 2017
7d4c9ce
Merge branch 'master' of https://github.com/geonode/geonode into mast…
lucernae Jun 5, 2017
3b5a694
Add download zipped files for non-shapefile. (#239)
ismailsunni Jun 5, 2017
82eb3e8
Merge branch 'master-qgis_server' of github.com:kartoza/geonode into …
lucernae Jun 5, 2017
0df03aa
refactor URLs in qgis-server app
Gustry Jun 6, 2017
eef3759
Merge branch 'master-qgis_server' of github.com:kartoza/geonode into …
lucernae Jun 6, 2017
37d10fe
Merge branch 'master' of https://github.com/GeoNode/geonode into mast…
lucernae Jun 6, 2017
80f0584
Merge pull request #249 from lucernae/master-merged-2
lucernae Jun 6, 2017
8c27152
remove access_token from urls and add docstring
Gustry Jun 7, 2017
5dd9638
add some basic tests to qgis server backend
Gustry Jun 7, 2017
c4b6b03
Remove asc link.
ismailsunni Jun 7, 2017
69df35e
Make replace layer works with QGIS Server Backend.
ismailsunni Jun 8, 2017
8685d4a
Unskip the unit test for replace layer for qgis server backend.
ismailsunni Jun 8, 2017
81ccebb
refactor helpers about WMS calls
Gustry Jun 8, 2017
3cbc980
add one OGC server per layer (with GetCapabilities)
Gustry Jun 8, 2017
1ccf9d8
remove test files on disk after a test
Gustry Jun 8, 2017
5ddea52
Fix skipped geoserver tests.
lucernae Jun 8, 2017
185d20d
Several code improvements:
lucernae Jun 8, 2017
5ca7a14
Update qgis server layer's xml file also.
ismailsunni Jun 10, 2017
c54707c
Merge branch 'master' of https://github.com/geonode/geonode into mast…
lucernae Jun 12, 2017
9c7970b
Merge pull request #264 from lucernae/master-merged-2
lucernae Jun 12, 2017
db2a1a5
Add name and typename in layer API.
ismailsunni Jun 13, 2017
6796540
add WMS, WFS remote thumbnail links
Gustry Jun 14, 2017
47590a3
Refactor QGIS Server Thumbnail remote url.
lucernae Jun 14, 2017
5714e7b
Allow to override geoserver settings.ini from cli
sebastianlach Jun 11, 2017
afd7a4e
Update backup/restore docs with new CLI options
sebastianlach Jun 11, 2017
8d79907
Fix for ISSUE #3124: Fix display of group activity
mekanix May 31, 2017
d5574c7
Fix missing frontend dependencies for leaflet. (#3128)
lucernae Jun 15, 2017
4cc609d
Fix osgeo package not found in travis.
lucernae Jun 24, 2017
de859df
Additional features for Geonode - QGIS Server
lucernae Jun 29, 2017
fb5b2a9
Fix for set styles functionality.
lucernae Jun 29, 2017
0450e95
Refactor QGIS Server Url generation.
lucernae Jun 30, 2017
87fe525
Skip bbox check for thumbnail creation.
lucernae Jul 3, 2017
462aba6
Code improvements for different CRS
lucernae Jul 4, 2017
0ee82de
Hide QML Style download when not exists.
lucernae Jul 5, 2017
39a2aa4
Improve unittests
lucernae Jul 17, 2017
fa5a63a
Add celerybeat to gitignore.
Gustry Jul 24, 2017
9af828d
use latest leaflet
boney-bun Jul 25, 2017
d6f2c43
Fix quoted tile url
lucernae Aug 5, 2017
a061aed
Add style management for QGIS Server backend.
lucernae Aug 9, 2017
6ad1905
add global zoom (#312)
boney-bun Aug 21, 2017
0bdaf4b
QGIS Style support improve (#315)
lucernae Aug 28, 2017
f7c63d6
Improvement for Styles API
lucernae Aug 28, 2017
c7615e7
Small patch for Layers API
lucernae Aug 31, 2017
3259132
add download QGS layer file (#322)
boney-bun Sep 11, 2017
63f051b
download a QLR file for a layer (#320)
boney-bun Sep 12, 2017
546c236
embed iframe when viewing a map (#313)
boney-bun Sep 14, 2017
0c36c84
bug fix on qgs and qlr layer (#326)
boney-bun Sep 15, 2017
9064c11
Fix for xml metadata utilities
lucernae Sep 15, 2017
f30baa0
Merge branch 'master' of https://github.com/GeoNode/geonode into upda…
lucernae Sep 15, 2017
896fc5d
Add widget link on viewing a map (#314)
boney-bun Sep 19, 2017
1d8aeea
fix zooming when two non-intersection layers are selected on create n…
boney-bun Sep 20, 2017
dc00b24
UI changes (#337)
boney-bun Sep 23, 2017
19ca7f5
download QLR file on map using links (#340)
boney-bun Sep 23, 2017
9c64bb7
allow cross-origin resource sharing (CROS) when embedding map (#343)
boney-bun Sep 24, 2017
905010a
Fix form errors not shown in style upload
lucernae Sep 27, 2017
5b92ccc
improve geosafe report button (#347)
boney-bun Sep 27, 2017
cca56d0
fix copying a map (#305)
boney-bun Sep 27, 2017
776df65
update pavement.py from upstream (#353)
boney-bun Oct 10, 2017
70d64ff
fix data tab (#351)
boney-bun Oct 10, 2017
3d19492
Merge branch 'master' of https://github.com/GeoNode/geonode into upda…
lucernae Oct 10, 2017
552228f
Fix default download and edit maps #207 (#330)
boney-bun Oct 12, 2017
861ec7e
fix set thumbnail and remove map (#350)
boney-bun Oct 13, 2017
7c1aff3
add QLR and QGS unittest for layer and map (#354)
boney-bun Oct 13, 2017
55483f3
Download leaflet page #151 (#344)
boney-bun Oct 14, 2017
f4a84ee
Merge branch 'master-qgis_server' of github.com:kartoza/geonode into …
lucernae Oct 10, 2017
8ae1950
bug fix embed widget (#345)
boney-bun Oct 18, 2017
bbb2ee5
Fix unittests from upstreams merges
lucernae Oct 17, 2017
0ba4b95
Merge branch 'master' of https://github.com/GeoNode/geonode into upda…
lucernae Oct 19, 2017
d98f5cd
Merge branch 'master' of https://github.com/GeoNode/geonode into upda…
lucernae Oct 25, 2017
054f053
Merge branch 'master' of https://github.com/GeoNode/geonode into upda…
lucernae Oct 27, 2017
708108c
Merge branch 'master-qgis_server' of github.com:kartoza/geonode into …
lucernae Oct 27, 2017
9220a9a
add unittest for map-json function with qgis-server backend
boney-bun Oct 29, 2017
bb53174
Merge branch 'master' of https://github.com/GeoNode/geonode into upda…
lucernae Oct 30, 2017
ddc0aba
Merge pull request #372 from lucernae/update-upstream
lucernae Oct 30, 2017
967ed0d
Merge branch 'master-qgis_server' into unittest-test-map-json-#207
boney-bun Oct 30, 2017
39af14a
fix travis
boney-bun Oct 30, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ geonode/static/lib/js/bootstrap-treeview.min.js

# Uploaded files
geonode/uploaded
geonode/qgis_layer
geonode/qgis_tiles

#Testing output
.coverage
Expand Down
55 changes: 34 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,27 @@ services:

env:
- BACKEND: 'geonode.geoserver'
# FIXME. Will be uncommented when qgis_server backend exists
# - BACKEND: 'geonode.qgis_server'
# DOCKER_COMPOSE_VERSION: 1.11.2
# # This is qgis server address
# QGIS_SERVER_URL: http://localhost:9000/
# # This is the location of docker network bridge
# # So QGIS server can access this address
# SITEURL: http://localhost:8000/
# GEONODE_PROJECT_PATH: /home/travis/build/kartoza/geonode/
# ON_TRAVIS: True
# CELERY_ALWAYS_EAGER: True
- BACKEND: 'geonode.qgis_server'
DOCKER_COMPOSE_VERSION: 1.11.2
# This is qgis server address
QGIS_SERVER_URL: http://localhost:9000/
# This is the location of docker network bridge
# So QGIS server can access this address
SITEURL: http://localhost:8000/
GEONODE_PROJECT_PATH: /home/travis/build/kartoza/geonode/
ON_TRAVIS: True
CELERY_ALWAYS_EAGER: True

branches:
only:
- master
- master-qgis_server
- 2.7.x
- 2.6.x

before_install:
- scripts/misc/qgis_server_setup.sh before_install

install:
- sudo apt-get -qq -y update
- sudo apt-get install -y libgdal1h python-gdal gdal-bin spatialite-bin
Expand All @@ -48,22 +51,32 @@ install:
before_script:
- paver setup

# For QGIS Server
- scripts/misc/qgis_server_setup.sh before_script

script:
- paver run_tests --coverage

after_script:
# For QGIS Server
- scripts/misc/qgis_server_setup.sh after_script

# Cleanup
- paver reset_hard

after_success:
- codecov

notifications:
irc:
channels:
- "irc.freenode.org#geonode"
use_notice: true
email:
- [email protected]
- [email protected]
- [email protected]
slack: geonode-sprint:oQylJRkU9feZ8JruGi6czWwe
# Commented out until changes are merged upstream.
# We don't have to bother geonode core developer.

#notifications:
# irc:
# channels:
# - "irc.freenode.org#geonode"
# use_notice: true
# email:
# - [email protected]
# - [email protected]
# - [email protected]
# slack: geonode-sprint:oQylJRkU9feZ8JruGi6czWwe
20 changes: 20 additions & 0 deletions docker-compose-qgis-server.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: '2'
services:

qgis-server:
image: kartoza/qgis-server:LTR
volumes:
- './:${GEONODE_PROJECT_PATH}'
- './otf-project:/opt/qgis-server/plugins/otf-project'
environment:
- QGIS_LOG_FILE=/tmp/qgis-server/qgis.log
- QGIS_SERVER_LOG_FILE=/tmp/qgis-server/qgis-server.log
- QGIS_DEBUG=5
- QGIS_SERVER_LOG_LEVEL=5
- QGIS_PLUGINPATH=/opt/qgis-server/plugins/
# It is important to include this environment variable
# QGIS-Server:LTR cgi needs it
- QGIS_PROJECT_FILE=
ports:
- "9000:80"
network_mode: "bridge"
Loading