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

gpstrek - Show flag instead of circle for target

master
Martin Boonk 2022-11-03 21:24:51 +01:00
parent 2becffbdf7
commit 0bbec4ebfb
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/gpstrek/README.md
View File

@ -10,7 +10,7 @@ Tapping or button to switch to the next information display, swipe right for the
Choose either a route or a waypoint as basis for the display. Choose either a route or a waypoint as basis for the display.
After this selection and availability of a GPS fix the compass will show a blue dot for your destination and a green one for possibly available waypoints on the way. After this selection and availability of a GPS fix the compass will show a checkered flag for your destination and a green dot for possibly available waypoints on the way.
Waypoints are shown with name if available and distance to waypoint. Waypoints are shown with name if available and distance to waypoint.
As long as no GPS signal is available the compass shows the heading from the build in magnetometer. When a GPS fix becomes available, the compass display shows the GPS course. This can be differentiated by the display of bubble levels on top and sides of the compass. As long as no GPS signal is available the compass shows the heading from the build in magnetometer. When a GPS fix becomes available, the compass display shows the GPS course. This can be differentiated by the display of bubble levels on top and sides of the compass.

12
apps/gpstrek/app.js
View File

@ -239,10 +239,16 @@ function getCompassSlice(compassDataSource){
} else { } else {
bpos=Math.round(bpos*increment); bpos=Math.round(bpos*increment);
} }
if (p.color){
graphics.setColor(p.color); graphics.setColor(p.color);
}
if (p.icon){
graphics.drawImage(p.icon, bpos,y+height-12, {rotate:0,scale:2});
} else {
graphics.fillCircle(bpos,y+height-12,Math.floor(width*0.03)); graphics.fillCircle(bpos,y+height-12,Math.floor(width*0.03));
} }
} }
}
if (compassDataSource.getMarkers){ if (compassDataSource.getMarkers){
for (let m of compassDataSource.getMarkers()){ for (let m of compassDataSource.getMarkers()){
g.setColor(m.fillcolor); g.setColor(m.fillcolor);
@ -677,6 +683,8 @@ function setClosestWaypoint(route, startindex, progress){
let screen = 1; let screen = 1;
const finishIcon = atob("CggB//meZmeZ+Z5n/w==");
const compassSliceData = { const compassSliceData = {
getCourseType: function(){ getCourseType: function(){
return (state.currentPos && state.currentPos.course) ? "GPS" : "MAG"; return (state.currentPos && state.currentPos.course) ? "GPS" : "MAG";
@ -691,10 +699,10 @@ const compassSliceData = {
points.push({bearing:bearing(state.currentPos, state.route.currentWaypoint), color:"#0f0"}); points.push({bearing:bearing(state.currentPos, state.route.currentWaypoint), color:"#0f0"});
} }
if (state.currentPos && state.currentPos.lon && state.route){ if (state.currentPos && state.currentPos.lon && state.route){
points.push({bearing:bearing(state.currentPos, getLast(state.route)), color:"#00f"}); points.push({bearing:bearing(state.currentPos, getLast(state.route)), icon: finishIcon});
} }
if (state.currentPos && state.currentPos.lon && state.waypoint){ if (state.currentPos && state.currentPos.lon && state.waypoint){
points.push({bearing:bearing(state.currentPos, state.waypoint), color:"#00f"}); points.push({bearing:bearing(state.currentPos, state.waypoint), icon: finishIcon});
} }
return points; return points;
}, },

BIN
apps/gpstrek/screen2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB