nilix/onyx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

detect location if home not set and offer to set home, add go-home button

Browse source
This commit is contained in:
Iris Lightshard 2022-08-14 22:29:03 -06:00
parent 3f399947f1
commit d42b5fcd3d
Signed by: Iris Lightshard
GPG key ID: 3B7FBC22144E6398
4 changed files with 111 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/40-handlers.ts
View file

@ -309,4 +309,24 @@ class MapHandler {
}
}
}
static setHome(e: any): void {
const self = MapHandler.instance;
if (self) {
localStorage.setItem("home", JSON.stringify(self.map.getCenter()));
}
}
static goHome(e: any): void {
const self = MapHandler.instance;
if (self) {
const homeData = localStorage.getItem("home");
if (homeData) {
const home = <Point>JSON.parse(homeData);
if (home) {
self.map.setView(home, 13);
}
}
}
}
}

37
src/99-onyx-scry.ts
View file

@ -1,7 +1,8 @@
function init(): void {
let overlays: OverlayState = OverlayState.load() ?? new OverlayState();
const map = L.map('map').setView([35.6653, -105.9507], 13);
const map = L.map('map').fitWorld();
// old default zoom was 13
const streetLayer = TileLayerWrapper.constructLayer(
"streetLayer",
@ -36,6 +37,7 @@ function init(): void {
MapHandler.init(map, overlays, TileLayerWrapper.layers, modals);
MapHandler.setButtonClick("home-btn", MapHandler.goHome);
MapHandler.setButtonClick("addPoint-btn", MapHandler.markerCollect);
MapHandler.setButtonClick("addCircle-btn", MapHandler.circleCollect);
MapHandler.setButtonClick("addPolygon-btn", MapHandler.polygonCollect);
@ -43,8 +45,41 @@ function init(): void {
MapHandler.setButtonClick("save-btn", MapHandler.overlaySave);
MapHandler.setButtonClick("clear-btn", MapHandler.overlayClear);
MapHandler.setButtonClick("restore-btn", MapHandler.overlayReset);
MapHandler.setButtonClick("menu-btn", ()=>{});
MapHandler.setButtonClick("tiles-btn", MapHandler.swapTiles);
map.on("locationfound", ()=> {
const okCancel = modals.okCancel;
okCancel.setMsg("Set Home to current location?");
const okBtn = okCancel.okBtn();
if (okBtn) {
okBtn.onclick = (e: any) => {
okCancel.setVisible(false);
MapHandler.setHome(null);
}
}
const cancelBtn = okCancel.cancelBtn();
if (cancelBtn) {
cancelBtn.onclick = () => {
okCancel.setVisible(false);
}
}
});
map.on("locationerror", ()=> {
const info = modals.info;
info.setMsg("Could not get location data");
info.setVisible(true);
});
const homeData = localStorage.getItem("home");
if (homeData) {
const home = <Point>JSON.parse(homeData);
map.setView(home, 13);
} else {
map.locate({setView: true, maxZoom: 13});
}
}
init();

3
static/index.html
View file

@ -18,11 +18,12 @@
<div id="map"></div>
<div id="mapControls">
<button id="home-btn">&#8962;</button>
<button id="addPoint-btn">&middot;</button>
<button id="addCircle-btn">&compfn;</button>
<button id="addPolygon-btn">&diamond;</button>
<div id="subControls">
<button id="tiles-btn">&Colon;</button>
<button id="tiles-btn">&#10070;</button>
<button id="save-btn">&darr;</button>
<button id="clear-btn">x</button>
<button id="restore-btn">&olarr;</button>

53
static/onyx-scry.js
View file

@ -692,12 +692,31 @@ class MapHandler {
}
}
}
static setHome(e) {
const self = MapHandler.instance;
if (self) {
localStorage.setItem("home", JSON.stringify(self.map.getCenter()));
}
}
static goHome(e) {
const self = MapHandler.instance;
if (self) {
const homeData = localStorage.getItem("home");
if (homeData) {
const home = JSON.parse(homeData);
if (home) {
self.map.setView(home, 13);
}
}
}
}
}
MapHandler.instance = null;
function init() {
var _a;
let overlays = (_a = OverlayState.load()) !== null && _a !== void 0 ? _a : new OverlayState();
const map = L.map('map').setView([35.6653, -105.9507], 13);
const map = L.map('map').fitWorld();
// old default zoom was 13
const streetLayer = TileLayerWrapper.constructLayer("streetLayer", L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
maxZoom: 19,
attribution: "street map tiles &copy; OpenStreetMap"
@ -713,12 +732,44 @@ function init() {
overlays.polyline.add(map);
const modals = new ModalCollection(new CreateOverlayModal(), new CancelModal(), new OKCancelModal(), new InfoModal());
MapHandler.init(map, overlays, TileLayerWrapper.layers, modals);
MapHandler.setButtonClick("home-btn", MapHandler.goHome);
MapHandler.setButtonClick("addPoint-btn", MapHandler.markerCollect);
MapHandler.setButtonClick("addCircle-btn", MapHandler.circleCollect);
MapHandler.setButtonClick("addPolygon-btn", MapHandler.polygonCollect);
MapHandler.setButtonClick("save-btn", MapHandler.overlaySave);
MapHandler.setButtonClick("clear-btn", MapHandler.overlayClear);
MapHandler.setButtonClick("restore-btn", MapHandler.overlayReset);
MapHandler.setButtonClick("menu-btn", () => { });
MapHandler.setButtonClick("tiles-btn", MapHandler.swapTiles);
map.on("locationfound", () => {
const okCancel = modals.okCancel;
okCancel.setMsg("Set Home to current location?");
const okBtn = okCancel.okBtn();
if (okBtn) {
okBtn.onclick = (e) => {
okCancel.setVisible(false);
MapHandler.setHome(null);
};
}
const cancelBtn = okCancel.cancelBtn();
if (cancelBtn) {
cancelBtn.onclick = () => {
okCancel.setVisible(false);
};
}
});
map.on("locationerror", () => {
const info = modals.info;
info.setMsg("Could not get location data");
info.setVisible(true);
});
const homeData = localStorage.getItem("home");
if (homeData) {
const home = JSON.parse(homeData);
map.setView(home, 13);
}
else {
map.locate({ setView: true, maxZoom: 13 });
}
}
init();