diff --git a/css/gpxedit.css b/css/gpxedit.css index 4049e09..6cd9950 100644 --- a/css/gpxedit.css +++ b/css/gpxedit.css @@ -56,7 +56,7 @@ div#logo p{ margin-bottom: 0px; } div#logo { - background-image: url('images/gpxpod.png'); + background-image: url('images/gpxedit.png'); width: 65px; background-size: 65px 65px; background-repeat: no-repeat; diff --git a/css/images/gpxedit.png b/css/images/gpxedit.png new file mode 100644 index 0000000..09d1ac0 Binary files /dev/null and b/css/images/gpxedit.png differ diff --git a/css/images/gpxpod.ico b/css/images/gpxpod.ico deleted file mode 100644 index 9a75db7..0000000 Binary files a/css/images/gpxpod.ico and /dev/null differ diff --git a/css/images/gpxpod.png b/css/images/gpxpod.png deleted file mode 100644 index 8f4d542..0000000 Binary files a/css/images/gpxpod.png and /dev/null differ diff --git a/img/app.svg b/img/app.svg index e295509..2054a74 100644 --- a/img/app.svg +++ b/img/app.svg @@ -19,7 +19,7 @@ enable-background="new 0 0 512 512" xml:space="preserve" inkscape:version="0.91 r13725" - sodipodi:docname="marker.svg">image/svg+xml \ No newline at end of file diff --git a/img/favicon.ico b/img/favicon.ico index 47cdad3..43630b3 100644 Binary files a/img/favicon.ico and b/img/favicon.ico differ diff --git a/img/favicon.png b/img/favicon.png index d152928..4c2ddb7 100644 Binary files a/img/favicon.png and b/img/favicon.png differ diff --git a/js/gpxedit.js b/js/gpxedit.js index 9b2b724..8dfbcbf 100644 --- a/js/gpxedit.js +++ b/js/gpxedit.js @@ -24,7 +24,7 @@ function load_map() { +'&SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetTile&STYLE=normal' +'&TILEMATRIXSET=PM&TILEMATRIX={z}&TILECOL={x}&TILEROW={y}' ; } - // change it if you deploy GPXPOD + // change it if you deploy GPXEDIT var API_KEY = 'ljthe66m795pr2v2g8p7faxt'; var ign = new L.tileLayer ( geopUrl(API_KEY,'GEOGRAPHICALGRIDSYSTEMS.MAPS'), { attribution:'© IGN-France', @@ -172,7 +172,7 @@ function load_map() { gpxedit.minimapControl = new L.Control.MiniMap( osmfr2, - { toggleDisplay: true, position:'bottomleft' } + { toggleDisplay: true, position:'bottomright' } ).addTo(gpxedit.map); gpxedit.minimapControl._toggleDisplayButtonClicked(); @@ -184,7 +184,7 @@ function load_map() { gpxedit.map.addLayer(gpxedit.editableLayers); var options = { - position: 'topright', + position: 'bottomleft', draw: { polyline: { shapeOptions: { @@ -396,9 +396,32 @@ function parseGpx(xml){ }); } +/* + * get key events + */ +function checkKey(e){ + e = e || window.event; + var kc = e.keyCode; + console.log(kc); + + if (kc === 0 || kc === 176 || kc === 192){ + e.preventDefault(); + gpxedit.searchControl._toggle(); + } + if (kc === 161 || kc === 223){ + e.preventDefault(); + gpxedit.minimapControl._toggleDisplayButtonClicked(); + } + if (kc === 60 || kc === 220){ + e.preventDefault(); + $('#sidebar').toggleClass('collapsed'); + } +} + $(document).ready(function(){ gpxedit.username = $('p#username').html(); load_map(); + document.onkeydown = checkKey; $('body').on('click','button.popupOkButton', function(e) { var id = parseInt($(this).attr('layerid')); @@ -419,7 +442,7 @@ $(document).ready(function(){ alert(gpxText); }); - parseGpx(' droit yeye unnamedplop '); + parseGpx(' droitplop\nplap yeye unnamedplop '); }); diff --git a/templates/gpxcontent.php b/templates/gpxcontent.php index 36338b1..37042a7 100644 --- a/templates/gpxcontent.php +++ b/templates/gpxcontent.php @@ -2,7 +2,6 @@
    • -
@@ -11,7 +10,7 @@