Removed google earth tool. Fixed the gxp_mapshare tool. Fixing google…

… map api key read
GeoNode · Mar 5, 2018 · 968eb2c · 968eb2c
1 parent 44cec0c
commit 968eb2c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/geonode/context_processors.py b/geonode/context_processors.py
@@ -178,6 +178,6 @@ def resource_urls(request):
         defaults['MAPPROXY_URL'] = settings.HYPERMAP_REGISTRY_URL
         defaults['SOLR_URL'] = settings.SOLR_URL
         defaults['USE_GAZETTEER'] = settings.USE_GAZETTEER
-        # 'GOOGLE_API_KEY': settings.GOOGLE_API_KEY,
-        # 'GOOGLE_MAPS_API_KEY': settings.GOOGLE_MAPS_API_KEY
+        defaults['GOOGLE_API_KEY'] = settings.GOOGLE_API_KEY,
+        defaults['GOOGLE_MAPS_API_KEY'] = settings.GOOGLE_MAPS_API_KEY
     return defaults
diff --git a/...ntrib/worldmap/src/geonode-client/app/static/externals/gxp/src/script/plugins/MapShare.js b/...ntrib/worldmap/src/geonode-client/app/static/externals/gxp/src/script/plugins/MapShare.js
@@ -47,15 +47,16 @@ gxp.plugins.MapShare = Ext.extend(gxp.plugins.Tool, {
     toolTip: "Map info and download links",
 
     linkPrefix: "/maps/",
-    
+
     linkSuffix: "/view",
 
     iconCls: "gxp-icon-link",
-    
+
     /** api: method[addActions]
      */
     addActions: function() {
-    	var link = this.linkPrefix + this.target.mapID + this.linkSuffix;
+      // var link = this.linkPrefix + this.target.mapID + this.linkSuffix;
+      var link = this.linkPrefix + this.target.mapID;
         var actions = gxp.plugins.MapShare.superclass.addActions.call(this, [{
             iconCls: this.iconCls,
             text: this.text,

diff --git a/geonode/contrib/worldmap/wm_extra/static/worldmap/worldmap_client/script/gxp.js b/geonode/contrib/worldmap/wm_extra/static/worldmap/worldmap_client/script/gxp.js
diff --git a/geonode/contrib/worldmap/wm_extra/templates/wm_extra/maps/worldmap.html b/geonode/contrib/worldmap/wm_extra/templates/wm_extra/maps/worldmap.html
@@ -76,23 +76,17 @@
                         toggleGroup: 'featureGroup',
                         actionTarget:  {target: "paneltbar", index: 6}
                     },
-                    {
-                        ptype: "gxp_googleearth",
-                        text: '<span class="x-btn-text">{% trans 'Google Earth' %}</span>',
-                        iconCls: null,
-                        actionTarget: {target: "paneltbar", index: 7}
-                    },
                     {
                     	ptype: "gxp_streetviewtool",
-                    	actionTarget:   {target: "paneltbar", index: 8},
+                    	actionTarget:   {target: "paneltbar", index: 7},
                         toggleGroup: 'featureGroup'
                     },
                     {
                     	  ptype: "gxp_measure",
                         toggleGroup: 'featureGroup',
                         text: '<span class="x-btn-text">{% trans 'Measure' %}</span>',
                         iconCls: null,
-                    	  actionTarget:   {target: "paneltbar", index: 9}
+                    	  actionTarget:   {target: "paneltbar", index: 8}
                     },
                     {
                     	ptype: 'gxp_mapshare',