X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/083500f056f5b995f1979f88b37793046d9e4d37..5b4636d5213de2e699769821031c37663ab71557:/app/assets/javascripts/leaflet.map.js?ds=sidebyside

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index e712a8d1f..fe8d74af5 100644
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -10,16 +10,17 @@ L.extend(L.LatLngBounds.prototype, {
 });
 
 L.OSM.Map = L.Map.extend({
-  initialize: function(id, options) {
+  initialize: function (id, options) {
     L.Map.prototype.initialize.call(this, id, options);
 
-    var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'});
-    var donate = I18n.t('javascripts.map.donate_link_text', {donate_url: 'https://donate.openstreetmap.org'});
+    var copyright = I18n.t("javascripts.map.copyright", { copyright_url: "/copyright" });
+    var donate = I18n.t("javascripts.map.donate_link_text", { donate_url: "https://donate.openstreetmap.org" });
+    var terms = I18n.t("javascripts.map.terms", { terms_url: "https://wiki.osmfoundation.org/wiki/Terms_of_Use" });
 
     this.baseLayers = [];
 
     this.baseLayers.push(new L.OSM.Mapnik({
-      attribution: copyright + " ♥ " + donate,
+      attribution: copyright + " ♥ " + donate + ". " + terms,
       code: "M",
       keyid: "mapnik",
       name: I18n.t("javascripts.map.base.standard")
@@ -27,7 +28,7 @@ L.OSM.Map = L.Map.extend({
 
     if (OSM.THUNDERFOREST_KEY) {
       this.baseLayers.push(new L.OSM.CycleMap({
-        attribution: copyright + ". Tiles courtesy of <a href='https://www.thunderforest.com/' target='_blank'>Andy Allan</a>",
+        attribution: copyright + ". Tiles courtesy of <a href='https://www.thunderforest.com/' target='_blank'>Andy Allan</a>. " + terms,
         apikey: OSM.THUNDERFOREST_KEY,
         code: "C",
         keyid: "cyclemap",
@@ -35,7 +36,7 @@ L.OSM.Map = L.Map.extend({
       }));
 
       this.baseLayers.push(new L.OSM.TransportMap({
-        attribution: copyright + ". Tiles courtesy of <a href='https://www.thunderforest.com/' target='_blank'>Andy Allan</a>",
+        attribution: copyright + ". Tiles courtesy of <a href='https://www.thunderforest.com/' target='_blank'>Andy Allan</a>. " + terms,
         apikey: OSM.THUNDERFOREST_KEY,
         code: "T",
         keyid: "transportmap",
@@ -44,17 +45,17 @@ L.OSM.Map = L.Map.extend({
     }
 
     this.baseLayers.push(new L.OSM.HOT({
-      attribution: copyright + ". Tiles style by <a href='https://www.hotosm.org/' target='_blank'>Humanitarian OpenStreetMap Team</a>" + " hosted by <a href='https://openstreetmap.fr/' target='_blank'>OpenStreetMap France</a>",
+      attribution: copyright + ". Tiles style by <a href='https://www.hotosm.org/' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='https://openstreetmap.fr/' target='_blank'>OpenStreetMap France</a>. " + terms,
       code: "H",
       keyid: "hot",
       name: I18n.t("javascripts.map.base.hot")
     }));
 
     this.noteLayer = new L.FeatureGroup();
-    this.noteLayer.options = {code: 'N'};
+    this.noteLayer.options = { code: "N" };
 
     this.dataLayer = new L.OSM.DataLayer(null);
-    this.dataLayer.options.code = 'D';
+    this.dataLayer.options.code = "D";
 
     this.gpsLayer = new L.OSM.GPS({
       pane: "overlayPane",
@@ -69,7 +70,7 @@ L.OSM.Map = L.Map.extend({
     });
   },
 
-  updateLayers: function(layerParam) {
+  updateLayers: function (layerParam) {
     layerParam = layerParam || "M";
     var layersAdded = "";
 
@@ -86,24 +87,24 @@ L.OSM.Map = L.Map.extend({
   },
 
   getLayersCode: function () {
-    var layerConfig = '';
-    for (var i in this._layers) { // TODO: map.eachLayer
-      var layer = this._layers[i];
+    var layerConfig = "";
+    this.eachLayer(function (layer) {
       if (layer.options && layer.options.code) {
         layerConfig += layer.options.code;
       }
-    }
+    });
     return layerConfig;
   },
 
   getMapBaseLayerId: function () {
-    for (var i in this._layers) { // TODO: map.eachLayer
-      var layer = this._layers[i];
-      if (layer.options && layer.options.keyid) return layer.options.keyid;
-    }
+    var baseLayerId;
+    this.eachLayer(function (layer) {
+      if (layer.options && layer.options.keyid) baseLayerId = layer.options.keyid;
+    });
+    return baseLayerId;
   },
 
-  getUrl: function(marker) {
+  getUrl: function (marker) {
     var precision = OSM.zoomPrecision(this.getZoom()),
         params = {};
 
@@ -113,22 +114,22 @@ L.OSM.Map = L.Map.extend({
       params.mlon = latLng.lng.toFixed(precision);
     }
 
-    var url = window.location.protocol + '//' + OSM.SERVER_URL + '/',
+    var url = window.location.protocol + "//" + OSM.SERVER_URL + "/",
       query = querystring.stringify(params),
       hash = OSM.formatHash(this);
 
-    if (query) url += '?' + query;
+    if (query) url += "?" + query;
     if (hash) url += hash;
 
     return url;
   },
 
-  getShortUrl: function(marker) {
+  getShortUrl: function (marker) {
     var zoom = this.getZoom(),
       latLng = marker && this.hasLayer(marker) ? marker.getLatLng().wrap() : this.getCenter().wrap(),
       str = window.location.hostname.match(/^www\.openstreetmap\.org/i) ?
-        window.location.protocol + '//osm.org/go/' :
-        window.location.protocol + '//' + window.location.hostname + '/go/',
+        window.location.protocol + "//osm.org/go/" :
+        window.location.protocol + "//" + window.location.hostname + "/go/",
       char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_~",
       x = Math.round((latLng.lng + 180.0) * ((1 << 30) / 90.0)),
       y = Math.round((latLng.lat + 90.0) * ((1 << 30) / 45.0)),
@@ -136,14 +137,15 @@ L.OSM.Map = L.Map.extend({
       // done in two parts. each of the parts c1/c2 has 30 bits of the total in it
       // and drops the last 4 bits of the full 64 bit Morton code.
       c1 = interlace(x >>> 17, y >>> 17), c2 = interlace((x >>> 2) & 0x7fff, (y >>> 2) & 0x7fff),
-      digit;
+      digit,
+      i;
 
-    for (var i = 0; i < Math.ceil((zoom + 8) / 3.0) && i < 5; ++i) {
-      digit = (c1 >> (24 - 6 * i)) & 0x3f;
+    for (i = 0; i < Math.ceil((zoom + 8) / 3.0) && i < 5; ++i) {
+      digit = (c1 >> (24 - (6 * i))) & 0x3f;
       str += char_array.charAt(digit);
     }
     for (i = 5; i < Math.ceil((zoom + 8) / 3.0); ++i) {
-      digit = (c2 >> (24 - 6 * (i - 5))) & 0x3f;
+      digit = (c2 >> (24 - (6 * (i - 5)))) & 0x3f;
       str += char_array.charAt(digit);
     }
     for (i = 0; i < ((zoom + 8) % 3); ++i) str += "-";
@@ -162,14 +164,14 @@ L.OSM.Map = L.Map.extend({
     }
 
     var params = {};
-    var layers = this.getLayersCode().replace('M', '');
+    var layers = this.getLayersCode().replace("M", "");
 
     if (layers) {
       params.layers = layers;
     }
 
     if (marker && this.hasLayer(marker)) {
-      params.m = '';
+      params.m = "";
     }
 
     if (this._object) {
@@ -178,13 +180,13 @@ L.OSM.Map = L.Map.extend({
 
     var query = querystring.stringify(params);
     if (query) {
-      str += '?' + query;
+      str += "?" + query;
     }
 
     return str;
   },
 
-  getGeoUri: function(marker) {
+  getGeoUri: function (marker) {
     var precision = OSM.zoomPrecision(this.getZoom()),
         latLng,
         params = {};
@@ -199,10 +201,10 @@ L.OSM.Map = L.Map.extend({
     params.lon = latLng.lng.toFixed(precision);
     params.zoom = this.getZoom();
 
-    return 'geo:' + params.lat + ',' + params.lon + '?z=' + params.zoom;
+    return "geo:" + params.lat + "," + params.lon + "?z=" + params.zoom;
   },
 
-  addObject: function(object, callback) {
+  addObject: function (object, callback) {
     var objectStyle = {
       color: "#FF6200",
       weight: 4,
@@ -212,7 +214,7 @@ L.OSM.Map = L.Map.extend({
 
     var changesetStyle = {
       weight: 4,
-      color: '#FF9500',
+      color: "#FF9500",
       opacity: 1,
       fillOpacity: 0,
       interactive: false
@@ -240,9 +242,9 @@ L.OSM.Map = L.Map.extend({
           if (object.type === "node") {
             return true;
           } else if (object.type === "relation") {
-            for (var i = 0; i < relations.length; i++)
-              if (relations[i].members.indexOf(node) !== -1)
-                return true;
+            for (var i = 0; i < relations.length; i++) {
+              if (relations[i].members.indexOf(node) !== -1) return true;
+            }
           } else {
             return false;
           }
@@ -256,13 +258,13 @@ L.OSM.Map = L.Map.extend({
     });
   },
 
-  removeObject: function() {
+  removeObject: function () {
     this._object = null;
     if (this._objectLoader) this._objectLoader.abort();
     if (this._objectLayer) this.removeLayer(this._objectLayer);
   },
 
-  getState: function() {
+  getState: function () {
     return {
       center: this.getCenter().wrap(),
       zoom: this.getZoom(),
@@ -270,20 +272,20 @@ L.OSM.Map = L.Map.extend({
     };
   },
 
-  setState: function(state, options) {
+  setState: function (state, options) {
     if (state.center) this.setView(state.center, state.zoom, options);
     if (state.layers) this.updateLayers(state.layers);
   },
 
-  setSidebarOverlaid: function(overlaid) {
+  setSidebarOverlaid: function (overlaid) {
     if (overlaid && !$("#content").hasClass("overlay-sidebar")) {
       $("#content").addClass("overlay-sidebar");
-      this.invalidateSize({pan: false})
-        .panBy([-350, 0], {animate: false});
+      this.invalidateSize({ pan: false })
+        .panBy([-350, 0], { animate: false });
     } else if (!overlaid && $("#content").hasClass("overlay-sidebar")) {
-      this.panBy([350, 0], {animate: false});
+      this.panBy([350, 0], { animate: false });
       $("#content").removeClass("overlay-sidebar");
-      this.invalidateSize({pan: false});
+      this.invalidateSize({ pan: false });
     }
     return this;
   }
@@ -300,7 +302,7 @@ L.Icon.Default.imageUrls = {
 L.extend(L.Icon.Default.prototype, {
   _oldGetIconUrl: L.Icon.Default.prototype._getIconUrl,
 
-  _getIconUrl:  function (name) {
+  _getIconUrl: function (name) {
     var url = this._oldGetIconUrl(name);
     return L.Icon.Default.imageUrls[url];
   }