Remove unused reference to missing gps layer name

[rails.git] / app / assets / javascripts / leaflet.map.js

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 380955c363fcd2b06b75bb04180ef8218f221b7b..a907de29581c548d004038f6b61cb2520aaebf93 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -1,3 +1,5 @@
+//= require qs/dist/qs
+

 L.extend(L.LatLngBounds.prototype, {
   getSize: function () {
     return (this._northEast.lat - this._southWest.lat) *
 L.extend(L.LatLngBounds.prototype, {
   getSize: function () {
     return (this._northEast.lat - this._southWest.lat) *


@@ -10,24 +12,78 @@ L.extend(L.LatLngBounds.prototype, {
 });
 
 L.OSM.Map = L.Map.extend({
 });
 
 L.OSM.Map = L.Map.extend({

-  initialize: function(id, options) {
+  initialize: function (id, options) {

     L.Map.prototype.initialize.call(this, 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: 'http://donate.openstreetmap.org'});
+    var copyright_link = $("<a>", {
+      href: "/copyright",
+      text: I18n.t("javascripts.map.openstreetmap_contributors")
+    }).prop("outerHTML");
+    var copyright = I18n.t("javascripts.map.copyright_text", { copyright_link: copyright_link });
+
+    var donate = $("<a>", {
+      "href": "https://supporting.openstreetmap.org",
+      "class": "donate-attr",
+      "text": I18n.t("javascripts.map.make_a_donation")
+    }).prop("outerHTML");
+
+    var terms = $("<a>", {
+      href: "https://wiki.osmfoundation.org/wiki/Terms_of_Use",
+      text: I18n.t("javascripts.map.website_and_api_terms")
+    }).prop("outerHTML");
+
+    var cyclosm_link = $("<a>", {
+      href: "https://www.cyclosm.org",
+      target: "_blank",
+      text: I18n.t("javascripts.map.cyclosm_name")
+    }).prop("outerHTML");
+    var osm_france_link = $("<a>", {
+      href: "https://openstreetmap.fr/",
+      target: "_blank",
+      text: I18n.t("javascripts.map.osm_france")
+    }).prop("outerHTML");
+    var cyclosm = I18n.t("javascripts.map.cyclosm_credit", { cyclosm_link: cyclosm_link, osm_france_link: osm_france_link });
+
+    var thunderforest_link = $("<a>", {
+      href: "https://www.thunderforest.com/",
+      target: "_blank",
+      text: I18n.t("javascripts.map.andy_allan")
+    }).prop("outerHTML");
+    var thunderforest = I18n.t("javascripts.map.thunderforest_credit", { thunderforest_link: thunderforest_link });
+
+    var tracestrack_link = $("<a>", {
+      href: "https://www.tracestrack.com/",
+      target: "_blank",
+      text: I18n.t("javascripts.map.tracestrack")
+    }).prop("outerHTML");
+    var tracestrack = I18n.t("javascripts.map.tracestrack_credit", { tracestrack_link: tracestrack_link });
+
+    var hotosm_link = $("<a>", {
+      href: "https://www.hotosm.org/",
+      target: "_blank",
+      text: I18n.t("javascripts.map.hotosm_name")
+    }).prop("outerHTML");
+    var hotosm = I18n.t("javascripts.map.hotosm_credit", { hotosm_link: hotosm_link, osm_france_link: osm_france_link });

 
     this.baseLayers = [];
 
     this.baseLayers.push(new L.OSM.Mapnik({
 
     this.baseLayers = [];
 
     this.baseLayers.push(new L.OSM.Mapnik({

-      attribution: copyright + " &hearts; " + donate,
+      attribution: copyright + " &hearts; " + donate + ". " + terms,

       code: "M",
       keyid: "mapnik",
       name: I18n.t("javascripts.map.base.standard")
     }));
 
       code: "M",
       keyid: "mapnik",
       name: I18n.t("javascripts.map.base.standard")
     }));
 

+    this.baseLayers.push(new L.OSM.CyclOSM({
+      attribution: copyright + ". " + cyclosm + ". " + terms,
+      code: "Y",
+      keyid: "cyclosm",
+      name: I18n.t("javascripts.map.base.cyclosm")
+    }));
+

     if (OSM.THUNDERFOREST_KEY) {
       this.baseLayers.push(new L.OSM.CycleMap({
     if (OSM.THUNDERFOREST_KEY) {
       this.baseLayers.push(new L.OSM.CycleMap({

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

         apikey: OSM.THUNDERFOREST_KEY,
         code: "C",
         keyid: "cyclemap",
         apikey: OSM.THUNDERFOREST_KEY,
         code: "C",
         keyid: "cyclemap",


@@ -35,7 +91,7 @@ L.OSM.Map = L.Map.extend({
       }));
 
       this.baseLayers.push(new L.OSM.TransportMap({
       }));
 
       this.baseLayers.push(new L.OSM.TransportMap({

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

         apikey: OSM.THUNDERFOREST_KEY,
         code: "T",
         keyid: "transportmap",
         apikey: OSM.THUNDERFOREST_KEY,
         code: "T",
         keyid: "transportmap",


@@ -43,32 +99,47 @@ L.OSM.Map = L.Map.extend({
       }));
     }
 
       }));
     }
 

+    if (OSM.TRACESTRACK_KEY) {
+      this.baseLayers.push(new L.OSM.TracestrackTopo({
+        attribution: copyright + ". " + tracestrack + ". " + terms,
+        apikey: OSM.TRACESTRACK_KEY,
+        code: "P",
+        keyid: "tracestracktopo",
+        name: I18n.t("javascripts.map.base.tracestracktop_topo")
+      }));
+    }
+

     this.baseLayers.push(new L.OSM.HOT({
     this.baseLayers.push(new L.OSM.HOT({

-      attribution: copyright + ". Tiles courtesy of <a href='http://hot.openstreetmap.org/' target='_blank'>Humanitarian OpenStreetMap Team</a>",
+      attribution: copyright + ". " + hotosm + ". " + terms,

       code: "H",
       keyid: "hot",
       name: I18n.t("javascripts.map.base.hot")
     }));
 
     this.noteLayer = new L.FeatureGroup();
       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 = new L.OSM.DataLayer(null);

-    this.dataLayer.options.code = 'D';
+    this.dataLayer.options.code = "D";

 
     this.gpsLayer = new L.OSM.GPS({
       pane: "overlayPane",
 
     this.gpsLayer = new L.OSM.GPS({
       pane: "overlayPane",

-      code: "G",
-      name: I18n.t("javascripts.map.base.gps")
+      code: "G"
+    });
+
+    this.on("layeradd", function (event) {
+      if (this.baseLayers.indexOf(event.layer) >= 0) {
+        this.setMaxZoom(event.layer.options.maxZoom);
+      }

     });
   },
 
     });
   },
 

-  updateLayers: function(layerParam) {
-    layerParam = layerParam || "M";
-    var layersAdded = "";
+  updateLayers: function (layerParam) {
+    var layers = layerParam || "M",
+        layersAdded = "";

 
     for (var i = this.baseLayers.length - 1; i >= 0; i--) {
 
     for (var i = this.baseLayers.length - 1; i >= 0; i--) {

-      if (layerParam.indexOf(this.baseLayers[i].options.code) >= 0) {
+      if (layers.indexOf(this.baseLayers[i].options.code) >= 0) {

         this.addLayer(this.baseLayers[i]);
         layersAdded = layersAdded + this.baseLayers[i].options.code;
       } else if (i === 0 && layersAdded === "") {
         this.addLayer(this.baseLayers[i]);
         layersAdded = layersAdded + this.baseLayers[i].options.code;
       } else if (i === 0 && layersAdded === "") {


@@ -80,24 +151,24 @@ L.OSM.Map = L.Map.extend({
   },
 
   getLayersCode: function () {
   },
 
   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;
       }
       if (layer.options && layer.options.code) {
         layerConfig += layer.options.code;
       }

-    }
+    });

     return layerConfig;
   },
 
   getMapBaseLayerId: function () {
     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 = {};
 
     var precision = OSM.zoomPrecision(this.getZoom()),
         params = {};
 


@@ -107,77 +178,81 @@ L.OSM.Map = L.Map.extend({
       params.mlon = latLng.lng.toFixed(precision);
     }
 
       params.mlon = latLng.lng.toFixed(precision);
     }
 

-    var url = 'http://' + OSM.SERVER_URL + '/',
-      query = querystring.stringify(params),
-      hash = OSM.formatHash(this);
+    var url = window.location.protocol + "//" + OSM.SERVER_URL + "/",
+        query = Qs.stringify(params),
+        hash = OSM.formatHash(this);

 
 

-    if (query) url += '?' + query;
+    if (query) url += "?" + query;

     if (hash) url += hash;
 
     return url;
   },
 
     if (hash) url += hash;
 
     return url;
   },
 

-  getShortUrl: function(marker) {
+  getShortUrl: function (marker) {

     var zoom = this.getZoom(),
     var zoom = this.getZoom(),

-      latLng = marker && this.hasLayer(marker) ? marker.getLatLng().wrap() : this.getCenter().wrap(),
-      str = window.location.hostname.match(/^www\.openstreetmap\.org/i) ?
-        'http://osm.org/go/' : 'http://' + 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)),
-      // JavaScript only has to keep 32 bits of bitwise operators, so this has to be
-      // 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;
-
-    for (var i = 0; i < Math.ceil((zoom + 8) / 3.0) && i < 5; ++i) {
-      digit = (c1 >> (24 - 6 * i)) & 0x3f;
+        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/",
+        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)),
+        // JavaScript only has to keep 32 bits of bitwise operators, so this has to be
+        // 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,
+        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);
     }
     for (i = 5; i < Math.ceil((zoom + 8) / 3.0); ++i) {
       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 += "-";
 
     // Called to interlace the bits in x and y, making a Morton code.
     function interlace(x, y) {
       str += char_array.charAt(digit);
     }
     for (i = 0; i < ((zoom + 8) % 3); ++i) str += "-";
 
     // Called to interlace the bits in x and y, making a Morton code.
     function interlace(x, y) {

-      x = (x | (x << 8)) & 0x00ff00ff;
-      x = (x | (x << 4)) & 0x0f0f0f0f;
-      x = (x | (x << 2)) & 0x33333333;
-      x = (x | (x << 1)) & 0x55555555;
-      y = (y | (y << 8)) & 0x00ff00ff;
-      y = (y | (y << 4)) & 0x0f0f0f0f;
-      y = (y | (y << 2)) & 0x33333333;
-      y = (y | (y << 1)) & 0x55555555;
-      return (x << 1) | y;
+      var interlaced_x = x,
+          interlaced_y = y;
+      interlaced_x = (interlaced_x | (interlaced_x << 8)) & 0x00ff00ff;
+      interlaced_x = (interlaced_x | (interlaced_x << 4)) & 0x0f0f0f0f;
+      interlaced_x = (interlaced_x | (interlaced_x << 2)) & 0x33333333;
+      interlaced_x = (interlaced_x | (interlaced_x << 1)) & 0x55555555;
+      interlaced_y = (interlaced_y | (interlaced_y << 8)) & 0x00ff00ff;
+      interlaced_y = (interlaced_y | (interlaced_y << 4)) & 0x0f0f0f0f;
+      interlaced_y = (interlaced_y | (interlaced_y << 2)) & 0x33333333;
+      interlaced_y = (interlaced_y | (interlaced_y << 1)) & 0x55555555;
+      return (interlaced_x << 1) | interlaced_y;

     }
 
     var params = {};
     }
 
     var params = {};

-    var layers = this.getLayersCode().replace('M', '');
+    var layers = this.getLayersCode().replace("M", "");

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

-      params.m = '';
+      params.m = "";

     }
 
     if (this._object) {
       params[this._object.type] = this._object.id;
     }
 
     }
 
     if (this._object) {
       params[this._object.type] = this._object.id;
     }
 

-    var query = querystring.stringify(params);
+    var query = Qs.stringify(params);

     if (query) {
     if (query) {

-      str += '?' + query;
+      str += "?" + query;

     }
 
     return str;
   },
 
     }
 
     return str;
   },
 

-  getGeoUri: function(marker) {
+  getGeoUri: function (marker) {

     var precision = OSM.zoomPrecision(this.getZoom()),
         latLng,
         params = {};
     var precision = OSM.zoomPrecision(this.getZoom()),
         latLng,
         params = {};


@@ -192,10 +267,10 @@ L.OSM.Map = L.Map.extend({
     params.lon = latLng.lng.toFixed(precision);
     params.zoom = this.getZoom();
 
     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,
     var objectStyle = {
       color: "#FF6200",
       weight: 4,


@@ -205,58 +280,85 @@ L.OSM.Map = L.Map.extend({
 
     var changesetStyle = {
       weight: 4,
 
     var changesetStyle = {
       weight: 4,

-      color: '#FF9500',
+      color: "#FF9500",

       opacity: 1,
       fillOpacity: 0,
       opacity: 1,
       fillOpacity: 0,

-      clickable: false
+      interactive: false

     };
 
     };
 

-    this._object = object;
+    var haloStyle = {
+      weight: 2.5,
+      radius: 20,
+      fillOpacity: 0.5,
+      color: "#FF6200"
+    };

 
 

-    if (this._objectLoader) this._objectLoader.abort();
-    if (this._objectLayer) this.removeLayer(this._objectLayer);
+    this.removeObject();
+
+    if (object.type === "note") {
+      this._objectLoader = {
+        abort: function () {}
+      };
+
+      this._object = object;
+      this._objectLayer = L.featureGroup().addTo(this);

 
 

-    var map = this;
-    this._objectLoader = $.ajax({
-      url: OSM.apiUrl(object),
-      dataType: "xml",
-      success: function (xml) {
-        map._objectLayer = new L.OSM.DataLayer(null, {
-          styles: {
-            node: objectStyle,
-            way: objectStyle,
-            area: objectStyle,
-            changeset: changesetStyle
-          }
-        });
-
-        map._objectLayer.interestingNode = function (node, ways, relations) {
-          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;
-          } else {
-            return false;
-          }
-        };
-
-        map._objectLayer.addData(xml);
-        map._objectLayer.addTo(map);
-
-        if (callback) callback(map._objectLayer.getBounds());
+      L.circleMarker(object.latLng, haloStyle).addTo(this._objectLayer);
+
+      if (object.icon) {
+        L.marker(object.latLng, {
+          icon: object.icon,
+          opacity: 1,
+          interactive: true
+        }).addTo(this._objectLayer);

       }
       }

-    });
+
+      if (callback) callback(this._objectLayer.getBounds());
+    } else { // element or changeset handled by L.OSM.DataLayer
+      var map = this;
+      this._objectLoader = $.ajax({
+        url: OSM.apiUrl(object),
+        dataType: "xml",
+        success: function (xml) {
+          map._object = object;
+
+          map._objectLayer = new L.OSM.DataLayer(null, {
+            styles: {
+              node: objectStyle,
+              way: objectStyle,
+              area: objectStyle,
+              changeset: changesetStyle
+            }
+          });
+
+          map._objectLayer.interestingNode = function (node, ways, relations) {
+            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;
+              }
+            } else {
+              return false;
+            }
+          };
+
+          map._objectLayer.addData(xml);
+          map._objectLayer.addTo(map);
+
+          if (callback) callback(map._objectLayer.getBounds());
+        }
+      });
+    }

   },
 
   },
 

-  removeObject: function() {
+  removeObject: function () {

     this._object = null;
     if (this._objectLoader) this._objectLoader.abort();
     if (this._objectLayer) this.removeLayer(this._objectLayer);
   },
 
     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(),
     return {
       center: this.getCenter().wrap(),
       zoom: this.getZoom(),


@@ -264,20 +366,25 @@ 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);
   },
 
     if (state.center) this.setView(state.center, state.zoom, options);
     if (state.layers) this.updateLayers(state.layers);
   },
 

-  setSidebarOverlaid: function(overlaid) {
+  setSidebarOverlaid: function (overlaid) {
+    var sidebarWidth = 350;

     if (overlaid && !$("#content").hasClass("overlay-sidebar")) {
       $("#content").addClass("overlay-sidebar");
     if (overlaid && !$("#content").hasClass("overlay-sidebar")) {
       $("#content").addClass("overlay-sidebar");

-      this.invalidateSize({pan: false})
-        .panBy([-350, 0], {animate: false});
+      this.invalidateSize({ pan: false });
+      if ($("html").attr("dir") !== "rtl") {
+        this.panBy([-sidebarWidth, 0], { animate: false });
+      }

     } else if (!overlaid && $("#content").hasClass("overlay-sidebar")) {
     } else if (!overlaid && $("#content").hasClass("overlay-sidebar")) {

-      this.panBy([350, 0], {animate: false});
+      if ($("html").attr("dir") !== "rtl") {
+        this.panBy([sidebarWidth, 0], { animate: false });
+      }

       $("#content").removeClass("overlay-sidebar");
       $("#content").removeClass("overlay-sidebar");

-      this.invalidateSize({pan: false});
+      this.invalidateSize({ pan: false });

     }
     return this;
   }
     }
     return this;
   }


@@ -294,7 +401,7 @@ L.Icon.Default.imageUrls = {
 L.extend(L.Icon.Default.prototype, {
   _oldGetIconUrl: L.Icon.Default.prototype._getIconUrl,
 
 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];
   }
     var url = this._oldGetIconUrl(name);
     return L.Icon.Default.imageUrls[url];
   }