X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d3700e6201b4b78a70bbb2941572edc985b63c2c..8030e7b5d6a019618da5874646fc30ee2e15e14b:/app/assets/javascripts/leaflet.map.js

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index ba88e5904..c8377226a 100644
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -13,8 +13,8 @@ L.OSM.Map = L.Map.extend({
   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"});
 
     this.baseLayers = [];
 
@@ -44,23 +44,29 @@ 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>",
       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",
       code: "G",
       name: I18n.t("javascripts.map.base.gps")
     });
+
+    this.on("layeradd", function (event) {
+      if (this.baseLayers.indexOf(event.layer) >= 0) {
+        this.setMaxZoom(event.layer.options.maxZoom);
+      }
+    });
   },
 
   updateLayers: function(layerParam) {
@@ -80,21 +86,21 @@ 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 baseLayer;
+    this.eachLayer(function (layer) {
+      if (layer.options && layer.options.keyid) baseLayer = layer;
+    });
+    return baseLayer.keyid;
   },
 
   getUrl: function(marker) {
@@ -107,11 +113,11 @@ 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;
@@ -121,8 +127,8 @@ L.OSM.Map = L.Map.extend({
     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)),
@@ -130,9 +136,10 @@ 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) {
+    for (i = 0; i < Math.ceil((zoom + 8) / 3.0) && i < 5; ++i) {
       digit = (c1 >> (24 - 6 * i)) & 0x3f;
       str += char_array.charAt(digit);
     }
@@ -156,14 +163,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) {
@@ -172,7 +179,7 @@ L.OSM.Map = L.Map.extend({
 
     var query = querystring.stringify(params);
     if (query) {
-      str += '?' + query;
+      str += "?" + query;
     }
 
     return str;
@@ -193,7 +200,7 @@ 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) {
@@ -206,7 +213,7 @@ L.OSM.Map = L.Map.extend({
 
     var changesetStyle = {
       weight: 4,
-      color: '#FF9500',
+      color: "#FF9500",
       opacity: 1,
       fillOpacity: 0,
       interactive: false