RPJosh
/
nc-gpxedit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs #22 fix default transparency and opacity for all tile server types

merge-requests/2/head
Julien Veyssier 2017-06-14 19:12:42 +02:00
parent e56a573d85
commit 067148195b
2 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
controller/tileservers.php
View File

@ -136,6 +136,7 @@ $baseTileServers = [
'type' => 'overlay', 'type' => 'overlay',
'url' => 'http://{s}.tile.openstreetmap.fr/route500/{z}/{x}/{y}.png', 'url' => 'http://{s}.tile.openstreetmap.fr/route500/{z}/{x}/{y}.png',
'attribution' => '&copy, Tiles © <a href="http://www.openstreetmap.fr">OpenStreetMap France</a>', 'attribution' => '&copy, Tiles © <a href="http://www.openstreetmap.fr">OpenStreetMap France</a>',
'opacity' => '0.5',
'minzoom' => '1', 'minzoom' => '1',
'maxzoom' => '20', 'maxzoom' => '20',
), ),

46
js/gpxedit.js
View File

@ -209,7 +209,7 @@
var sattrib = $(this).attr('attribution'); var sattrib = $(this).attr('attribution');
var stransparent = ($(this).attr('transparent') === 'true'); var stransparent = ($(this).attr('transparent') === 'true');
var sopacity = $(this).attr('opacity'); var sopacity = $(this).attr('opacity');
if (sopacity !== '') { if (typeof sopacity !== typeof undefined && sopacity !== false && sopacity !== '') {
sopacity = parseFloat(sopacity); sopacity = parseFloat(sopacity);
} }
else { else {
@ -225,7 +225,7 @@
var stransparent = ($(this).attr('transparent') === 'true'); var stransparent = ($(this).attr('transparent') === 'true');
var sformat = $(this).attr('format') || 'image/png'; var sformat = $(this).attr('format') || 'image/png';
var sopacity = $(this).attr('opacity'); var sopacity = $(this).attr('opacity');
if (sopacity !== '') { if (typeof sopacity !== typeof undefined && sopacity !== false && sopacity !== '') {
sopacity = parseFloat(sopacity); sopacity = parseFloat(sopacity);
} }
else { else {
@ -267,15 +267,9 @@
var minz = parseInt($(this).attr('minzoom')); var minz = parseInt($(this).attr('minzoom'));
var maxz = parseInt($(this).attr('maxzoom')); var maxz = parseInt($(this).attr('maxzoom'));
var sattrib = $(this).attr('attribution'); var sattrib = $(this).attr('attribution');
var stransparent; var stransparent = ($(this).attr('transparent') === 'true');
if ($(this).attr('transparent') !== '') {
stransparent = ($(this).attr('transparent') === 'true');
}
else {
stransparent = true;
}
var sopacity = $(this).attr('opacity'); var sopacity = $(this).attr('opacity');
if (sopacity !== '') { if (typeof sopacity !== typeof undefined && sopacity !== false && sopacity !== '') {
sopacity = parseFloat(sopacity); sopacity = parseFloat(sopacity);
} }
else { else {
@ -288,21 +282,15 @@
var surl = $(this).attr('url'); var surl = $(this).attr('url');
var slayers = $(this).attr('layers') || ''; var slayers = $(this).attr('layers') || '';
var sversion = $(this).attr('version') || '1.1.1'; var sversion = $(this).attr('version') || '1.1.1';
var stransparent; var stransparent = ($(this).attr('transparent') === 'true');
if ($(this).attr('transparent') !== '') {
stransparent = ($(this).attr('transparent') === 'true');
}
else {
stransparent = true;
}
var sformat = $(this).attr('format') || 'image/png';
var sopacity = $(this).attr('opacity'); var sopacity = $(this).attr('opacity');
if (sopacity !== '') { if (typeof sopacity !== typeof undefined && sopacity !== false && sopacity !== '') {
sopacity = parseFloat(sopacity); sopacity = parseFloat(sopacity);
} }
else { else {
sopacity = 0.4; sopacity = 0.4;
} }
var sformat = $(this).attr('format') || 'image/png';
var sattrib = $(this).attr('attribution') || ''; var sattrib = $(this).attr('attribution') || '';
baseOverlays[sname] = new L.tileLayer.wms(surl, {layers: slayers, version: sversion, transparent: stransparent, opacity: sopacity, format: sformat, attribution: sattrib}); baseOverlays[sname] = new L.tileLayer.wms(surl, {layers: slayers, version: sversion, transparent: stransparent, opacity: sopacity, format: sformat, attribution: sattrib});
}); });
@ -312,15 +300,9 @@
var surl = $(this).attr('url'); var surl = $(this).attr('url');
var sminzoom = $(this).attr('minzoom') || '1'; var sminzoom = $(this).attr('minzoom') || '1';
var smaxzoom = $(this).attr('maxzoom') || '20'; var smaxzoom = $(this).attr('maxzoom') || '20';
var stransparent; var stransparent = ($(this).attr('transparent') === 'true');
if ($(this).attr('transparent') !== '') {
stransparent = ($(this).attr('transparent') === 'true');
}
else {
stransparent = true;
}
var sopacity = $(this).attr('opacity'); var sopacity = $(this).attr('opacity');
if (sopacity !== '') { if (typeof sopacity !== typeof undefined && sopacity !== false && sopacity !== '') {
sopacity = parseFloat(sopacity); sopacity = parseFloat(sopacity);
} }
else { else {
@ -337,16 +319,10 @@
var smaxzoom = $(this).attr('maxzoom') || '20'; var smaxzoom = $(this).attr('maxzoom') || '20';
var slayers = $(this).attr('layers') || ''; var slayers = $(this).attr('layers') || '';
var sversion = $(this).attr('version') || '1.1.1'; var sversion = $(this).attr('version') || '1.1.1';
var stransparent;
if ($(this).attr('transparent') !== '') {
stransparent = ($(this).attr('transparent') === 'true');
}
else {
stransparent = true;
}
var sformat = $(this).attr('format') || 'image/png'; var sformat = $(this).attr('format') || 'image/png';
var stransparent = ($(this).attr('transparent') === 'true');
var sopacity = $(this).attr('opacity'); var sopacity = $(this).attr('opacity');
if (sopacity !== '') { if (typeof sopacity !== typeof undefined && sopacity !== false && sopacity !== '') {
sopacity = parseFloat(sopacity); sopacity = parseFloat(sopacity);
} }
else { else {