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

add personal overlay server management and put all base tile servers in a php file

merge-requests/1/head
Julien Veyssier 2017-05-14 17:57:53 +02:00
parent b88c03d054
commit 55c7a1cb72
8 changed files with 310 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
appinfo/database.xml
View File

@ -21,6 +21,13 @@
<notnull>true</notnull>
<length>64</length>
</field>
<field>
<name>type</name>
<type>text</type>
<default>tile</default>
<notnull>true</notnull>
<length>20</length>
</field>
<field>
<name>servername</name>
<type>text</type>

2
appinfo/info.xml
View File

@ -78,7 +78,7 @@ If you look for more powerfull GPX editors, take a look at :
<licence>AGPL</licence>
<summary>Simple GPX file editor</summary>
<author>Julien Veyssier</author>
<version>0.0.5</version>
<version>0.0.6</version>
<namespace>GpxEdit</namespace>
<documentation>
<user>https://gitlab.com/eneiluj/gpxedit-oc/wikis/userdoc</user>

18
controller/pagecontroller.php
View File

@ -138,7 +138,8 @@ class PageController extends Controller {
$userFolder = \OC::$server->getUserFolder();
$userfolder_path = $userFolder->getPath();
$tss = $this->getUserTileServers();
$tss = $this->getUserTileServers('tile');
$oss = $this->getUserTileServers('overlay');
// extra symbols
$dataDirPath = $this->config->getSystemValue('datadirectory').'/gpxedit';
@ -152,9 +153,12 @@ class PageController extends Controller {
// PARAMS to view
require_once('tileservers.php');
$params = [
'username'=>$this->userId,
'basetileservers'=>$baseTileServers,
'tileservers'=>$tss,
'overlayservers'=>$oss,
'extrasymbols'=>$extraSymbolList,
'gpxedit_version'=>$this->appVersion
];
@ -368,10 +372,18 @@ class PageController extends Controller {
return $response;
}
private function getUserTileServers(){
/*
* quote and choose string escape function depending on database used
*/
private function db_quote_escape_string($str){
return $this->dbconnection->quote($str);
}
private function getUserTileServers($type){
// custom tile servers management
$sqlts = 'SELECT servername, url FROM *PREFIX*gpxedit_tile_servers ';
$sqlts .= 'WHERE '.$this->dbdblquotes.'user'.$this->dbdblquotes.'=\''.$this->userId.'\';';
$sqlts .= 'WHERE '.$this->dbdblquotes.'user'.$this->dbdblquotes.'='.$this->db_quote_escape_string($this->userId).' ';
$sqlts .= 'AND type='.$this->db_quote_escape_string($type).';';
$req = $this->dbconnection->prepare($sqlts);
$req->execute();
$tss = Array();

130
controller/tileservers.php 100644
View File

@ -0,0 +1,130 @@
<?php
// list of base tile and overlay servers to be included in normal, public file, public folder and comparison pages
$baseTileServers = [
//Array(
// 'name' => '',
// 'type' => 'tile|overlay',
// 'url' => '',
// 'attribution' => '',
// 'minzoom' => '',
// 'maxzoom' => ''
//),
Array(
'name' => 'OpenStreetMap',
'type' => 'tile',
'url' => 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
'attribution' => 'Map data &copy; 2013 <a href="http://openstreetmap.org">OpenStreetMap</a> contributors',
'minzoom' => '1',
'maxzoom' => '18'
),
Array(
'name' => 'OpenCycleMap',
'type' => 'tile',
'url' => 'http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png',
'attribution' => '&copy; <a href="http://www.opencyclemap.org">OpenCycleMap</a>, &copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>',
'minzoom' => '1',
'maxzoom' => '18'
),
Array(
'name' => 'OpenStreetMap Transport',
'type' => 'tile',
'url' => 'http://a.tile2.opencyclemap.org/transport/{z}/{x}/{y}.png',
'attribution' => 'Map data &copy; 2013 <a href="http://openstreetmap.org">OpenStreetMap</a> contributors',
'minzoom' => '1',
'maxzoom' => '18'
),
Array(
'name' => 'ESRI Aerial',
'type' => 'tile',
'url' => 'https://server.arcgisonline.com/ArcGIS/rest/services' .
'/World_Imagery/MapServer/tile/{z}/{y}/{x}',
'attribution' => 'Tiles &copy; Esri &mdash; Source: Esri, i-cubed, ' .
'USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the' .
' GIS User Community',
'minzoom' => '1',
'maxzoom' => '18'
),
Array(
'name' => 'ESRI Topo with relief',
'type' => 'tile',
'url' => 'https://server.arcgisonline.com/ArcGIS/rest/services/World' .
'_Topo_Map/MapServer/tile/{z}/{y}/{x}',
'attribution' => 'Tiles &copy; Esri &mdash; Esri, DeLorme, NAVTEQ, ' .
'TomTom, Intermap, iPC, USGS, FAO, NPS, NRCAN, GeoBase, Kadaster NL, Ord' .
'nance Survey, Esri Japan, METI, Esri China (Hong Kong), and the GIS User' .
' Community',
'minzoom' => '1',
'maxzoom' => '18'
),
Array(
'name' => 'Hike & bike',
'type' => 'tile',
'url' => 'http://a.tiles.wmflabs.org/hikebike/{z}/{x}/{y}.png',
'attribution' => 'Map data &copy; 2013 <a href="http://openstreetmap.org">OpenStreetMap</a> contributors',
'minzoom' => '1',
'maxzoom' => '18'
),
Array(
'name' => 'OpenStreetMap France',
'type' => 'tile',
'url' => 'https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png',
'attribution' => 'Map data &copy; 2013 <a href="http://openstreetmap.org">OpenStreetMap</a> contributors',
'minzoom' => '',
'maxzoom' => ''
),
Array(
'name' => 'IGN France',
'type' => 'tile',
'url' => 'http://wxs.ign.fr/ljthe66m795pr2v2g8p7faxt/wmts?LAYER=GEOGRAPHICALGRIDSYSTEMS.MAPS' .
'&EXCEPTIONS=text/xml&FORMAT=image/jpeg' .
'&SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetTile&STYLE=normal' +
'&TILEMATRIXSET=PM&TILEMATRIX={z}&TILECOL={x}&TILEROW={y}',
'attribution' => '&copy; <a href="http://www.ign.fr/">IGN-France</a>',
'minzoom' => '1',
'maxzoom' => '18'
),
Array(
'name' => 'Dark',
'type' => 'tile',
'url' => 'http://a.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png',
'attribution' => '&copy; Map tiles by CartoDB, under CC BY 3.0. Data by' .
' OpenStreetMap, under ODbL.',
'minzoom' => '1',
'maxzoom' => '18'
),
Array(
'name' => 'WaterColor',
'type' => 'tile',
'url' => 'http://{s}.tile.stamen.com/watercolor/{z}/{x}/{y}.jpg',
'attribution' => '<a href="http://leafletjs.com" title="A JS library' .
' for interactive maps">Leaflet</a> | © Map tiles by <a href="http://stamen' .
'.com">Stamen Design</a>, under <a href="http://creativecommons.org/license' .
's/by/3.0">CC BY 3.0</a>, Data by <a href="http://openstreetmap.org">OpenSt' .
'reetMap</a>, under <a href="http://creativecommons.org/licenses/by-sa/3.0"' .
'>CC BY SA</a>.',
'minzoom' => '1',
'maxzoom' => '18'
),
Array(
'name' => 'Toner',
'type' => 'tile|overlay',
'url' => 'http://{s}.tile.stamen.com/toner/{z}/{x}/{y}.jpg',
'attribution' => '<a href="http://leafletjs.com" title="A JS library' .
' for interactive maps">Leaflet</a> | © Map tiles by <a href="http://stamen' .
'.com">Stamen Design</a>, under <a href="http://creativecommons.org/license' .
's/by/3.0">CC BY 3.0</a>, Data by <a href="http://openstreetmap.org">OpenSt' .
'reetMap</a>, under <a href="http://creativecommons.org/licenses/by-sa/3.0"' .
'>CC BY SA</a>.',
'minzoom' => '1',
'maxzoom' => '18'
),
Array(
'name' => 'OsmFr Route500',
'type' => 'overlay',
'url' => 'http://{s}.tile.openstreetmap.fr/route500/{z}/{x}/{y}.png',
'attribution' => '&copy, Tiles © <a href="http://www.openstreetmap.fr">OpenStreetMap France</a>',
'minzoom' => '1',
'maxzoom' => '20'
),
];
?>

27
controller/utilscontroller.php
View File

@ -203,11 +203,11 @@ class UtilsController extends Controller {
* Add one tile server to the DB for current user
* @NoAdminRequired
*/
public function addTileServer($servername, $serverurl) {
public function addTileServer($servername, $serverurl, $type) {
// first we check it does not already exist
$sqlts = 'SELECT servername FROM *PREFIX*gpxedit_tile_servers ';
$sqlts .= 'WHERE '.$this->dbdblquotes.'user'.$this->dbdblquotes.'=\''.$this->userId.'\' ';
$sqlts .= 'AND servername=\''.$servername.'\' ';
$sqlts .= 'AND servername='.$this->db_quote_escape_string($servername).' AND type='.$this->db_quote_escape_string($type).' ';
$req = $this->dbconnection->prepare($sqlts);
$req->execute();
$ts = null;
@ -220,10 +220,11 @@ class UtilsController extends Controller {
// then if not, we insert it
if ($ts === null){
$sql = 'INSERT INTO *PREFIX*gpxedit_tile_servers';
$sql .= ' ('.$this->dbdblquotes.'user'.$this->dbdblquotes.', servername, url) ';
$sql .= ' ('.$this->dbdblquotes.'user'.$this->dbdblquotes.', type, servername, url) ';
$sql .= 'VALUES (\''.$this->userId.'\',';
$sql .= '\''.$servername.'\',';
$sql .= '\''.$serverurl.'\');';
$sql .= ''.$this->db_quote_escape_string($type).',';
$sql .= ''.$this->db_quote_escape_string($servername).',';
$sql .= ''.$this->db_quote_escape_string($serverurl).');';
$req = $this->dbconnection->prepare($sql);
$req->execute();
$req->closeCursor();
@ -250,11 +251,10 @@ class UtilsController extends Controller {
* Delete one tile server entry from DB for current user
* @NoAdminRequired
*/
public function deleteTileServer($servername) {
public function deleteTileServer($servername, $type) {
$sqldel = 'DELETE FROM *PREFIX*gpxedit_tile_servers ';
$sqldel .= 'WHERE '.$this->dbdblquotes.'user'.$this->dbdblquotes.'=\''.$this->userId.'\' AND servername=\'';
$sqldel .= $servername.'\';';
//$sqldel .= 'WHERE user=\''.$this->userId.'\';';
$sqldel .= 'WHERE '.$this->dbdblquotes.'user'.$this->dbdblquotes.'='.$this->db_quote_escape_string($this->userId).' AND servername=';
$sqldel .= $this->db_quote_escape_string($servername).' AND type='.$this->db_quote_escape_string($type).';';
$req = $this->dbconnection->prepare($sqldel);
$req->execute();
$req->closeCursor();
@ -328,7 +328,7 @@ class UtilsController extends Controller {
*/
public function getOptionsValues($optionsValues) {
$sqlov = 'SELECT jsonvalues FROM *PREFIX*gpxedit_options_values ';
$sqlov .= 'WHERE '.$this->dbdblquotes.'user'.$this->dbdblquotes.'=\''.$this->userId.'\' ;';
$sqlov .= 'WHERE '.$this->dbdblquotes.'user'.$this->dbdblquotes.'='.$this->db_quote_escape_string($this->userId).' ;';
$req = $this->dbconnection->prepare($sqlov);
$req->execute();
$ov = '{}';
@ -350,4 +350,11 @@ class UtilsController extends Controller {
return $response;
}
/*
* quote and choose string escape function depending on database used
*/
private function db_quote_escape_string($str){
return $this->dbconnection->quote($str);
}
}

3
css/gpxedit.css
View File

@ -317,7 +317,8 @@ h3 {
#clean_results ul{
list-style-type:disc;
}
#tileserveradd, #tileserveradd input{
#tileserveradd, #tileserveradd input,
#overlayserveradd, #overlayserveradd input{
width:100%;
}

265
js/gpxedit.js
View File

@ -192,116 +192,23 @@
default_layer = decodeURIComponent(layer);
}
// get url from key and layer type
function geopUrl(key, layer, format) {
return 'http://wxs.ign.fr/' + key + '/wmts?LAYER=' + layer +
'&EXCEPTIONS=text/xml&FORMAT=' + (format?format:'image/jpeg') +
'&SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetTile&STYLE=normal' +
'&TILEMATRIXSET=PM&TILEMATRIX={z}&TILECOL={x}&TILEROW={y}' ;
}
// change it if you deploy GPXEDIT
var API_KEY = 'ljthe66m795pr2v2g8p7faxt';
var ign = new L.tileLayer ( geopUrl(API_KEY,'GEOGRAPHICALGRIDSYSTEMS.MAPS'),
{ attribution: '&copy; <a href="http://www.ign.fr/">IGN-France</a>',
maxZoom: 18
});
var osmfr2 = new L.TileLayer('https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png', {
minZoom: 0,
maxZoom: 13,
attribution: 'Map data &copy; 2013 <a href="http://openstreetmap.org">OpenStreetMap</a> contributors'
});
var osmUrl = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
var osmAttribution = 'Map data &copy; 2013 <a href="http://openstreetmap' +
'.org">OpenStreetMap</a> contributors';
var osm = new L.TileLayer(osmUrl, {maxZoom: 18, attribution: osmAttribution});
var baseLayers = {};
var osmfrUrl = 'http://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png';
var osmfr = new L.TileLayer(osmfrUrl,
{maxZoom: 20, attribution: osmAttribution});
var osmfr2 = new L.TileLayer(osmfrUrl,
{minZoom: 0, maxZoom: 13, attribution: osmAttribution});
var openmapsurferUrl = 'http://openmapsurfer.uni-hd.de/tiles/roads/' +
'x={x}&y={y}&z={z}';
var openmapsurferAttribution = 'Imagery from <a href="http://giscience.uni' +
'-hd.de/">GIScience Research Group @ University of Heidelberg</a> &mdash; ' +
'Map data &copy; <a href="http://www.openstreetmap.org/copyright">' +
'OpenStreetMap</a>';
var openmapsurfer = new L.TileLayer(openmapsurferUrl,
{maxZoom: 18, attribution: openmapsurferAttribution});
var transportUrl = 'http://a.tile2.opencyclemap.org/transport/{z}/{x}/{y}.' +
'png';
var transport = new L.TileLayer(transportUrl,
{maxZoom: 18, attribution: osmAttribution});
var pisteUrl = 'http://tiles.openpistemap.org/nocontours/{z}/{x}/{y}.png';
var piste = new L.TileLayer(pisteUrl,
{maxZoom: 18, attribution: osmAttribution});
var hikebikeUrl = 'http://toolserver.org/tiles/hikebike/{z}/{x}/{y}.png';
var hikebike = new L.TileLayer(hikebikeUrl,
{maxZoom: 18, attribution: osmAttribution});
var osmCycleUrl = 'http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png';
var osmCycleAttrib = '&copy; <a href="http://www.opencyclemap.org">' +
'OpenCycleMap</a>, &copy; <a href="http://www.openstreetmap.org/copyright">' +
'OpenStreetMap</a>';
var osmCycle = new L.TileLayer(osmCycleUrl,
{maxZoom: 18, attribution: osmCycleAttrib});
var darkUrl = 'http://a.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png';
var darkAttrib = '&copy; Map tiles by CartoDB, under CC BY 3.0. Data by' +
' OpenStreetMap, under ODbL.';
var dark = new L.TileLayer(darkUrl, {maxZoom: 18, attribution: darkAttrib});
var esriTopoUrl = 'https://server.arcgisonline.com/ArcGIS/rest/services/World' +
'_Topo_Map/MapServer/tile/{z}/{y}/{x}';
var esriTopoAttrib = 'Tiles &copy; Esri &mdash; Esri, DeLorme, NAVTEQ, ' +
'TomTom, Intermap, iPC, USGS, FAO, NPS, NRCAN, GeoBase, Kadaster NL, Ord' +
'nance Survey, Esri Japan, METI, Esri China (Hong Kong), and the GIS User' +
' Community';
var esriTopo = new L.TileLayer(esriTopoUrl,
{maxZoom: 18, attribution: esriTopoAttrib});
var esriAerialUrl = 'https://server.arcgisonline.com/ArcGIS/rest/services' +
'/World_Imagery/MapServer/tile/{z}/{y}/{x}';
var esriAerialAttrib = 'Tiles &copy; Esri &mdash; Source: Esri, i-cubed, ' +
'USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the' +
' GIS User Community';
var esriAerial = new L.TileLayer(esriAerialUrl,
{maxZoom: 18, attribution: esriAerialAttrib});
var tonerUrl = 'http://{s}.tile.stamen.com/toner/{z}/{x}/{y}.jpg';
var stamenAttribution = '<a href="http://leafletjs.com" title="A JS library' +
' for interactive maps">Leaflet</a> | © Map tiles by <a href="http://stamen' +
'.com">Stamen Design</a>, under <a href="http://creativecommons.org/license' +
's/by/3.0">CC BY 3.0</a>, Data by <a href="http://openstreetmap.org">OpenSt' +
'reetMap</a>, under <a href="http://creativecommons.org/licenses/by-sa/3.0"' +
'>CC BY SA</a>.';
var toner = new L.TileLayer(tonerUrl,
{maxZoom: 18, attribution: stamenAttribution});
var watercolorUrl = 'http://{s}.tile.stamen.com/watercolor/{z}/{x}/{y}.jpg';
var watercolor = new L.TileLayer(watercolorUrl,
{maxZoom: 18, attribution: stamenAttribution});
var routeUrl = 'http://{s}.tile.openstreetmap.fr/route500/{z}/{x}/{y}.png';
var routeAttrib = '&copy, Tiles © <a href="http://www.openstreetmap.fr">O' +
'penStreetMap France</a>';
var route = new L.TileLayer(routeUrl,
{minZoom: 1, maxZoom: 20, attribution: routeAttrib});
var baseLayers = {
'OpenStreetMap': osm,
'OpenCycleMap': osmCycle,
'IGN France': ign,
'OpenMapSurfer Roads': openmapsurfer,
'Hike & bike': hikebike,
'OSM Transport': transport,
'ESRI Aerial': esriAerial,
'ESRI Topo with relief': esriTopo,
'Dark': dark,
'Toner': toner,
'Watercolor': watercolor,
'OpenStreetMap France': osmfr
};
// add base layers
$('#basetileservers li[type=tile]').each(function() {
var sname = $(this).attr('name');
var surl = $(this).attr('url');
var minz = parseInt($(this).attr('minzoom'));
var maxz = parseInt($(this).attr('maxzoom'));
var sattrib = $(this).attr('attribution');
baseLayers[sname] = new L.TileLayer(surl, {minZoom: minz, maxZoom: maxz, attribution: sattrib});
});
// add custom layers
$('#tileserverlist li').each(function() {
var sname = $(this).attr('name');
@ -310,25 +217,29 @@
{maxZoom: 18, attribution: 'custom tile server'});
});
gpxedit.baseLayers = baseLayers;
var baseOverlays = {
'OsmFr Route500': route,
'OpenPisteMap Relief':
L.tileLayer('http://tiles2.openpistemap.org/landshaded/{z}/{x}/{y}.png',
{
attribution: '&copy, Tiles © <a href="http://www.o' +
'penstreetmap.fr">OpenStreetMap France</a>',
minZoom: 1,
maxZoom: 15
}
),
'OpenPisteMap pistes': piste
};
var layerlist = [];
var baseOverlays = {};
// add base overlays
$('#basetileservers li[type=overlay]').each(function() {
var sname = $(this).attr('name');
var surl = $(this).attr('url');
var minz = parseInt($(this).attr('minzoom'));
var maxz = parseInt($(this).attr('maxzoom'));
var sattrib = $(this).attr('attribution');
baseOverlays[sname] = new L.TileLayer(surl, {minZoom: minz, maxZoom: maxz, attribution: sattrib});
});
// add custom overlays
$('#overlayserverlist li').each(function() {
var sname = $(this).attr('name');
var surl = $(this).attr('title');
baseOverlays[sname] = new L.TileLayer(surl,
{maxZoom: 18, attribution: 'custom overlay server'});
});
gpxedit.overlayLayers = baseOverlays;
gpxedit.map = new L.Map('map', {
zoomControl: true,
layers: layerlist,
});
L.control.scale({metric: true, imperial: true, position: 'topleft'})
@ -347,6 +258,7 @@
if (! baseLayers.hasOwnProperty(default_layer)) {
default_layer = 'OpenStreetMap';
}
console.log(baseLayers);
gpxedit.map.addLayer(baseLayers[default_layer]);
gpxedit.activeLayers = L.control.activeLayers(baseLayers, baseOverlays);
@ -1128,10 +1040,11 @@
});
}
function deleteTileServer(li) {
function deleteTileServer(li, type) {
var sname = li.attr('name');
var req = {
servername: sname
servername: sname,
type: type
};
var url = OC.generateUrl('/apps/gpxedit/deleteTileServer');
$.ajax({
@ -1140,54 +1053,54 @@
data: req,
async: true
}).done(function (response) {
//alert(response.done);
if (response.done) {
li.fadeOut('slow', function() {
li.remove();
});
var activeLayerName = gpxedit.activeLayers.getActiveBaseLayer().name;
// if we delete the active layer, first select another
if (activeLayerName === sname) {
$('input.leaflet-control-layers-selector').first().click();
if (type === 'tile') {
var activeLayerName = gpxedit.activeLayers.getActiveBaseLayer().name;
// if we delete the active layer, first select another
if (activeLayerName === sname) {
$('input.leaflet-control-layers-selector').first().click();
}
gpxedit.activeLayers.removeLayer(gpxedit.baseLayers[sname]);
delete gpxedit.baseLayers[sname];
}
gpxedit.activeLayers.removeLayer(gpxedit.baseLayers[sname]);
delete gpxedit.baseLayers[sname];
OC.Notification.showTemporary(
t('gpxedit', 'Tile server "{ts}" has been deleted', {ts: sname})
);
else {
gpxedit.activeLayers.removeLayer(gpxedit.overlayLayers[sname]);
delete gpxedit.overlayLayers[sname];
}
OC.Notification.showTemporary(t('gpxedit', 'Tile server "{ts}" has been deleted', {ts: sname}));
}
else{
OC.Notification.showTemporary(
t('gpxedit', 'Failure on tile server "{ts}" deletion', {ts: sname})
);
OC.Notification.showTemporary(t('gpxedit', 'Failed to delete tile server "{ts}"', {ts: sname}));
}
}).always(function() {
}).fail(function() {
OC.Notification.showTemporary(
t('gpxedit', 'Failure on tile server "{ts}" deletion', {ts: sname})
);
OC.Notification.showTemporary(t('gpxedit', 'Failed to delete tile server "{ts}"', {ts: sname}));
});
}
function addTileServer() {
var sname = $('#tileservername').val();
var surl = $('#tileserverurl').val();
function addTileServer(type) {
var sname = $('#'+type+'servername').val();
var surl = $('#'+type+'serverurl').val();
if (sname === '' || surl === '') {
OC.dialogs.alert(t('gpxedit', 'Server name or server url should not be empty'),
t('gpxedit', 'Impossible to add tile server'));
return;
}
if ($('#tileserverlist ul li[name="' + sname + '"]').length > 0) {
if ($('#'+type+'serverlist ul li[name="' + sname + '"]').length > 0) {
OC.dialogs.alert(t('gpxedit', 'A server with this name already exists'),
t('gpxedit', 'Impossible to add tile server'));
return;
}
$('#tileservername').val('');
$('#tileserverurl').val('');
$('#'+type+'servername').val('');
$('#'+type+'serverurl').val('');
var req = {
servername: sname,
serverurl: surl
serverurl: surl,
type: type
};
var url = OC.generateUrl('/apps/gpxedit/addTileServer');
$.ajax({
@ -1196,41 +1109,39 @@
data: req,
async: true
}).done(function (response) {
//alert(response.done);
if (response.done) {
$('#tileserverlist ul').prepend(
'<li style="display:none;" name="' + sname + '" title="' +
surl + '">' + sname + ' <button>' +
$('#'+type+'serverlist ul').prepend(
'<li style="display:none;" name="' + escapeHTML(sname) +
'" title="' + escapeHTML(surl) + '">' +
escapeHTML(sname) + ' <button>' +
'<i class="fa fa-trash" aria-hidden="true" style="color:red;"></i> ' +
t('gpxedit', 'Delete') +
'</button></li>'
);
$('#tileserverlist ul li[name="' + sname + '"]').fadeIn('slow');
$('#'+type+'serverlist ul li[name="' + sname + '"]').fadeIn('slow');
// add tile server in leaflet control
var newlayer = new L.TileLayer(
surl,
{
maxZoom: 18,
attribution: 'custom tile server'
}
);
gpxedit.activeLayers.addBaseLayer(newlayer, sname);
gpxedit.baseLayers[sname] = newlayer;
OC.Notification.showTemporary(
t('gpxedit', 'Tile server "{ts}" has been added', {ts: sname})
);
if (type === 'tile') {
// add tile server in leaflet control
var newlayer = new L.TileLayer(surl,
{maxZoom: 18, attribution: 'custom '+type+' server'});
gpxedit.activeLayers.addBaseLayer(newlayer, sname);
gpxedit.baseLayers[sname] = newlayer;
}
else {
// add tile server in leaflet control
var newlayer = new L.TileLayer(surl,
{maxZoom: 18, attribution: 'custom '+type+' server'});
gpxedit.activeLayers.addOverlay(newlayer, sname);
gpxedit.overlayLayers[sname] = newlayer;
}
OC.Notification.showTemporary(t('gpxedit', 'Tile server "{ts}" has been added', {ts: sname}));
}
else{
OC.Notification.showTemporary(
t('gpxedit', 'Failure on tile server "{ts}" addition', {ts: sname})
);
OC.Notification.showTemporary(t('gpxedit', 'Failed to add tile server "{ts}"', {ts: sname}));
}
}).always(function() {
}).fail(function() {
OC.Notification.showTemporary(
t('gpxedit', 'Failure on tile server "{ts}" addition', {ts: sname})
);
OC.Notification.showTemporary(t('gpxedit', 'Failed to add tile server "{ts}"', {ts: sname}));
});
}
@ -1575,10 +1486,16 @@
// Custom tile server management
$('body').on('click', '#tileserverlist button', function(e) {
deleteTileServer($(this).parent());
deleteTileServer($(this).parent(), 'tile');
});
$('#addtileserver').click(function() {
addTileServer();
addTileServer('tile');
});
$('body').on('click', '#overlayserverlist button', function(e) {
deleteTileServer($(this).parent(), 'overlay');
});
$('#addoverlayserver').click(function() {
addTileServer('overlay');
});
$('body').on('change', 'select[role=symbol]', function() {

47
templates/gpxcontent.php
View File

@ -79,6 +79,23 @@ foreach($_['extrasymbols'] as $symbol){
echo '</li>';
}
echo '</ul>'."\n";
echo '<ul id="basetileservers" style="display:none">';
foreach($_['basetileservers'] as $ts){
echo '<li name="';
p($ts['name']);
echo '" type="';
p($ts['type']);
echo '" url="';
p($ts['url']);
echo '" minzoom="';
p($ts['minzoom']);
echo '" maxzoom="';
p($ts['maxzoom']);
echo '" attribution="';
p($ts['attribution']);
echo '"></li>';
}
echo '</ul>'."\n";
?>
</div>
@ -130,6 +147,36 @@ if (count($_['tileservers']) > 0){
echo '</button></li>';
}
}
?>
</ul>
</div>
<hr/>
<h3 class="sectiontitle"><?php p($l->t('Custom overlay servers')); ?></h3>
<div id="overlayserveradd">
<?php p($l->t('Server name (for example \'my custom server\')')); ?> :
<input type="text" id="overlayservername"><br/>
<?php p($l->t('Server url (\'http://overlay.server.org/cycle/{z}/{x}/{y}.png\')')); ?> :
<input type="text" id="overlayserverurl"><br/>
<button id="addoverlayserver"><i class="fa fa-plus-circle" aria-hidden="true" style="color:green;"></i> <?php p($l->t('Add')); ?></button>
</div>
<br/>
<div id="overlayserverlist">
<h2><?php p($l->t('Your servers')); ?></h2>
<ul class="disclist">
<?php
if (count($_['overlayservers']) > 0){
foreach($_['overlayservers'] as $name=>$url){
echo '<li name="';
p($name);
echo '" title="';
p($url);
echo '">';
p($name);
echo '<button><i class="fa fa-trash" aria-hidden="true" style="color:red;"></i> ';
p($l->t('Delete'));
echo '</button></li>';
}
}
?>
</ul>
</div>