Merge pull request #8 from BYU-Hydroinformatics/hydroshare_auth

Hydroshare auth
geoglows · Sep 22, 2020 · b2d0e95 · b2d0e95
2 parents f3d68ba + aa1ab76
commit b2d0e95
Show file tree

Hide file tree

Showing 15 changed files with 1,008 additions and 264 deletions.
diff --git a/install.yml b/install.yml
@@ -17,6 +17,7 @@ requirements:
       - geopandas
       - jinja2
       - geomatics
+      - hs_restclient
 
   pip:
     - geoserver-restconfig

diff --git a/tethysapp/geoglows_hydroviewer/app.py b/tethysapp/geoglows_hydroviewer/app.py
@@ -61,6 +61,10 @@ def url_maps(self):
             UrlMap(name='project_overview',
                    url=f'{self.root_url}/creator/project',
                    controller=f'{self.package}.controllers_creator.project_overview'),
+            UrlMap(name='render_hydroviewer',
+                   url=f'{self.root_url}/creator/render',
+                   controller=f'{self.package}.controllers_creator.render_hydroviewer'),
+
             # creator pages and urls for adding/deleting projects
             UrlMap(name='add_new_project',
                    url=f'{self.root_url}/creator/add-new-project',
@@ -94,16 +98,19 @@ def url_maps(self):
                    url=f'{self.root_url}/creator/project/edit/retrieve_boundaries',
                    controller=f'{self.package}.controllers_creator.retrieve_hydroviewer_boundaries'),
 
-            # project exporting options
-            UrlMap(name='shapefile_export_zipfile',
-                   url=f'{self.root_url}/creator/project/export/shapefile_export_zipfile',
-                   controller=f'{self.package}.controllers_creator.shapefile_export_zipfile'),
-            UrlMap(name='shapefile_export_geoserver',
-                   url=f'{self.root_url}/creator/project/export/shapefile_export_geoserver',
-                   controller=f'{self.package}.controllers_creator.shapefile_export_geoserver'),
-            UrlMap(name='project_export_html',
-                   url=f'{self.root_url}/creator/project/export/project_export_html',
-                   controller=f'{self.package}.controllers_creator.project_export_html'),
+            # project and shapefile exporting options
+            UrlMap(name='export_zipfile',
+                   url=f'{self.root_url}/creator/project/export/zipfile',
+                   controller=f'{self.package}.controllers_creator_export.export_zipfile'),
+            UrlMap(name='export_geoserver',
+                   url=f'{self.root_url}/creator/project/export/geoserver',
+                   controller=f'{self.package}.controllers_creator_export.export_geoserver'),
+            UrlMap(name='export_hydroshare',
+                   url=f'{self.root_url}/creator/project/export/hydroshare',
+                   controller=f'{self.package}.controllers_creator_export.export_hydroshare'),
+            UrlMap(name='export_html',
+                   url=f'{self.root_url}/creator/project/export/html',
+                   controller=f'{self.package}.controllers_creator_export.export_html'),
         )
 
     def custom_settings(self):