Avoid a JS error on (e.g.) ?way=nnnnn

When showing an object, the map location is not set
until the vector layer has finished loading. Thus
map.getCenter() returns null.

Registering the events earlier avoids the need to call
updateLocation manually at all.

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 0ceb015a74380a8199fbf4c6c24befab8139dc6c..9a05ae1ddf0accf67dbd83e1272336ad7cbf1383 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");
 
   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);
   if (!params.object_zoom) {
     if (params.bbox) {
       var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);


@@ -39,10 +42,6 @@ $(document).ready(function () {
     $(window).load(function() { addObjectToMap(url, params.object_zoom) });
   }
 
     $(window).load(function() { addObjectToMap(url, params.object_zoom) });
   }
 

-  map.events.register("moveend", map, updateLocation);
-  map.events.register("changelayer", map, updateLocation);
-
-  updateLocation();

   handleResize();
 
   $("#show_data").click(function (e) {
   handleResize();
 
   $("#show_data").click(function (e) {