X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6403cb9b08dfb7b0411c88515da34f27a813dd4a..579e323d0994c5111ef46aa8343b5cdcbc2db4fa:/app/assets/javascripts/leaflet.map.js diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js index 58360bbec..4b50cc78c 100644 --- a/app/assets/javascripts/leaflet.map.js +++ b/app/assets/javascripts/leaflet.map.js @@ -16,44 +16,51 @@ 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'}; 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) { @@ -204,16 +211,15 @@ L.OSM.Map = L.Map.extend({ clickable: 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, @@ -276,7 +282,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,