Merge remote-tracking branch 'openstreetmap/pull/1036'

[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 d60f3b2f683737dce247ee64b2a29bb9e6fa5af9..7395898b7d488066e44a23b4d7766fd5fbda4205 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -35,12 +35,6 @@ L.OSM.Map = L.Map.extend({
         keyid: "transportmap",
         name: I18n.t("javascripts.map.base.transport_map")
       }),
         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='https://developer.mapquest.com/content/osm/mq_logo.png'>",
-        code: "Q",
-        keyid: "mapquest",
-        name: I18n.t("javascripts.map.base.mapquest")
-      }),

       new L.OSM.HOT({
         attribution: copyright + ". Tiles courtesy of <a href='http://hot.openstreetmap.org/' target='_blank'>Humanitarian OpenStreetMap Team</a>",
         code: "H",
       new L.OSM.HOT({
         attribution: copyright + ". Tiles courtesy of <a href='http://hot.openstreetmap.org/' target='_blank'>Humanitarian OpenStreetMap Team</a>",
         code: "H",


@@ -170,6 +164,24 @@ L.OSM.Map = L.Map.extend({
     return str;
   },
 
     return str;
   },
 

+  getGeoUri: function(marker) {
+    var precision = OSM.zoomPrecision(this.getZoom()),
+        latLng,
+        params = {};
+
+    if (marker && this.hasLayer(marker)) {
+      latLng = marker.getLatLng().wrap();
+    } else {
+      latLng = this.getCenter();
+    }
+
+    params.lat = latLng.lat.toFixed(precision);
+    params.lon = latLng.lng.toFixed(precision);
+    params.zoom = this.getZoom();
+
+    return 'geo:' + params.lat + ',' + params.lon + '?z=' + params.zoom;
+  },
+

   addObject: function(object, callback) {
     var objectStyle = {
       color: "#FF6200",
   addObject: function(object, callback) {
     var objectStyle = {
       color: "#FF6200",


@@ -275,7 +287,7 @@ L.extend(L.Icon.Default.prototype, {
   }
 });
 
   }
 });
 

-function getUserIcon(url) {
+OSM.getUserIcon = function (url) {

   return L.icon({
     iconUrl: url || OSM.MARKER_RED,
     iconSize: [25, 41],
   return L.icon({
     iconUrl: url || OSM.MARKER_RED,
     iconSize: [25, 41],


@@ -284,4 +296,4 @@ function getUserIcon(url) {
     shadowUrl: OSM.MARKER_SHADOW,
     shadowSize: [41, 41]
   });
     shadowUrl: OSM.MARKER_SHADOW,
     shadowSize: [41, 41]
   });

-}
+};