Merge pull request #33 from tomhughes/routing

[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 af7ce202da4ec23f2bee1f018d9c0efc93b39139..14cddafce7ca6001026981991d8df91df8702e1e 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js.erb
+++ b/app/assets/javascripts/leaflet.map.js.erb
@@ -24,19 +24,19 @@ L.OSM.Map = L.Map.extend({
         name: I18n.t("javascripts.map.base.standard")
       }),
       new L.OSM.CycleMap({
         name: I18n.t("javascripts.map.base.standard")
       }),
       new L.OSM.CycleMap({

-        attribution: copyright + ". Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+        attribution: copyright + ". Tiles courtesy of <a href='http://www.thunderforest.com/' target='_blank'>Andy Allan</a>",

         code: "C",
         keyid: "cyclemap",
         name: I18n.t("javascripts.map.base.cycle_map")
       }),
       new L.OSM.TransportMap({
         code: "C",
         keyid: "cyclemap",
         name: I18n.t("javascripts.map.base.cycle_map")
       }),
       new L.OSM.TransportMap({

-        attribution: copyright + ". Tiles courtesy of <a href='http://www.opencyclemap.org/' target='_blank'>Andy Allan</a>",
+        attribution: copyright + ". Tiles courtesy of <a href='http://www.thunderforest.com/' target='_blank'>Andy Allan</a>",

         code: "T",
         keyid: "transportmap",
         name: I18n.t("javascripts.map.base.transport_map")
       }),
       new L.OSM.MapQuestOpen({
         code: "T",
         keyid: "transportmap",
         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")


@@ -91,7 +91,7 @@ L.OSM.Map = L.Map.extend({
   },
 
   getUrl: function(marker) {
   },
 
   getUrl: function(marker) {

-    var precision = zoomPrecision(this.getZoom()),
+    var precision = OSM.zoomPrecision(this.getZoom()),

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


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

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


@@ -247,7 +241,20 @@ L.OSM.Map = L.Map.extend({
 
   setState: function(state, options) {
     if (state.center) this.setView(state.center, state.zoom, options);
 
   setState: function(state, options) {
     if (state.center) this.setView(state.center, state.zoom, options);

-    this.updateLayers(state.layers);
+    if (state.layers) this.updateLayers(state.layers);
+  },
+
+  setSidebarOverlaid: function(overlaid) {
+    if (overlaid && !$("#content").hasClass("overlay-sidebar")) {
+      $("#content").addClass("overlay-sidebar");
+      this.invalidateSize({pan: false})
+        .panBy([-350, 0], {animate: false});
+    } else if (!overlaid && $("#content").hasClass("overlay-sidebar")) {
+      this.panBy([350, 0], {animate: false});
+      $("#content").removeClass("overlay-sidebar");
+      this.invalidateSize({pan: false});
+    }
+    return this;

   }
 });
 
   }
 });
 


@@ -256,8 +263,7 @@ L.Icon.Default.imagePath = "/images";
 L.Icon.Default.imageUrls = {
   "/images/marker-icon.png": "<%= asset_path("images/marker-icon.png") %>",
   "/images/marker-icon-2x.png": "<%= asset_path("images/marker-icon-2x.png") %>",
 L.Icon.Default.imageUrls = {
   "/images/marker-icon.png": "<%= asset_path("images/marker-icon.png") %>",
   "/images/marker-icon-2x.png": "<%= asset_path("images/marker-icon-2x.png") %>",

-  "/images/marker-shadow.png": "<%= asset_path("images/marker-shadow.png") %>",
-  "/images/marker-shadow-2x.png": "<%= asset_path("images/marker-shadow-2x.png") %>"
+  "/images/marker-shadow.png": "<%= asset_path("images/marker-shadow.png") %>"

 };
 
 L.extend(L.Icon.Default.prototype, {
 };
 
 L.extend(L.Icon.Default.prototype, {