Refactor calculation of zoom level based on a scale

[rails.git] / app / views / user / _map.html.erb

diff --git a/app/views/user/_map.html.erb b/app/views/user/_map.html.erb
index 71f3ad9e5b4e08cf9bb811f9691f12c0dd88c935..2d886527ccf437c2c2b0e5285af2776b9ef82a1f 100644 (file)
--- a/app/views/user/_map.html.erb
+++ b/app/views/user/_map.html.erb
@@ -24,11 +24,11 @@ end
 
   function init(){
     var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);
+    <% if params[:scale].to_f > 0 then -%>
+    var zoom = <%= scale_to_zoom params[:scale] %>;
+    <% else -%>
     var zoom = <%= zoom %>;
-
-    <% if params[:scale] and params[:scale].length > 0 and params[:scale].to_f > 0 then %>
-    zoom = <%= Math.log(360.0 / (params[:scale].to_f * 512.0)) / Math.log(2.0) %>;
-    <% end %>
+    <% end -%>
 
     var map = createMap("map");