Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mylocation] fix missing lon; add locate & find-marker buttons #3699

Merged
merged 4 commits into from
Dec 23, 2024
Merged

[mylocation] fix missing lon; add locate & find-marker buttons #3699

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f28847a
[mylocation] fix saving without lon; center map on marker
thinkpoop Dec 22, 2024
8425b44
[mylocation] add locate & find marker buttons
thinkpoop Dec 22, 2024
12ef79e
[mylocation] Update icons to match standard better
thinkpoop Dec 22, 2024
8cb20f7
[mylocation] add title to save button; tweak button ids; add null che…
thinkpoop Dec 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions apps/mylocation/interface.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<head>
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.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/[email protected]/dist/geosearch.css"/>
</head>
<style>
Expand Down Expand Up @@ -34,7 +35,9 @@
</div>
<div id="controls">
<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>

<script src="../../core/lib/interface.js"></script>
Expand Down Expand Up @@ -76,18 +79,36 @@
map.removeLayer(marker);
}
marker = new L.marker(latlon).addTo(map);

document.getElementById("select-hint").style.display="none";
document.getElementById("select").style.display="";
document.getElementById("locate-marker").style.display="";
}

map.on('click', function(e){
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() {
let settings = {}; // {"lat":48.8566,"lon":2.3522,"location":"Paris"}
settings.lat = latlon.lat;
settings.lon = latlon.lng;
let settings = convertMapToFile(latlon); // {"lat":48.8566,"lon":2.3522,"location":"Paris"}
settings.location = "custom";
Util.showModal("Saving...");
Util.writeStorage("mylocation.json", JSON.stringify(settings), ()=>{
Expand All @@ -101,7 +122,7 @@
Util.readStorageJSON("mylocation.json", function(data) {
if (data===undefined) return; // no file
try {
setPosition(data);
setPosition(convertFileToMap(data));
} catch (e) {
console.error(e);
}
Expand Down
Loading