X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ce63209f326d90ae07367008a78a7af9b812021c..e2e61692ea04fc156221082aeddc21ea18facdec:/app/assets/javascripts/leaflet.map.js diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js index c81f92e72..ac31f7941 100644 --- a/app/assets/javascripts/leaflet.map.js +++ b/app/assets/javascripts/leaflet.map.js @@ -16,8 +16,6 @@ L.OSM.Map = L.Map.extend({ this.baseLayers = []; for (const layerDefinition of OSM.LAYER_DEFINITIONS) { - if (layerDefinition.apiKeyId && !OSM[layerDefinition.apiKeyId]) continue; - let layerConstructor = L.OSM.TileLayer; const layerOptions = {}; @@ -25,9 +23,7 @@ L.OSM.Map = L.Map.extend({ 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]; + layerOptions.name = OSM.i18n.t(`javascripts.map.base.${value}`); } else if (property === "leafletOsmId") { layerConstructor = L.OSM[value]; } else if (property === "leafletOsmDarkId" && OSM.isDarkMap() && L.OSM[value]) { @@ -70,10 +66,10 @@ L.OSM.Map = L.Map.extend({ function makeAttribution(credit) { let attribution = ""; - attribution += I18n.t("javascripts.map.copyright_text", { + attribution += OSM.i18n.t("javascripts.map.copyright_text", { copyright_link: $("", { href: "/copyright", - text: I18n.t("javascripts.map.openstreetmap_contributors") + text: OSM.i18n.t("javascripts.map.openstreetmap_contributors") }).prop("outerHTML") }); @@ -83,7 +79,7 @@ L.OSM.Map = L.Map.extend({ attribution += $("", { href: "https://wiki.osmfoundation.org/wiki/Terms_of_Use", - text: I18n.t("javascripts.map.website_and_api_terms") + text: OSM.i18n.t("javascripts.map.website_and_api_terms") }).prop("outerHTML"); return attribution; @@ -94,7 +90,7 @@ L.OSM.Map = L.Map.extend({ for (const childId in credit.children) { children[childId] = makeCredit(credit.children[childId]); } - const text = I18n.t(`javascripts.map.${credit.id}`, children); + const text = OSM.i18n.t(`javascripts.map.${credit.id}`, children); if (credit.href) { const link = $("", { href: credit.href,