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 8a0d537b5125d644160ea1b2bc32e84dbb30cfc8..ed89e1fa572106acbd4c414349040cbb915dbf45 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js.erb
+++ b/app/assets/javascripts/leaflet.map.js.erb
@@ -49,15 +49,15 @@ L.OSM.Map = L.Map.extend({
       })
     ];
 
-    this.noteLayer = new L.LayerGroup();
+    this.noteLayer = new L.FeatureGroup();
     this.noteLayer.options = {code: 'N'};
 
     this.dataLayer = new L.OSM.DataLayer(null);
     this.dataLayer.options.code = 'D';
   },
 
-  updateLayers: function(params) {
-    var layerParam = params.layers || "M";
+  updateLayers: function(layerParam) {
+    layerParam = layerParam || "M";
     var layersAdded = "";
 
     for (var i = this.baseLayers.length - 1; i >= 0; i--) {
@@ -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);
@@ -169,7 +165,22 @@ L.OSM.Map = L.Map.extend({
     return str;
   },
 
-  addObject: function(object, options) {
+  addObject: function(object) {
+    var objectStyle = {
+      color: "#FF6200",
+      weight: 4,
+      opacity: 1,
+      fillOpacity: 0.5
+    };
+
+    var changesetStyle = {
+      weight: 4,
+      color: '#FF9500',
+      opacity: 1,
+      fillOpacity: 0,
+      clickable: false
+    };
+
     this._object = object;
 
     if (this._objectLoader) this._objectLoader.abort();
@@ -182,15 +193,10 @@ L.OSM.Map = L.Map.extend({
       success: function (xml) {
         map._objectLayer = new L.OSM.DataLayer(null, {
           styles: {
-            node: options.style,
-            way: options.style,
-            area: options.style,
-            changeset: {
-              weight: 1,
-              color: '#FF9500',
-              opacity: 1,
-              fillOpacity: 0
-            }
+            node: objectStyle,
+            way: objectStyle,
+            area: objectStyle,
+            changeset: changesetStyle
           }
         });
 
@@ -207,13 +213,16 @@ L.OSM.Map = L.Map.extend({
         };
 
         map._objectLayer.addData(xml);
-
-        var bounds = map._objectLayer.getBounds();
-
-        if (options.zoom && bounds.isValid()) map.fitBounds(bounds);
-        if (options.callback) options.callback(bounds);
-
         map._objectLayer.addTo(map);
+
+        if (!window.location.hash) {
+          var bounds = map._objectLayer.getBounds();
+          if (bounds.isValid()) {
+            OSM.router.moveListenerOff();
+            map.once('moveend', OSM.router.moveListenerOn);
+            map.fitBounds(bounds);
+          }
+        }
       }
     });
   },
@@ -222,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);
   }
 });
 
@@ -243,9 +265,6 @@ L.extend(L.Icon.Default.prototype, {
   }
 });
 
-L.Hash.prototype.parseHash = OSM.parseHash;
-L.Hash.prototype.formatHash = OSM.formatHash;
-
 function getUserIcon(url) {
   return L.icon({
     iconUrl: url || <%= asset_path('marker-red.png').to_json %>,