scifijunkie/pwnagotchi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #803 from xenDE/patch-7

Browse Source 
webgpsmap: load extern resources over https, show current position on…
This commit is contained in:
Simone Margaritelli 2020-01-19 14:18:43 +01:00 committed by GitHub
commit 23f09bc4b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pwnagotchi/plugins/default/webgpsmap.html
View File

@ -3,10 +3,10 @@
<meta http-equiv="Content-Type" content="text/xml; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/xml; charset=utf-8" />
<title>GPS MAP</title> <title>GPS MAP</title>
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.5.1/dist/leaflet.css"/> <link rel="stylesheet" href="https://unpkg.com/leaflet@1.5.1/dist/leaflet.css"/>
<link rel="stylesheet" type="text/css" href="http://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.4.1/MarkerCluster.css" /> <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.4.1/MarkerCluster.css" />
<link rel="stylesheet" type="text/css" href="http://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.4.1/MarkerCluster.Default.css" /> <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.4.1/MarkerCluster.Default.css" />
<script type='text/javascript' src="https://unpkg.com/leaflet@1.5.1/dist/leaflet.js"></script> <script type='text/javascript' src="https://unpkg.com/leaflet@1.5.1/dist/leaflet.js"></script>
<script type='text/javascript' src='http://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.4.1/leaflet.markercluster.js'></script> <script type='text/javascript' src='https://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/1.4.1/leaflet.markercluster.js'></script>
<style type="text/css"> <style type="text/css">
/* for map */ /* for map */
html, body { height: 100%; width: 100%; margin:0; background-color:#000;} html, body { height: 100%; width: 100%; margin:0; background-color:#000;}
@ -270,16 +270,18 @@
positionsLoaded = true; positionsLoaded = true;
drawPositions(); drawPositions();
}); });
// get current position and set marker in interval // get current position and set marker in interval if https request
var myLocationMarker = {}; if (location.protocol === 'https:') {
function onLocationFound(e) { var myLocationMarker = {};
if (myLocationMarker != undefined) { function onLocationFound(e) {
mymap.removeLayer(myLocationMarker); if (myLocationMarker != undefined) {
}; mymap.removeLayer(myLocationMarker);
myLocationMarker = L.marker(e.latlng).addTo(mymap); };
setTimeout(function(){ mymap.locate(); }, 30000); myLocationMarker = L.marker(e.latlng).addTo(mymap);
setTimeout(function(){ mymap.locate(); }, 30000);
}
mymap.on('locationfound', onLocationFound);
mymap.locate({setView: true});
} }
mymap.on('locationfound', onLocationFound);
mymap.locate({setView: true});
</script> </script>
</body></html> </body></html>