Correct zoom call when adding a marker

git-svn-id: http://www.peacefrogs.net/svn/chimere/trunk@25 9215b0d5-fb2c-4bbd-8d3e-bd2e9090e864

2 files changed, 7 insertions, 5 deletions

diff --git a/main/widgets.py b/main/widgets.py
index 53f365a..8e6bd19 100644
--- a/main/widgets.py
+++ b/main/widgets.py
@@ -96,7 +96,7 @@ init();"""
         if value:
             tpl += '''var mylonlat = new OpenLayers.LonLat(%f,%f);
 putMarker(mylonlat.transform(epsg_display_projection,
-                             map.getProjectionObject()).clone());
+                             map.getProjectionObject()).clone(), true);
 ''' % (value_x, value_y)
         tpl += """// --></script>
 <hr class='spacer'/>
diff --git a/static/edit_map.js b/static/edit_map.js
index 4799341..6daa319 100644
--- a/static/edit_map.js
+++ b/static/edit_map.js
@@ -33,12 +33,12 @@ var icon = new OpenLayers.Icon('http://www.openlayers.org/dev/img/marker.png', s
 var setMarker = function (event){
     event = event || window.event;
     var lonlat = layerMarkers.getLonLatFromViewPortPx(event.xy);
-    putMarker(lonlat);
+    putMarker(lonlat, false);
     OpenLayers.Event.stop(event);
 }
 
 /* put the marker on the map and update latitude and longitude fields */
-var putMarker = function (lonlat){
+var putMarker = function (lonlat, zoom){
     if (marker) {
         layerMarkers.removeMarker(marker);
     }
@@ -51,8 +51,10 @@ var putMarker = function (lonlat){
     document.getElementById('live_latitude').value = lonlat.lon;
     document.getElementById('live_longitude').value = lonlat.lat;
     /*zoom to the point*/
-    var bounds = layerMarkers.getDataExtent();
-    if (bounds) map.zoomToExtent(bounds);
+    if (zoom){
+        var bounds = layerMarkers.getDataExtent();
+        if (bounds) map.zoomToExtent(bounds);
+    }
     return;
 }