X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f4a4632b45af73f051f846bc01f4d45c58f77f8b..7a64ebe98265ff8ad6be5b8be9481661cd824f0f:/app/assets/javascripts/leaflet.map.js diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js index 4f3c7bc25..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") @@ -55,6 +55,12 @@ L.OSM.Map = L.Map.extend({ this.dataLayer = new L.OSM.DataLayer(null); this.dataLayer.options.code = 'D'; + + this.gpsLayer = new L.OSM.GPS({ + pane: "overlayPane", + code: "G", + name: I18n.t("javascripts.map.base.gps") + }); }, updateLayers: function(layerParam) { @@ -101,7 +107,7 @@ L.OSM.Map = L.Map.extend({ params.mlon = latLng.lng.toFixed(precision); } - var url = 'http://' + OSM.SERVER_URL + '/', + var url = window.location.protocol + '//' + OSM.SERVER_URL + '/', query = querystring.stringify(params), hash = OSM.formatHash(this); @@ -115,7 +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) ? - 'http://osm.org/go/' : 'http://' + 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)), @@ -202,19 +209,18 @@ L.OSM.Map = L.Map.extend({ color: '#FF9500', opacity: 1, fillOpacity: 0, - clickable: false + interactive: false }; - this._object = object; - - if (this._objectLoader) this._objectLoader.abort(); - if (this._objectLayer) this.removeLayer(this._objectLayer); + this.removeObject(); 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,