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

WIP: interaction IRMT <--> GeoViewer #720

Draft
wants to merge 43 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
db19a92
Enable setting profiles to connect to instances of the OQ-GeoViewer
ptormene Jan 15, 2020
5c9ed0a
Set session.auth with username and password
ptormene Jan 16, 2020
e75a247
Add a menu group and item to import a geoviwer project
ptormene Jan 16, 2020
3b1c6ac
Add geometry validation as first step to upload project to geoviewer
ptormene Jan 24, 2020
1973795
Add missing files to import layers from geoviewer
ptormene Jan 24, 2020
0488f16
Add missing files to upload project to geoviewer
ptormene Jan 24, 2020
fa8ca7f
Add consolidation workflow
ptormene Jan 24, 2020
a817873
Add layer with invalid feats to tree; fix feedback
ptormene Jan 27, 2020
c53d6d2
Add authentication and call to the upload api
ptormene Jan 27, 2020
6eb2207
Check geometries only for vector layers
ptormene Jan 28, 2020
727f751
While uploading to geoviewer, add lincense to the POST data
ptormene Jan 28, 2020
efdfa0b
Display an error message if the project does not have a valid crs
ptormene Jan 28, 2020
a46c40b
Display a warning if a basemap is not in a group named basemaps or si…
ptormene Jan 28, 2020
64c46d1
Revert "While uploading to geoviewer, add lincense to the POST data"
ptormene Jan 29, 2020
651acfd
Improve a comment
ptormene Jan 29, 2020
bce29ed
Add warnings if project owsServiceCapabilities or wmsExtent are disabled
ptormene Jan 29, 2020
64ef883
Assign parent to UploadGvProjDialog; add comment about retrieving lic…
ptormene Jan 29, 2020
2badb4e
Merge remote-tracking branch 'origin/master' into geoviewer
ptormene Aug 27, 2020
5648650
Add warnings if "Add geometry to feature response" or "Segmentize fea…
ptormene Aug 27, 2020
af8f747
Populate project kind cbx; check if proj name is already taken
ptormene Aug 28, 2020
c6182bd
Add logo to ui_upload_gv_proj.ui
ptormene Aug 28, 2020
3aace17
Add buttons to download projects from GeoViewer
ptormene Aug 28, 2020
f07d411
Fix setting project kind and set some timeouts to requests
ptormene Sep 4, 2020
dea87ed
Add checkbod to automatically create a map out of the uploaded GeoVie…
ptormene Sep 4, 2020
45a6f41
Merge remote-tracking branch 'origin/master' into geoviewer
ptormene Sep 24, 2020
74b017f
Merge branch 'master' into geoviewer
ptormene Jan 7, 2021
b8d6f6f
Fixed downloading procedure and minor things
ptormene Jan 11, 2021
eb08865
Fix indentation of code generating download buttons
ptormene Jan 11, 2021
a45f4ee
In list of GeoViewer maps, put Download button first, then name, then…
ptormene Jan 11, 2021
bcdcacb
Add message boxes to automatically set up missing properties before u…
ptormene Jan 11, 2021
184d855
Do not give warnings about geometries for csv-based layers (tables)
ptormene Jan 12, 2021
c4787e5
Merge branch 'master' into geoviewer
ptormene Feb 16, 2021
6971d2a
Merge branch 'master' into geoviewer
ptormene Apr 7, 2021
7ac9017
Retrieve only published maps from geoviewer and display a clear error…
ptormene Apr 13, 2021
265a4a7
Check validity of geometries only for vector layers
ptormene Apr 13, 2021
0eb436e
Save project before consolidating (otherwise it does not change on se…
ptormene Apr 15, 2021
ae2a1a1
Check auto_create_map by default
ptormene Apr 16, 2021
8445e5c
When loading GeoViewer project, add basemaps into a group
ptormene Apr 21, 2021
196d3fa
Merge branch 'master' into geoviewer
ptormene Aug 17, 2021
c749de4
Merge branch 'master' into geoviewer
ptormene Aug 26, 2021
615c6c9
Merge branch 'master' into geoviewer
ptormene Aug 26, 2021
44de6e4
Merge branch 'master' into geoviewer
ptormene Sep 6, 2021
465edb0
Merge branch 'master' into geoviewer
ptormene Sep 13, 2021
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
Prev Previous commit
Next Next commit
While uploading to geoviewer, add lincense to the POST data
  • Loading branch information
ptormene committed Jan 28, 2020
commit 727f7518b520732fcbf2f58b881f0b3c46fda52f
4 changes: 2 additions & 2 deletions svir/dialogs/upload_gv_proj_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,10 @@ def on_consolidation_completed(self, project_file):
self.upload_to_geoviewer(zipped_project)

def upload_to_geoviewer(self, zipped_project):
# FIXME: add license (to data?)
data = {'license': self.license_cbx.currentText()}
files = {'file': open(zipped_project, 'rb')}
r = self.session.post(
self.hostname + '/api/project/upload', files=files)
self.hostname + '/api/project/upload', data=data, files=files)
if r.ok:
msg = ("The project was successfully uploaded to the"
" OpenQuake GeoViewer")
Expand Down