From: Shaun McDonald <shaun@shaunmcdonald.me.uk>
Date: Thu, 21 May 2009 23:20:46 +0000 (+0000)
Subject: Reverting earlier change that means that zoom isn't set in certain code paths.
X-Git-Tag: live~7399
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9985b9cb94e0a7fb68c6468cd83a963bbe20d869

Reverting earlier change that means that zoom isn't set in certain code paths.
---

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index d8f556d9f..372a70d3b 100644
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -36,10 +36,6 @@ elsif params['mlon'] and params['mlat']
 	zoom =  h(params['zoom'])
 	
 elsif params['gpx']
-        # The user may pass a gpx and zoom
-	if params['zoom']
-	   zoom = h(params['zoom'])
-	end
 	#use gpx id to locate (dealt with below)
 	
 elsif cookies.key?("_osm_location")
@@ -87,7 +83,6 @@ zoom='14' if zoom.nil?
     fo.addVariable('token','<%= session[:token] %>');
     if (lat) { fo.addVariable('lat',lat); }
     if (lon) { fo.addVariable('long',lon); }
-    if (zoom) { fo.addVariable('zoom',zoom); }
     <% if params['gpx']  %>fo.addVariable('gpx' ,'<%= h(params['gpx'] ) %>');<% end %>
     <% if params['way']  %>fo.addVariable('way' ,'<%= h(params['way'] ) %>');<% end %>
     <% if params['node'] %>fo.addVariable('node','<%= h(params['node']) %>');<% end %>