- MapLoom GIS client hooksets

GeoNode · Jul 20, 2018 · 821beb2 · 821beb2
1 parent b745808
commit 821beb2
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 33 deletions.
diff --git a/geonode/client/hooksets.py b/geonode/client/hooksets.py
@@ -188,13 +188,13 @@ def map_view_template(self, context=None):
         return 'maploom/maps/maploom.html'
 
     def map_edit_template(self, context=None):
-        return 'maploom/maps/map_edit.html'
+        return 'maploom/maps/maploom.html'
 
     def map_update_template(self, context=None):
-        return 'maploom/maps/map_edit.html'
+        return 'maploom/maps/maploom.html'
 
     def map_embed_template(self, context=None):
-        return 'maploom/maps/map_view.html'
+        return 'maploom/maps/maploom.html'
 
     def map_download_template(self, context=None):
-        return 'maploom/maps/map_view.html'
+        return 'maploom/maps/maploom.html'
diff --git a/geonode/client/templates/maploom/maps/maploom.html b/geonode/client/templates/maploom/maps/maploom.html
@@ -4,31 +4,34 @@
 <html ng-app="MapLoom" ng-controller="AppCtrl">
 <head>
 <title ng-bind="pageTitle"></title>
-
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-COMPATIBLE" content="IE-Edge">
-  <script type="text/javascript">
-    window.MAPLOOM_VERSION = {
-        "version_string": "1.5.135",
-        "build_date": "2018-07-05"
-    };
-  </script>
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-COMPATIBLE" content="IE-Edge">
+<script type="text/javascript">
+window.MAPLOOM_VERSION = {
+    "version_string": "1.5.135",
+    "build_date": "2018-07-05"
+};
+</script>
 
 <!-- compiled CSS -->
+<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}maploom/assets/MapLoom-1.5.135.css"/>
 
-        <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}maploom/assets/MapLoom-1.5.135.css"/>
-
-
+<style>
+    body{
+        padding-bottom: 0px;
+        overflow: hidden;
+    }
+    .maploom{
+        width: 100%;
+        border:0px;
 
+    }
+</style>
 
 <!-- compiled JavaScript -->
+<script type="text/javascript" src="{{STATIC_URL}}maploom/assets/MapLoom-1.5.135.js"></script>
 
-        <script type="text/javascript" src="{{STATIC_URL}}maploom/assets/MapLoom-1.5.135.js"></script>
-
-
-
-
-    {% get_current_language as language%}
+{% get_current_language as language%}
 <script type="text/javascript">
     var catalogList = [];
     try {
@@ -152,14 +155,31 @@
     config.map.layers = scrubMapLayers();
 </script>
 
-
 <script type="text/javascript">
   var onErrorCallback = function(msg, url, linenumber) { return true; };
   window.onerror = function(msg, url, linenumber) {
     onErrorCallback(msg,url,linenumber);
   };
 </script>
 
+<script type="text/javascript">
+  $(document).ready(function() {
+
+      var setHeight = function(){
+        return $('.maploom').css({height:$(window).height()-($('.navbar').height()+$('.classification-banner-text').height())});
+      }
+
+      $('#wrap').css({'padding-top':0});
+      $('body').css({'padding-top':$('.classification-banner-text').height()+$('.navbar').height()});
+      setHeight();
+
+      $(window).resize(function(){
+              setHeight();
+              });
+
+      });
+</script>
+
 </head>
 <body class="maploom-body">
 

diff --git a/geonode/maps/views.py b/geonode/maps/views.py
@@ -42,7 +42,8 @@
     from django.utils import simplejson as json
 from django.utils.html import strip_tags
 from django.db.models import F
-from django.views.decorators.clickjacking import xframe_options_exempt
+from django.views.decorators.clickjacking import (xframe_options_exempt,
+                                                  xframe_options_sameorigin)
 from django.views.decorators.http import require_http_methods
 
 from geonode.layers.models import Layer
@@ -505,6 +506,7 @@ def add_layer(request):
     return map_view(request, str(map_obj.id), layer_name=layer_name)
 
 
+@xframe_options_sameorigin
 def map_view(request, mapid, snapshot=None, layer_name=None,
              template='maps/map_view.html'):
     """
@@ -597,6 +599,7 @@ def map_json(request, mapid, snapshot=None):
             )
 
 
+@xframe_options_sameorigin
 def map_edit(request, mapid, snapshot=None, template='maps/map_edit.html'):
     """
     The view that returns the map composer opened to

diff --git a/geonode/settings.py b/geonode/settings.py
@@ -360,7 +360,8 @@
     # 'haystack',
     'autocomplete_light',
     'mptt',
-    # 'modeltranslation',
+    # 'crispy_forms',
+
     # 'djkombu',
     # 'djcelery',
     # 'kombu.transport.django',
@@ -394,10 +395,21 @@
     'allauth.account',
     'allauth.socialaccount',
 
+    # Django REST Framework
+    'rest_framework',
+
     # GeoNode
     'geonode',
 ) + GEONODE_APPS
 
+REST_FRAMEWORK = {
+    # Use Django's standard `django.contrib.auth` permissions,
+    # or allow read-only access for unauthenticated users.
+    'DEFAULT_PERMISSION_CLASSES': [
+        'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly'
+    ]
+}
+
 # Documents application
 ALLOWED_DOCUMENT_TYPES = [
     'doc', 'docx', 'gif', 'jpg', 'jpeg', 'ods', 'odt', 'odp', 'pdf', 'png',
@@ -1201,6 +1213,29 @@
 GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY = 'geoext'  # DEPRECATED use HOOKSET instead
 GEONODE_CLIENT_HOOKSET = "geonode.client.hooksets.GeoExtHookSet"
 
+# To enable the REACT based Client enable those
+"""
+if 'geonode-client' not in INSTALLED_APPS:
+    INSTALLED_APPS += ('geonode-client', )
+GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY = 'react'  # DEPRECATED use HOOKSET instead
+GEONODE_CLIENT_HOOKSET = "geonode.client.hooksets.ReactHookSet"
+"""
+
+# To enable the Leaflet based Client enable those
+"""
+GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY = 'leaflet'  # DEPRECATED use HOOKSET instead
+GEONODE_CLIENT_HOOKSET = "geonode.client.hooksets.LeafletHookSet"
+"""
+
+# To enable the MapLoom based Client enable those
+"""
+GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY = 'maploom'  # DEPRECATED use HOOKSET instead
+GEONODE_CLIENT_HOOKSET = "geonode.client.hooksets.MaploomHookSet"
+CORS_ORIGIN_WHITELIST = (
+    HOSTNAME
+)
+"""
+
 SERVICE_UPDATE_INTERVAL = 0
 
 SEARCH_FILTERS = {

diff --git a/requirements.txt b/requirements.txt
@@ -25,8 +25,9 @@ Paver<=1.2.4 # python-paver (1.2.4)
 Unidecode<=0.4.19 # python-unidecode (0.04.19)
 django-nose<=1.4.5 # python-django-nose (1.4.5 in our ppa)
 nose<=1.3.7 # python-nose (1.3.7)
+Markdown==2.6.11
+MarkupSafe==1.0
 awesome-slugify<=1.6.5 # python-awesome-slugify (1.6.5)
-django-filter==1.1.0 # python-django-filter (1.1.0 in our ppa)
 django-floppyforms<=1.7.0 # python-django-floppyforms (1.7.0 in our ppa)
 chardet<=3.0.4 # python-chardet (3.0.4 in our ppa)
 decorator<=4.1.2 # python-decorator (4.1.2 in our ppa)
@@ -48,7 +49,9 @@ tqdm==4.23.3
 # Django Apps
 dj-pagination<=2.3.2 # python-dj-pagination (2.3.2 in our ppa)
 django-celery-monitor<=1.1.2
+django-crispy-forms==1.7.2
 django-extensions>=1.2.5,<=2.0.7 # python-django-extensions (2.0.3 in our ppa)
+django-filter==2.0.0 # python-django-filter (1.1.0 in our ppa)
 django-jsonfield<=1.0.1 # python-django-jsonfield (0.9.15, 1.0.1 in our ppa)
 django-jsonfield-compat<=0.4.4 # python-django-jsonfield-compat (0.4.4 in our ppa)
 django-leaflet<=0.23.0 # python-django-leaflet (0.23.0 in our ppa)
@@ -58,16 +61,16 @@ django-treebeard<=4.2.1 # django-treebeard (4.2.1 in our ppa)
 django-guardian<=1.4.9 # django-guardian (1.4.9 in our ppa)
 django-downloadview<=1.9 # python-django-downloadview (1.9 in our ppa)
 django-polymorphic<2.0 # python-django-polymorphic (1.3)
-# django-rest-swagger==2.1.2 # python-django-rest-swagger (2.1.2 in our ppa)
 django-reversion<=2.0.13 # python-django-reversion (2.0.13 in our ppa)
 django-suit<=0.2.26 # python-django-suit (0.2.26 in our ppa)
 django-tastypie<=0.14.0 # python-django-tastypie (0.14.0 in our ppa)
 django-invitations<=1.9.2 # python-django-invitations (1.9.2 in our ppa)
-geonode-oauth-toolkit>=1.1.2c0 # python-django-oauth-toolkit (0.12.0 in our ppa)
-# djangorestframework<=3.7.7 # TODO
+djangorestframework==3.8.2
 # djangorestframework-gis<=0.12 # TODO
+# django-rest-swagger==2.1.2 # python-django-rest-swagger (2.1.2 in our ppa)
 # drf-nested-routers==0.90.0 # python-drf-nested-routers (0.90.0 in our ppa)
 # drf-openapi==1.3.0 # python-drf-openapi (1.3.0 in our ppa)
+geonode-oauth-toolkit>=1.1.2c0 # python-django-oauth-toolkit (0.12.0 in our ppa)
 oauthlib==2.1.0 # python-oauthlib (2.0.6 in our ppa) FIXME
 requests-oauthlib==1.0.0
 asn1crypto==0.24.0
@@ -121,8 +124,8 @@ geonode-agon-ratings==0.3.8 # python-geonode-agon-ratings (0.3.8 in our ppa)
 arcrest>=10.0 # TODO
 geonode-dialogos==1.2 # python-geonode-dialogos (0.9 in our ppa)
 gsconfig>=1.0.10 # python-gsconfig (1.0.8 in our ppa)
-gn-gsimporter>=1.0.8 # python-gn-gsimporter (1.0.2 in our ppa)
-gisdata==0.5.4 # python-gisdata (0.5.4 in our ppa)
+gn-gsimporter>=1.0.9 # python-gn-gsimporter (1.0.2 in our ppa)
+gisdata>=0.5.4 # python-gisdata (0.5.4 in our ppa)
 
 # haystack/elasticsearch, uncomment to use
 django-haystack==2.8.0 # (2.8.0 in our ppa)

diff --git a/requirements_docs.txt b/requirements_docs.txt
@@ -86,8 +86,8 @@ geonode-dialogos==1.2
 geonode-user-messages==0.1.14
 gisdata==0.5.4
 glob2==0.6
-gn-gsimporter>=1.0.6
-gsconfig==1.0.8
+gn-gsimporter>=1.0.9
+gsconfig>=1.0.10
 httplib2==0.10.3
 idna==2.6
 inflection==0.3.1