X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e7ddfe10846f89b5eeec4bf4f4dc03057a744009..33bca7cd655577da0b2b2aac398db221a31700ad:/app/assets/javascripts/leaflet.map.js?ds=sidebyside diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js index d221ae208..6537b0b23 100644 --- a/app/assets/javascripts/leaflet.map.js +++ b/app/assets/javascripts/leaflet.map.js @@ -15,107 +15,32 @@ L.OSM.Map = L.Map.extend({ initialize: function (id, options) { L.Map.prototype.initialize.call(this, id, options); - var copyright_link = $("", { - href: "/copyright", - text: I18n.t("javascripts.map.openstreetmap_contributors") - }).prop("outerHTML"); - var copyright = I18n.t("javascripts.map.copyright_text", { copyright_link: copyright_link }); - - var donate = $("", { - "href": "https://supporting.openstreetmap.org", - "class": "donate-attr", - "text": I18n.t("javascripts.map.make_a_donation") - }).prop("outerHTML"); - - var terms = $("", { - href: "https://wiki.osmfoundation.org/wiki/Terms_of_Use", - text: I18n.t("javascripts.map.website_and_api_terms") - }).prop("outerHTML"); - - var cyclosm_link = $("", { - href: "https://www.cyclosm.org", - target: "_blank", - text: I18n.t("javascripts.map.cyclosm_name") - }).prop("outerHTML"); - var osm_france_link = $("", { - href: "https://openstreetmap.fr/", - target: "_blank", - text: I18n.t("javascripts.map.osm_france") - }).prop("outerHTML"); - var cyclosm = I18n.t("javascripts.map.cyclosm_credit", { cyclosm_link: cyclosm_link, osm_france_link: osm_france_link }); - - var thunderforest_link = $("", { - href: "https://www.thunderforest.com/", - target: "_blank", - text: I18n.t("javascripts.map.andy_allan") - }).prop("outerHTML"); - var thunderforest = I18n.t("javascripts.map.thunderforest_credit", { thunderforest_link: thunderforest_link }); - - var tracestrack_link = $("", { - href: "https://www.tracestrack.com/", - target: "_blank", - text: I18n.t("javascripts.map.tracestrack") - }).prop("outerHTML"); - var tracestrack = I18n.t("javascripts.map.tracestrack_credit", { tracestrack_link: tracestrack_link }); - - var hotosm_link = $("", { - href: "https://www.hotosm.org/", - target: "_blank", - text: I18n.t("javascripts.map.hotosm_name") - }).prop("outerHTML"); - var hotosm = I18n.t("javascripts.map.hotosm_credit", { hotosm_link: hotosm_link, osm_france_link: osm_france_link }); - this.baseLayers = []; - this.baseLayers.push(new L.OSM.Mapnik({ - attribution: copyright + " ♥ " + donate + ". " + terms, - code: "M", - keyid: "mapnik", - name: I18n.t("javascripts.map.base.standard") - })); - - this.baseLayers.push(new L.OSM.CyclOSM({ - attribution: copyright + ". " + cyclosm + ". " + terms, - code: "Y", - keyid: "cyclosm", - name: I18n.t("javascripts.map.base.cyclosm") - })); - - if (OSM.THUNDERFOREST_KEY) { - this.baseLayers.push(new L.OSM.CycleMap({ - attribution: copyright + ". " + thunderforest + ". " + terms, - apikey: OSM.THUNDERFOREST_KEY, - code: "C", - keyid: "cyclemap", - name: I18n.t("javascripts.map.base.cycle_map") - })); - - this.baseLayers.push(new L.OSM.TransportMap({ - attribution: copyright + ". " + thunderforest + ". " + terms, - apikey: OSM.THUNDERFOREST_KEY, - code: "T", - keyid: "transportmap", - name: I18n.t("javascripts.map.base.transport_map") - })); - } + for (const layerDefinition of OSM.LAYER_DEFINITIONS) { + if (layerDefinition.apiKeyId && !OSM[layerDefinition.apiKeyId]) continue; + + let layerConstructor = L.OSM.TileLayer; + const layerOptions = {}; + + for (const [property, value] of Object.entries(layerDefinition)) { + if (property === "credit") { + layerOptions.attribution = makeAttribution(value); + } else if (property === "nameId") { + layerOptions.name = I18n.t(`javascripts.map.base.${value}`); + } else if (property === "apiKeyId") { + layerOptions.apikey = OSM[value]; + } else if (property === "leafletOsmId") { + layerConstructor = L.OSM[value]; + } else { + layerOptions[property] = value; + } + } - if (OSM.TRACESTRACK_KEY) { - this.baseLayers.push(new L.OSM.TracestrackTopo({ - attribution: copyright + ". " + tracestrack + ". " + terms, - apikey: OSM.TRACESTRACK_KEY, - code: "P", - keyid: "tracestracktopo", - name: I18n.t("javascripts.map.base.tracestracktop_topo") - })); + const layer = new layerConstructor(layerOptions); + this.baseLayers.push(layer); } - this.baseLayers.push(new L.OSM.HOT({ - attribution: copyright + ". " + hotosm + ". " + terms, - code: "H", - keyid: "hot", - name: I18n.t("javascripts.map.base.hot") - })); - this.noteLayer = new L.FeatureGroup(); this.noteLayer.options = { code: "N" }; @@ -124,8 +49,7 @@ L.OSM.Map = L.Map.extend({ this.gpsLayer = new L.OSM.GPS({ pane: "overlayPane", - code: "G", - name: I18n.t("javascripts.map.base.gps") + code: "G" }); this.on("layeradd", function (event) { @@ -133,6 +57,50 @@ L.OSM.Map = L.Map.extend({ this.setMaxZoom(event.layer.options.maxZoom); } }); + + function makeAttribution(credit) { + let attribution = ""; + + attribution += I18n.t("javascripts.map.copyright_text", { + copyright_link: $("", { + href: "/copyright", + text: I18n.t("javascripts.map.openstreetmap_contributors") + }).prop("outerHTML") + }); + + attribution += credit.donate ? " ♥ " : ". "; + attribution += makeCredit(credit); + attribution += ". "; + + attribution += $("", { + href: "https://wiki.osmfoundation.org/wiki/Terms_of_Use", + text: I18n.t("javascripts.map.website_and_api_terms") + }).prop("outerHTML"); + + return attribution; + } + + function makeCredit(credit) { + const children = {}; + for (const childId in credit.children) { + children[childId] = makeCredit(credit.children[childId]); + } + const text = I18n.t(`javascripts.map.${credit.id}`, children); + if (credit.href) { + const link = $("", { + href: credit.href, + text: text + }); + if (credit.donate) { + link.addClass("donate-attr"); + } else { + link.attr("target", "_blank"); + } + return link.prop("outerHTML"); + } else { + return text; + } + } }, updateLayers: function (layerParam) { @@ -162,11 +130,14 @@ L.OSM.Map = L.Map.extend({ }, getMapBaseLayerId: function () { - var baseLayerId; - this.eachLayer(function (layer) { - if (layer.options && layer.options.keyid) baseLayerId = layer.options.keyid; - }); - return baseLayerId; + const layer = this.getMapBaseLayer(); + if (layer) return layer.options.layerId; + }, + + getMapBaseLayer: function () { + for (const layer of this.baseLayers) { + if (this.hasLayer(layer)) return layer; + } }, getUrl: function (marker) {