Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #740 from violarulan/dev

Browse Source 
Fix map attribution
This commit is contained in:
Andreas Kristiansen
2024-08-13 09:12:07 +02:00
committed by GitHub
parent 5add80fdb6 da865b3103
commit 8fe99cb8fb
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/views/visitor/exportmap/footer.php
View File

@@ -16,6 +16,7 @@
var base_url = "<?php echo base_url(); ?>"; // Base URL
var site_url = "<?php echo site_url(); ?>"; // Site URL
var icon_dot_url = "<?php echo base_url();?>assets/images/dot.png";
var option_map_tile_server_copyright = '<?php echo $this->optionslib->get_option('option_map_tile_server_copyright');?>';
</script>
<script id="leafembed" type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js" tileUrl="<?php echo $this->optionslib->get_option('map_tile_server');?>"></script>
<script type="text/javascript" src="<?php echo base_url();?>assets/js/sections/exportmap.js"></script>

7
application/views/visitor/layout/footer.php
View File

@@ -18,6 +18,7 @@
var base_url = "<?php echo base_url(); ?>"; // Base URL
var site_url = "<?php echo site_url(); ?>"; // Site URL
var icon_dot_url = "<?php echo base_url();?>assets/images/dot.png";
var option_map_tile_server_copyright = '<?php echo $this->optionslib->get_option('option_map_tile_server_copyright');?>';
</script>
<!-- DATATABLES LANGUAGE -->
@@ -93,7 +94,7 @@ if ($lang_code != 'en' && !file_exists(FCPATH . "assets/json/datatables_language
<script type="text/javascript" src="<?php echo base_url();?>assets/js/sections/gridmap.js?"></script>
<script>
// auto setting of gridmap height
function set_map_height() {
@@ -116,13 +117,13 @@ if ($lang_code != 'en' && !file_exists(FCPATH . "assets/json/datatables_language
$('#gridsquare_map').css('height', gridsquareMapHeight + 'px');
// console.log('#gridsquare_map: ' + gridsquareMapHeight);
}
</script>
</script>
<script>
var layer = L.tileLayer('<?php echo $this->optionslib->get_option('option_map_tile_server');?>', {
maxZoom: 18,
attribution: '<?php echo $this->optionslib->get_option('option_map_tile_server_copyright');?>',
attribution: option_map_tile_server_copyright,
id: 'mapbox.streets'
});

5
assets/js/sections/exportmap.js
View File

@@ -48,8 +48,7 @@ function loadQsos(slug, iconsList) {
}
function loadMap(data, iconsList) {
var osmUrl=tileUrl;
var osmAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
var osmUrl = tileUrl;
// If map is already initialized
var container = L.DomUtil.get('exportmap');
@@ -71,7 +70,7 @@ function loadMap(data, iconsList) {
var osm = L.tileLayer(
osmUrl,
{
attribution: '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
attribution: option_map_tile_server_copyright,
maxZoom: 18,
zoom: 3,
minZoom: 2,

4
assets/js/sections/logbookadvanced_map.js
View File

@@ -220,7 +220,7 @@ const ituzonenames = [
function loadMap(data, iconsList) {
$('#mapButton').prop("disabled", false).removeClass("running");
var osmUrl = tileUrl;
var osmAttrib='Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors';
var osmAttrib = option_map_tile_server_copyright;
// If map is already initialized
var container = L.DomUtil.get('advancedmap');
@@ -257,7 +257,7 @@ function loadMap(data, iconsList) {
var osm = L.tileLayer(
osmUrl,
{
attribution: '&copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
attribution: osmAttrib,
maxZoom: 18,
zoom: 3,
minZoom: 2,