Presentation work

[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..6c84bef55f414c95952972133c13e7faaecffdb9 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);
@@ -169,7 +165,7 @@ L.OSM.Map = L.Map.extend({
     return str;
   },
 
-  addObject: function(object) {
+  addObject: function(object, callback) {
     var objectStyle = {
       color: "#FF6200",
       weight: 4,
@@ -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,14 +215,7 @@ L.OSM.Map = L.Map.extend({
         map._objectLayer.addData(xml);
         map._objectLayer.addTo(map);
 
-        if (!window.location.hash) {
-          var bounds = map._objectLayer.getBounds();
-          if (bounds.isValid()) {
-            OSM.route.moveListenerOff();
-            map.once('moveend', OSM.route.moveListenerOn);
-            map.fitBounds(bounds);
-          }
-        }
+        if (callback) callback(map._objectLayer.getBounds());
       }
     });
   },
@@ -242,6 +232,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);
   }
 });