Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #3699 from thinkpoop/master 

[mylocation] fix missing lon; add locate & find-marker buttons
master
Rob Pilling 2024-12-23 18:16:21 +00:00 committed by GitHub
parent 0662aa0234 8cb20f771c
commit bb1ac194a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
apps/mylocation/interface.html
View File

@ -2,6 +2,7 @@
<head> <head>
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.0.3/dist/leaflet.css" /> <link rel="stylesheet" href="https://unpkg.com/leaflet@1.0.3/dist/leaflet.css" />
<link rel="stylesheet" href="../../css/spectre.min.css"> <link rel="stylesheet" href="../../css/spectre.min.css">
<link rel="stylesheet" href="../../css/spectre-icons.min.css">
<link rel="stylesheet" href="https://unpkg.com/leaflet-geosearch@3.6.0/dist/geosearch.css"/> <link rel="stylesheet" href="https://unpkg.com/leaflet-geosearch@3.6.0/dist/geosearch.css"/>
</head> </head>
<style> <style>
@ -34,7 +35,9 @@
</div> </div>
<div id="controls"> <div id="controls">
<span id="select-hint">Click the map to select a location</span> <span id="select-hint">Click the map to select a location</span>
<button id="select" class="btn btn-primary" style="display:none">Save</button><br/> <button id="locate-me" class="btn" title="Locate me">&#x26ef;</button>
<button id="locate-marker" class="btn" style="display:none" title="Locate marker"><i class="icon icon-location"></i></button>
<button id="select" class="btn btn-primary" style="display:none" title="Save to device">Save</button><br/>
</div> </div>
<script src="../../core/lib/interface.js"></script> <script src="../../core/lib/interface.js"></script>
@ -76,18 +79,36 @@
map.removeLayer(marker); map.removeLayer(marker);
} }
marker = new L.marker(latlon).addTo(map); marker = new L.marker(latlon).addTo(map);
document.getElementById("select-hint").style.display="none"; document.getElementById("select-hint").style.display="none";
document.getElementById("select").style.display=""; document.getElementById("select").style.display="";
document.getElementById("locate-marker").style.display="";
} }
map.on('click', function(e){ map.on('click', function(e){
setPosition(e.latlng); setPosition(e.latlng);
}); });
function convertMapToFile(map) {
return {lat: map.lat, lon: map.lng};
}
function convertFileToMap(file) {
return {lat: file.lat, lng: file.lon};
}
document.getElementById("locate-me").addEventListener("click", function() {
map.locate({setView: true, maxZoom: 16, enableHighAccuracy:true});
});
document.getElementById("locate-marker").addEventListener("click", function() {
if (latlon && latlon.lng != null && latlon.lat != null) {
map.setView(latlon);
}
});
document.getElementById("select").addEventListener("click", function() { document.getElementById("select").addEventListener("click", function() {
let settings = {}; // {"lat":48.8566,"lon":2.3522,"location":"Paris"} let settings = convertMapToFile(latlon); // {"lat":48.8566,"lon":2.3522,"location":"Paris"}
settings.lat = latlon.lat;
settings.lon = latlon.lng;
settings.location = "custom"; settings.location = "custom";
Util.showModal("Saving..."); Util.showModal("Saving...");
Util.writeStorage("mylocation.json", JSON.stringify(settings), ()=>{ Util.writeStorage("mylocation.json", JSON.stringify(settings), ()=>{
@ -101,7 +122,7 @@
Util.readStorageJSON("mylocation.json", function(data) { Util.readStorageJSON("mylocation.json", function(data) {
if (data===undefined) return; // no file if (data===undefined) return; // no file
try { try {
setPosition(data); setPosition(convertFileToMap(data));
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} }