Merge globals.js.erb and params.js

[rails.git] / app / assets / javascripts / index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 0ceb015a74380a8199fbf4c6c24befab8139dc6c..2216a0352c0ea163d42b26377090654217483b06 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -7,6 +7,9 @@ $(document).ready(function () {
   var params = OSM.mapParams();
   var map = createMap("map");
 
+  map.events.register("moveend", map, updateLocation);
+  map.events.register("changelayer", map, updateLocation);
+
   if (!params.object_zoom) {
     if (params.bbox) {
       var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
@@ -14,7 +17,7 @@ $(document).ready(function () {
       map.zoomToExtent(proj(bbox));
 
       if (params.box) {
-        $(window).load(function() { addBoxToMap(bbox) });
+        addBoxToMap(bbox);
       }
     } else {
       setMapCenter(new OpenLayers.LonLat(params.lon, params.lat), params.zoom);
@@ -36,13 +39,9 @@ $(document).ready(function () {
       url += "/full";
     }
 
-    $(window).load(function() { addObjectToMap(url, params.object_zoom) });
+    addObjectToMap(url, params.object_zoom);
   }
 
-  map.events.register("moveend", map, updateLocation);
-  map.events.register("changelayer", map, updateLocation);
-
-  updateLocation();
   handleResize();
 
   $("#show_data").click(function (e) {