From 63aa7e1a85bd2be163b5680bcfb372e42a339222 Mon Sep 17 00:00:00 2001 From: Karuru Date: Sun, 11 Aug 2024 23:28:04 +0800 Subject: [PATCH] fix osm tile copyright attribution --- application/views/interface_assets/footer.php | 2 +- assets/js/leaflet/leafembed.js | 2 +- assets/js/sections/cqmap.js | 2 +- assets/js/sections/dxccmap.js | 2 +- assets/js/sections/helvetiamap.js | 2 +- assets/js/sections/iotamap.js | 2 +- assets/js/sections/itumap.js | 2 +- assets/js/sections/jccmap.js | 2 +- assets/js/sections/racmap.js | 2 +- assets/js/sections/wajamap.js | 2 +- assets/js/sections/wasmap.js | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 949d08676..639d180c5 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -737,7 +737,7 @@ function showActivatorsMap(call, count, grids) { var maidenhead = new L.maidenheadactivators(grid_four).addTo(map); var osmUrl='optionslib->get_option('option_map_tile_server');?>'; - var osmAttrib='Map data © OpenStreetMap contributors'; + var osmAttrib='optionslib->get_option('option_map_tile_server_copyright');?>'; var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 12, attribution: osmAttrib}); map.addLayer(osm); diff --git a/assets/js/leaflet/leafembed.js b/assets/js/leaflet/leafembed.js index efe989dad..a05d55587 100644 --- a/assets/js/leaflet/leafembed.js +++ b/assets/js/leaflet/leafembed.js @@ -14,7 +14,7 @@ function initmap(ShowGrid='No', MapTag='map', options={}) { // set up the map map = new L.Map(MapTag); // create the tile layer with correct attribution - var osmAttrib='Map data © OpenStreetMap contributors'; + var osmAttrib = option_map_tile_server_copyright; var osm = new L.TileLayer(osmUrl, {minZoom: 1, maxZoom: 12, attribution: osmAttrib}); var printer = L.easyPrint({ diff --git a/assets/js/sections/cqmap.js b/assets/js/sections/cqmap.js index 58fed8001..0ec64d85f 100644 --- a/assets/js/sections/cqmap.js +++ b/assets/js/sections/cqmap.js @@ -51,7 +51,7 @@ function load_cq_map2(data) { L.tileLayer( osmUrl, { - attribution: '© OpenStreetMap contributors, CC-BY-SA', + attribution: option_map_tile_server_copyright, maxZoom: 18 } ).addTo(map); diff --git a/assets/js/sections/dxccmap.js b/assets/js/sections/dxccmap.js index e5e102aa9..2526e144a 100644 --- a/assets/js/sections/dxccmap.js +++ b/assets/js/sections/dxccmap.js @@ -76,7 +76,7 @@ function load_dxcc_map2(data, worked, confirmed, notworked) { L.tileLayer( osmUrl, { - attribution: '© OpenStreetMap contributors, CC-BY-SA', + attribution: option_map_tile_server_copyright, maxZoom: 18 } ).addTo(map); diff --git a/assets/js/sections/helvetiamap.js b/assets/js/sections/helvetiamap.js index bb4fce846..9f424541b 100644 --- a/assets/js/sections/helvetiamap.js +++ b/assets/js/sections/helvetiamap.js @@ -56,7 +56,7 @@ function load_helvetia_map2(data) { L.tileLayer( osmUrl, { - attribution: '© OpenStreetMap contributors, CC-BY-SA', + attribution: option_map_tile_server_copyright, maxZoom: 18 } ).addTo(map); diff --git a/assets/js/sections/iotamap.js b/assets/js/sections/iotamap.js index 7968f2412..74ed5288b 100644 --- a/assets/js/sections/iotamap.js +++ b/assets/js/sections/iotamap.js @@ -55,7 +55,7 @@ function load_iota_map2(data, worked, confirmed, notworked) { L.tileLayer( osmUrl, { - attribution: '© OpenStreetMap contributors, CC-BY-SA', + attribution: option_map_tile_server_copyright, maxZoom: 18 } ).addTo(map); diff --git a/assets/js/sections/itumap.js b/assets/js/sections/itumap.js index 015cb3296..c6efa3aee 100644 --- a/assets/js/sections/itumap.js +++ b/assets/js/sections/itumap.js @@ -144,7 +144,7 @@ function load_itu_map2(data) { L.tileLayer( osmUrl, { - attribution: '© OpenStreetMap contributors, CC-BY-SA', + attribution: option_map_tile_server_copyright, maxZoom: 18 } ).addTo(map); diff --git a/assets/js/sections/jccmap.js b/assets/js/sections/jccmap.js index 0d314e833..a03133ebe 100644 --- a/assets/js/sections/jccmap.js +++ b/assets/js/sections/jccmap.js @@ -47,7 +47,7 @@ function load_jcc_map2(data, worked, confirmed, notworked) { L.tileLayer( osmUrl, { - attribution: '© OpenStreetMap contributors, CC-BY-SA', + attribution: option_map_tile_server_copyright, maxZoom: 18 } ).addTo(map); diff --git a/assets/js/sections/racmap.js b/assets/js/sections/racmap.js index 31f1c89f5..b4841370b 100644 --- a/assets/js/sections/racmap.js +++ b/assets/js/sections/racmap.js @@ -73,7 +73,7 @@ function load_rac_map2(data) { L.tileLayer( osmUrl, { - attribution: '© OpenStreetMap contributors, CC-BY-SA', + attribution: option_map_tile_server_copyright, maxZoom: 18 } ).addTo(map); diff --git a/assets/js/sections/wajamap.js b/assets/js/sections/wajamap.js index e12df68d8..8629b977a 100644 --- a/assets/js/sections/wajamap.js +++ b/assets/js/sections/wajamap.js @@ -157,7 +157,7 @@ const mapcoordinates = { "type": "FeatureCollection", "features": [ L.tileLayer( osmUrl, { - attribution: '© OpenStreetMap contributors, CC-BY-SA', + attribution: option_map_tile_server_copyright, maxZoom: 18 } ).addTo(map); diff --git a/assets/js/sections/wasmap.js b/assets/js/sections/wasmap.js index b23fc984c..e2be3fb35 100644 --- a/assets/js/sections/wasmap.js +++ b/assets/js/sections/wasmap.js @@ -164,7 +164,7 @@ const mapcoordinates = { "type": "FeatureCollection", "features": [ L.tileLayer( osmUrl, { - attribution: '© OpenStreetMap contributors, CC-BY-SA', + attribution: option_map_tile_server_copyright, maxZoom: 18 } ).addTo(map);