The value of mapParams.object is always a node/way/relation now

[rails.git] / app / assets / javascripts / leaflet.map.js.erb

diff --git a/app/assets/javascripts/leaflet.map.js.erb b/app/assets/javascripts/leaflet.map.js.erb
index 69fd1f3e3da6531540a926d11d7f1579faddde60..af7ce202da4ec23f2bee1f018d9c0efc93b39139 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js.erb
+++ b/app/assets/javascripts/leaflet.map.js.erb
@@ -178,10 +178,11 @@ L.OSM.Map = L.Map.extend({
     };
 
     var changesetStyle = {
-      weight: 1,
+      weight: 4,
       color: '#FF9500',
       opacity: 1,
-      fillOpacity: 0
+      fillOpacity: 0,
+      clickable: false
     };
 
     this._object = object;
@@ -221,8 +222,8 @@ L.OSM.Map = L.Map.extend({
         if (!window.location.hash) {
           var bounds = map._objectLayer.getBounds();
           if (bounds.isValid()) {
-            OSM.route.moveListenerOff();
-            map.once('moveend', OSM.route.moveListenerOn);
+            OSM.router.moveListenerOff();
+            map.once('moveend', OSM.router.moveListenerOn);
             map.fitBounds(bounds);
           }
         }
@@ -242,6 +243,11 @@ L.OSM.Map = L.Map.extend({
       zoom: this.getZoom(),
       layers: this.getLayersCode()
     }
+  },
+
+  setState: function(state, options) {
+    if (state.center) this.setView(state.center, state.zoom, options);
+    this.updateLayers(state.layers);
   }
 });