X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1596713871672cc319b0d68b51a3698cc6bf0972..1ba7eccae694d3cdf349dc0c58229f1c557486a1:/app/assets/javascripts/leaflet.map.js?ds=inline diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js index d60f3b2f6..4f3c7bc25 100644 --- a/app/assets/javascripts/leaflet.map.js +++ b/app/assets/javascripts/leaflet.map.js @@ -16,38 +16,39 @@ L.OSM.Map = L.Map.extend({ 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'}); - this.baseLayers = [ - new L.OSM.Mapnik({ - attribution: copyright + " ♥ " + donate, - code: "M", - keyid: "mapnik", - name: I18n.t("javascripts.map.base.standard") - }), - new L.OSM.CycleMap({ + this.baseLayers = []; + + this.baseLayers.push(new L.OSM.Mapnik({ + attribution: copyright + " ♥ " + donate, + code: "M", + keyid: "mapnik", + name: I18n.t("javascripts.map.base.standard") + })); + + if (OSM.THUNDERFOREST_KEY) { + this.baseLayers.push(new L.OSM.CycleMap({ attribution: copyright + ". Tiles courtesy of Andy Allan", + apikey: OSM.THUNDERFOREST_KEY, code: "C", keyid: "cyclemap", name: I18n.t("javascripts.map.base.cycle_map") - }), - new L.OSM.TransportMap({ + })); + + this.baseLayers.push(new L.OSM.TransportMap({ attribution: copyright + ". Tiles courtesy of Andy Allan", + apikey: OSM.THUNDERFOREST_KEY, code: "T", keyid: "transportmap", name: I18n.t("javascripts.map.base.transport_map") - }), - new L.OSM.MapQuestOpen({ - attribution: copyright + ". Tiles courtesy of MapQuest ", - code: "Q", - keyid: "mapquest", - name: I18n.t("javascripts.map.base.mapquest") - }), - new L.OSM.HOT({ - attribution: copyright + ". Tiles courtesy of Humanitarian OpenStreetMap Team", - code: "H", - keyid: "hot", - name: I18n.t("javascripts.map.base.hot") - }) - ]; + })); + } + + this.baseLayers.push(new L.OSM.HOT({ + attribution: copyright + ". Tiles courtesy of Humanitarian OpenStreetMap Team", + code: "H", + keyid: "hot", + name: I18n.t("javascripts.map.base.hot") + })); this.noteLayer = new L.FeatureGroup(); this.noteLayer.options = {code: 'N'}; @@ -170,6 +171,24 @@ L.OSM.Map = L.Map.extend({ 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", @@ -258,7 +277,7 @@ L.OSM.Map = L.Map.extend({ } }); -L.Icon.Default.imagePath = "/images"; +L.Icon.Default.imagePath = "/images/"; L.Icon.Default.imageUrls = { "/images/marker-icon.png": OSM.MARKER_ICON, @@ -275,7 +294,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], @@ -284,4 +303,4 @@ function getUserIcon(url) { shadowUrl: OSM.MARKER_SHADOW, shadowSize: [41, 41] }); -} +};