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 ed89e1fa572106acbd4c414349040cbb915dbf45..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")


@@ -148,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 = '';


@@ -165,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,


@@ -215,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());

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