X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b170c06d5cd77d15d36105e6530ec99eb7e390e9..9efa2c7b92952b7d72bd5dc35dd22deb79d50b35:/app/assets/javascripts/leaflet.map.js
diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index e499795be..d952a7376 100644
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -14,7 +14,7 @@ L.OSM.Map = L.Map.extend({
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 donate = I18n.t('javascripts.map.donate_link_text', {donate_url: 'https://donate.openstreetmap.org'});
this.baseLayers = [];
@@ -27,7 +27,7 @@ L.OSM.Map = L.Map.extend({
if (OSM.THUNDERFOREST_KEY) {
this.baseLayers.push(new L.OSM.CycleMap({
- attribution: copyright + ". Tiles courtesy of Andy Allan",
+ attribution: copyright + ". Tiles courtesy of Andy Allan",
apikey: OSM.THUNDERFOREST_KEY,
code: "C",
keyid: "cyclemap",
@@ -35,7 +35,7 @@ L.OSM.Map = L.Map.extend({
}));
this.baseLayers.push(new L.OSM.TransportMap({
- attribution: copyright + ". Tiles courtesy of Andy Allan",
+ attribution: copyright + ". Tiles courtesy of Andy Allan",
apikey: OSM.THUNDERFOREST_KEY,
code: "T",
keyid: "transportmap",
@@ -44,7 +44,7 @@ L.OSM.Map = L.Map.extend({
}
this.baseLayers.push(new L.OSM.HOT({
- attribution: copyright + ". Tiles courtesy of Humanitarian OpenStreetMap Team",
+ attribution: copyright + ". Tiles courtesy of Humanitarian OpenStreetMap Team",
code: "H",
keyid: "hot",
name: I18n.t("javascripts.map.base.hot")
@@ -107,7 +107,7 @@ 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);
@@ -121,8 +121,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)),
@@ -209,7 +209,7 @@ L.OSM.Map = L.Map.extend({
color: '#FF9500',
opacity: 1,
fillOpacity: 0,
- clickable: false
+ interactive: false
};
this.removeObject();