Set OpenLayers lang unobtrusively

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

diff --git a/app/views/changeset/_map.html.erb b/app/views/changeset/_map.html.erb
index f052eadbe74828d5c410e9b1f1eb2f57ea2aec4f..3357057b17e0b91c033b05ef65f5b0781de1de7f 100644 (file)
--- a/app/views/changeset/_map.html.erb
+++ b/app/views/changeset/_map.html.erb
@@ -5,8 +5,6 @@
 </div>
 
 <script type="text/javascript">
-  OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
-
   var highlight;
 
   function highlightChangeset(id) {
@@ -37,12 +35,12 @@
     $("#tr-changeset-" + id).removeClass("selected");
   }
 
-  function init() {
+  $(document).ready(function () {
     var map = createMap("changeset_list_map", {
       controls: [
         new OpenLayers.Control.Navigation(),
-        new OpenLayers.Control.PanZoom(),
-        new OpenLayers.Control.PanZoomBar()
+        new OpenLayers.Control.Zoom(),
+        new OpenLayers.Control.SimplePanZoom()
       ]
     });
 
@@ -80,11 +78,9 @@
     selectControl.activate();
 
     <% if ! @bbox.nil? %>
-      map.setExtent(proj(new OpenLayers.Bounds(<%= @bbox %>)));
+      map.zoomToExtent(proj(new OpenLayers.Bounds(<%= @bbox %>)));
     <% else %>
-      map.setExtent(proj(bounds));
+      map.zoomToExtent(proj(bounds));
     <% end %>
-  }
-
-  Event.observe(window, "load", init);
+  });
 </script>