Update iD container to support iD 1.7.0

[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..b4767f96be506062172ae763d00a45e3eabd8075 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({
-        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({
-        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({
-        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")
@@ -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--) {
@@ -91,7 +91,7 @@ L.OSM.Map = L.Map.extend({
   },
 
   getUrl: function(marker) {
-    var precision = zoomPrecision(this.getZoom()),
+    var precision = OSM.zoomPrecision(this.getZoom()),
         params = {};
 
     if (marker && this.hasLayer(marker)) {
@@ -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);
@@ -152,6 +148,11 @@ L.OSM.Map = L.Map.extend({
     }
 
     var params = {};
+    var layers = this.getLayersCode().replace('M', '');
+
+    if (layers) {
+      params.layers = layers;
+    }
 
     if (marker && this.hasLayer(marker)) {
       params.m = '';
@@ -169,7 +170,22 @@ L.OSM.Map = L.Map.extend({
     return str;
   },
 
-  addObject: function(object, options) {
+  addObject: function(object, callback) {
+    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 +198,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 +218,9 @@ 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 (callback) callback(map._objectLayer.getBounds());
       }
     });
   },
@@ -222,6 +229,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);
+    if (state.layers) this.updateLayers(state.layers);
   }
 });
 
@@ -230,8 +250,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") %>",
-  "/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, {
@@ -243,9 +262,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 %>,