wind map switched to leaflet

rowers/templates/windedit.html

@@ -88,7 +88,6 @@
   
   {{ interactiveplot |safe }}
   
-  {{ gmap |safe }}
   
   <script>
     // Set things up to resize the plot on a window resize. You can play with
@@ -119,7 +118,9 @@
   
   <div id="interactiveplot" class="grid_6 omega">
     <div class="grid_6 alpha">
+
       {{ gmapdiv |safe }}
+      {{ gmap |safe }}
     </div>
   </div>
   

rowers/views.py

@@ -4852,11 +4852,10 @@ def workout_wind_view(request,id=0,message="",successmessage=""):
     div = res[1]
 
     if hascoordinates:
-	res = googlemap_chart(rowdata.df[' latitude'],
-			      rowdata.df[' longitude'],
-			      row.name)
-	gmscript = res[0]
-	gmdiv = res[1]
+        gmscript,gmdiv = leaflet_chart(
+            rowdata.df[' latitude'],
+	    rowdata.df[' longitude'],
+	    row.name)
     else:
 	gmscript = ""
 	gmdiv = "No GPS data available"