Include selected layer in short links

[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 f65325e37b94cffbd580afa25e1f647409918975..7ae330d9bfcd50b7b1c0819fd15f6256222ef753 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js.erb
+++ b/app/assets/javascripts/leaflet.map.js.erb
@@ -36,7 +36,7 @@ L.OSM.Map = L.Map.extend({
         name: I18n.t("javascripts.map.base.transport_map")
       }),
       new L.OSM.MapQuestOpen({
         name: I18n.t("javascripts.map.base.transport_map")
       }),
       new L.OSM.MapQuestOpen({

-        attribution: copyright + ". Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='http://developer.mapquest.com/content/osm/mq_logo.png'>",
+        attribution: copyright + ". Tiles courtesy of <a href='http://www.mapquest.com/' target='_blank'>MapQuest</a> <img src='https://developer.mapquest.com/content/osm/mq_logo.png'>",

         code: "Q",
         keyid: "mapquest",
         name: I18n.t("javascripts.map.base.mapquest")
         code: "Q",
         keyid: "mapquest",
         name: I18n.t("javascripts.map.base.mapquest")


@@ -100,10 +100,6 @@ L.OSM.Map = L.Map.extend({
       params.mlon = latLng.lng.toFixed(precision);
     }
 
       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);
     var url = 'http://' + OSM.SERVER_URL + '/',
       query = querystring.stringify(params),
       hash = OSM.formatHash(this);


@@ -152,6 +148,11 @@ L.OSM.Map = L.Map.extend({
     }
 
     var params = {};
     }
 
     var params = {};

+    var layers = this.getLayersCode().replace('M', '');
+
+    if (layers) {
+      params.layers = layers;
+    }

 
     if (marker && this.hasLayer(marker)) {
       params.m = '';
 
     if (marker && this.hasLayer(marker)) {
       params.m = '';


@@ -169,7 +170,7 @@ L.OSM.Map = L.Map.extend({
     return str;
   },
 
     return str;
   },
 

-  addObject: function(object) {
+  addObject: function(object, callback) {

     var objectStyle = {
       color: "#FF6200",
       weight: 4,
     var objectStyle = {
       color: "#FF6200",
       weight: 4,


@@ -219,14 +220,7 @@ L.OSM.Map = L.Map.extend({
         map._objectLayer.addData(xml);
         map._objectLayer.addTo(map);
 
         map._objectLayer.addData(xml);
         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);
-          }
-        }
+        if (callback) callback(map._objectLayer.getBounds());

       }
     });
   },
       }
     });
   },


@@ -243,6 +237,11 @@ L.OSM.Map = L.Map.extend({
       zoom: this.getZoom(),
       layers: this.getLayersCode()
     }
       zoom: this.getZoom(),
       layers: this.getLayersCode()
     }

+  },
+
+  setState: function(state, options) {
+    if (state.center) this.setView(state.center, state.zoom, options);
+    this.updateLayers(state.layers);

   }
 });
 
   }
 });