Ensure object parameter is removed from edit link when closing sidebar

[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 f598a48393c9d0d8be108602a1b7c7bd814deb1a..ed89e1fa572106acbd4c414349040cbb915dbf45 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js.erb
+++ b/app/assets/javascripts/leaflet.map.js.erb
@@ -100,10 +100,6 @@ L.OSM.Map = L.Map.extend({
       params.mlon = latLng.lng.toFixed(precision);
     }
 
-    if (this._object) {
-      params[this._object.type] = this._object.id;
-    }
-
     var url = 'http://' + OSM.SERVER_URL + '/',
       query = querystring.stringify(params),
       hash = OSM.formatHash(this);
@@ -178,10 +174,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;
@@ -218,9 +215,13 @@ L.OSM.Map = L.Map.extend({
         map._objectLayer.addData(xml);
         map._objectLayer.addTo(map);
 
-        var bounds = map._objectLayer.getBounds();
-        if (bounds.isValid()) {
-          map.fitBounds(bounds);
+        if (!window.location.hash) {
+          var bounds = map._objectLayer.getBounds();
+          if (bounds.isValid()) {
+            OSM.router.moveListenerOff();
+            map.once('moveend', OSM.router.moveListenerOn);
+            map.fitBounds(bounds);
+          }
         }
       }
     });
@@ -230,6 +231,19 @@ L.OSM.Map = L.Map.extend({
     this._object = null;
     if (this._objectLoader) this._objectLoader.abort();
     if (this._objectLayer) this.removeLayer(this._objectLayer);
+  },
+
+  getState: function() {
+    return {
+      center: this.getCenter().wrap(),
+      zoom: this.getZoom(),
+      layers: this.getLayersCode()
+    }
+  },
+
+  setState: function(state, options) {
+    if (state.center) this.setView(state.center, state.zoom, options);
+    this.updateLayers(state.layers);
   }
 });