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

gpstrek - Give map an own screen

master
Martin Boonk 2023-05-20 11:24:16 +02:00
parent 828b8911b1
commit ddae2830d7
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/gpstrek/app.js
View File

@ -3,7 +3,7 @@
const STORAGE = require("Storage"); const STORAGE = require("Storage");
const BAT_FULL = require("Storage").readJSON("setting.json").batFullVoltage || 0.3144; const BAT_FULL = require("Storage").readJSON("setting.json").batFullVoltage || 0.3144;
const SETTINGS = { const SETTINGS = {
mapCompass: false mapCompass: true
}; };
let init = function(){ let init = function(){
@ -232,6 +232,7 @@ let getMapSlice = function(){
const maxPoints = 50; const maxPoints = 50;
let drawPath = function(iter, reverse){ let drawPath = function(iter, reverse){
"ram";
let i = 0; let i = 0;
let time = Date.now(); let time = Date.now();
@ -1087,7 +1088,7 @@ let updateRouting = function() {
let updateSlices = function(){ let updateSlices = function(){
let s = WIDGETS.gpstrek.getState(); let s = WIDGETS.gpstrek.getState();
slices = []; slices = [ compassSlice ];
if (s.currentPos && s.currentPos.lat && s.route && s.route.currentWaypoint && s.route.index < s.route.count - 1) { if (s.currentPos && s.currentPos.lat && s.route && s.route.currentWaypoint && s.route.index < s.route.count - 1) {
slices.push(waypointSlice); slices.push(waypointSlice);
} }
@ -1102,15 +1103,16 @@ let updateSlices = function(){
slices.push(healthSlice); slices.push(healthSlice);
slices.push(systemSlice); slices.push(systemSlice);
slices.push(system2Slice); slices.push(system2Slice);
maxScreens = Math.ceil(slices.length/s.numberOfSlices) + 1; let hasMapScreen = s.route ? 1:0;
maxScreens = Math.ceil(slices.length/s.numberOfSlices) + hasMapScreen;
}; };
let draw = function(){ let draw = function(){
if (!global.screen) return; if (!global.screen) return;
let ypos = Bangle.appRect.y; let ypos = Bangle.appRect.y;
let s = WIDGETS.gpstrek.getState(); let s = WIDGETS.gpstrek.getState();
let hasMapScreen = s.route ? 2:1;
let firstSlice = (screen-2)*s.numberOfSlices; let firstSlice = (screen-hasMapScreen)*s.numberOfSlices;
let force = lastDrawnScreen != screen || firstDraw; let force = lastDrawnScreen != screen || firstDraw;
if (force){ if (force){
clear(); clear();
@ -1119,15 +1121,9 @@ let draw = function(){
lastDrawnScreen = screen; lastDrawnScreen = screen;
updateSlices(); updateSlices();
if (global.screen == 1) { if (global.screen == 1 && s.route) {
let split = s.route?(Bangle.appRect.h/4):Bangle.appRect.h;
g.reset(); g.reset();
compassSlice.draw(g,Bangle.appRect.x,ypos,split,Bangle.appRect.w); mapSlice.draw(g,Bangle.appRect.x,Bangle.appRect.y, Bangle.appRect.h,Bangle.appRect.w);
ypos += split + 1;
if (s.route){
g.reset();
mapSlice.draw(g,0,ypos, Bangle.appRect.h - split,Bangle.appRect.w);
}
} else { } else {
let sliceHeight = getSliceHeight(); let sliceHeight = getSliceHeight();
let slicesToDraw = slices.slice(firstSlice,firstSlice + s.numberOfSlices); let slicesToDraw = slices.slice(firstSlice,firstSlice + s.numberOfSlices);