X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=753fed26906e7386a2e91df9ff92050ef48bb12a;hb=f19bceaa080ab47bae751cd0597a9fb32d1b6b4f;hp=3822321007c5ee3d9f662d5fc340d71e5275b546;hpb=78f61768d16b75e86ad003f011a16c25f777db76;p=myslice.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 38223210..753fed26 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -156,6 +156,7 @@ class SliceView (LoginRequiredAutoLogoutView):
             togglable  = False,
             query      = sq_resource,
             query_all  = query_resource_all,
+            googlemap_api_key = Config().googlemap_api_key(),
             checkboxes = True,
             # center on Paris
             latitude   = 49.,
@@ -163,16 +164,13 @@ class SliceView (LoginRequiredAutoLogoutView):
             zoom       = 4,
         )
 
-# because (senslab)map.css changes stuff for *all* canvas elements
-# it destroys the googlemap behaviour
-# turning this off for now until Anthony can fix that
-#        resources_as_3dmap = SensLabMap(
-#            page       = page,
-#            title      = '3D Map',
-#            domid      = 'senslabmap',
-#            query      = sq_resource,
-#            query_all  = query_resource_all,
-#        )
+        resources_as_3dmap = SensLabMap(
+            page       = page,
+            title      = '3D Map',
+            domid      = 'senslabmap',
+            query      = sq_resource,
+            query_all  = query_resource_all,
+        )
 
         resources_as_list = QueryTable( 
             page       = page,
@@ -198,10 +196,10 @@ class SliceView (LoginRequiredAutoLogoutView):
                                 title="Resources",
                                 outline_complete=True,
                                 sons=[ resources_as_gmap, 
-# see above
-#                                       resources_as_3dmap,
+                                       resources_as_3dmap,
                                        resources_as_list_area, ],
                                 active_domid = 'resources-map',
+                                persistent_active=True,
                                 )
         main_stack.insert (resources_area)