Merge pull request #2451 from wagnerf42/master

gipy: new release

apps/gipy/ChangeLog

@@ -63,3 +63,13 @@
 	* Record traveled distance to get a good average speed.
 	* Breaks (low speed) will not count in average speed.
 	* Bugfix in average speed.
+
+0.16:
+	* When lost indicates nearest point on path.
+	* Rescale display if lost and too far.
+	* New setting to hide points and increase display speed.
+	* Speed optimisations.
+	* Estimated time of Arrival/Going back.
+	* Display current and next segment in red so that you know where to go.
+	* Avoid angles flickering at low speed at the cost of less refresh.
+	* Splash screen while waiting for gps signal.

apps/gipy/README.md

@@ -2,12 +2,10 @@
 
 Gipy allows you to follow gpx traces on your watch.
 
-![Screenshot](screenshot1.png)
+![Screenshot](splash.png)
 
 
-It is for now meant for bicycling and not hiking
-(it uses your movement to figure out your orientation
-and walking is too slow).
+It is mainly meant for bicycling but hiking might be fine.
 
 It is untested on Banglejs1. If you can try it, you would be welcome.
 
@@ -20,10 +18,10 @@ It provides the following features :
 - display the path with current position from gps
 - detects and buzzes if you leave the path
 - buzzes before sharp turns
-- buzzes before nodes with comments
+- buzzes before waypoints 
 (for example when you need to turn in https://mapstogpx.com/)
 - display instant / average speed
-- display distance to next node
+- display distance to next point
 - display additional data from openstreetmap :
     - water points
     - toilets
@@ -54,32 +52,47 @@ Your path will be displayed in svg.
 
 ### Starting Gipy
 
-Once you start gipy you will have a menu for selecting your trace (if more than one).
-Choose the one you want and here you go :
+At start you will have a menu for selecting your trace (if more than one).
+Choose the one you want and you will reach the splash screen where you'll wait for the gps signal.
+Once you have a signal you will reach the main screen:
 
-![Screenshot](screenshot2.png)
+![Screenshot](legend.png)
 
-On your screen you can see :
+On your screen you can see:
 
 - yourself (the big black dot)
 - the path (the top of the screen is in front of you)
+- on the path, current and next segments are red and other ones are black
 - if needed a projection of yourself on the path (small black dot)
-- extremities of segments as white dots
-- turning points as doubled white dots
-- some text on the left (from top to bottom) :
+- points as white dots
+- waypoints as doubled white dots
+- some text on the left (from top to bottom):
+    * time to reach start point at current average speed
     * current time
+    * time to reach end point at current average speed
     * left distance till end of current segment
-    * distance from start of path / path length
+    * remaining distance / path length
     * average speed / instant speed
 - interest points from openstreetmap as color dots :
-    * red : bakery
-    * deep blue : water point
-    * cyan : toilets (often doubles as water point)
-    * green : artwork
+    * red: bakery
+    * deep blue: water point
+    * cyan: toilets (often doubles as water point)
+    * green: artwork
 - a *turn* indicator on the top right when you reach a turning point
 - a *gps* indicator (blinking) on the top right if you lose gps signal
 - a *lost* indicator on the top right if you stray too far away from path
-- a black segment extending from you when you are lost, indicating the rough direction of where to go
+
+### Lost
+
+If you stray away from path we will rescale the display to continue displaying nearby segments and
+display the direction to follow as a black segment.
+
+Note that while lost, the app will slow down a lot since it will start scanning all possible points to figure out where you
+are. On path it just needed to scan a few points ahead and behind.
+
+![Lost](lost.png)
+
+The distance to next point displayed corresponds to the length of the black segment.
 
 ### Settings
 
@@ -87,6 +100,7 @@ Few settings for now (feel free to suggest me more) :
 
 - keep gps alive : if turned off, will try to save battery by turning the gps off on long segments
 - max speed : used to compute how long to turn the gps off
+- display points : display/hide points (not waypoints)
 
 ### Caveats
 

apps/gipy/TODO

@@ -1,10 +1,5 @@
 
-* bugs
-
-- when exactly on turn, distance to next point is still often 50m
-    -----> it does not buzz very often on turns
-
-- when going backwards we have a tendencing to get a wrong current_segment
++ use Bangle.project(latlong)
 
 * additional features
 
@@ -15,7 +10,6 @@
 (and look at more than next point)
 
 - display distance to next water/toilet ?
-- dynamic map rescale
 - display scale (100m)
 
 - compress path ?

apps/gipy/interface.html

@@ -182,12 +182,21 @@ document
 document
   .getElementById("upload")
   .addEventListener('click', function() {
+    document.getElementById('upload').disabled = true;
     status.innerHTML = "uploading file";
     console.log("uploading");
     let gpc_string = vec_to_string(gpc_content);
     Util.writeStorage(gpc_filename + ".gpc", gpc_string, () => {
-      status.innerHTML = `${gpc_filename}.gpc uploaded`;
-      console.log("DONE");
+      status.innerHTML = "Checking upload";
+      Util.readStorage(gpc_filename + ".gpc", uploaded_content => {
+        if (uploaded_content == gpc_string) {
+            status.innerHTML = `${gpc_filename}.gpc uploaded`;
+            console.log("DONE");
+        } else {
+            status.innerHTML = "Upload FAILED";
+            document.getElementById('upload').disabled = false;
+        }
+      });
     });
 });
 

apps/gipy/metadata.json

@@ -2,13 +2,13 @@
   "id": "gipy",
   "name": "Gipy",
   "shortName": "Gipy",
-  "version": "0.15",
-  "description": "Follow gpx files",
+  "version": "0.16",
+  "description": "Follow gpx files using the gps. Don't get lost in your bike trips and hikes.",
   "allow_emulator":false,
   "icon": "gipy.png",
   "type": "app",
   "tags": "tool,outdoors,gps",
-  "screenshots": [],
+  "screenshots": [{"url":"splash.png"}],
   "supports": ["BANGLEJS2"],
   "readme": "README.md",
   "interface": "interface.html",

apps/gipy/pkg/gpconv.d.ts

@@ -46,11 +46,11 @@ export interface InitOutput {
   readonly __wbindgen_malloc: (a: number) => number;
   readonly __wbindgen_realloc: (a: number, b: number, c: number) => number;
   readonly __wbindgen_export_2: WebAssembly.Table;
-  readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h0601691a32604cdd: (a: number, b: number, c: number) => void;
+  readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h317df853f2d4653e: (a: number, b: number, c: number) => void;
   readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
   readonly __wbindgen_free: (a: number, b: number) => void;
   readonly __wbindgen_exn_store: (a: number) => void;
-  readonly wasm_bindgen__convert__closures__invoke2_mut__h25ed812378167476: (a: number, b: number, c: number, d: number) => void;
+  readonly wasm_bindgen__convert__closures__invoke2_mut__h573cb80e0bf72240: (a: number, b: number, c: number, d: number) => void;
 }
 
 export type SyncInitInput = BufferSource | WebAssembly.Module;

apps/gipy/pkg/gpconv.js

@@ -98,14 +98,6 @@ function getInt32Memory0() {
     return cachedInt32Memory0;
 }
 
-const cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
-
-cachedTextDecoder.decode();
-
-function getStringFromWasm0(ptr, len) {
-    return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
-}
-
 function addHeapObject(obj) {
     if (heap_next === heap.length) heap.push(heap.length + 1);
     const idx = heap_next;
@@ -115,6 +107,14 @@ function addHeapObject(obj) {
     return idx;
 }
 
+const cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
+
+cachedTextDecoder.decode();
+
+function getStringFromWasm0(ptr, len) {
+    return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
+}
+
 function debugString(val) {
     // primitive types
     const type = typeof val;
@@ -205,7 +205,7 @@ function makeMutClosure(arg0, arg1, dtor, f) {
     return real;
 }
 function __wbg_adapter_24(arg0, arg1, arg2) {
-    wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h0601691a32604cdd(arg0, arg1, addHeapObject(arg2));
+    wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h317df853f2d4653e(arg0, arg1, addHeapObject(arg2));
 }
 
 function _assertClass(instance, klass) {
@@ -310,7 +310,7 @@ function handleError(f, args) {
     }
 }
 function __wbg_adapter_69(arg0, arg1, arg2, arg3) {
-    wasm.wasm_bindgen__convert__closures__invoke2_mut__h25ed812378167476(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+    wasm.wasm_bindgen__convert__closures__invoke2_mut__h573cb80e0bf72240(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 
 /**
@@ -371,13 +371,13 @@ async function load(module, imports) {
 function getImports() {
     const imports = {};
     imports.wbg = {};
-    imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
-        takeObject(arg0);
-    };
     imports.wbg.__wbg_gpcsvg_new = function(arg0) {
         const ret = GpcSvg.__wrap(arg0);
         return addHeapObject(ret);
     };
+    imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
+        takeObject(arg0);
+    };
     imports.wbg.__wbindgen_string_get = function(arg0, arg1) {
         const obj = getObject(arg1);
         const ret = typeof(obj) === 'string' ? obj : undefined;
@@ -386,15 +386,15 @@ function getImports() {
         getInt32Memory0()[arg0 / 4 + 1] = len0;
         getInt32Memory0()[arg0 / 4 + 0] = ptr0;
     };
-    imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
-        const ret = getStringFromWasm0(arg0, arg1);
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbindgen_object_clone_ref = function(arg0) {
         const ret = getObject(arg0);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_fetch_386f87a3ebf5003c = function(arg0) {
+    imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
+        const ret = getStringFromWasm0(arg0, arg1);
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_fetch_3894579f6e2af3be = function(arg0) {
         const ret = fetch(getObject(arg0));
         return addHeapObject(ret);
     };
@@ -558,10 +558,6 @@ function getImports() {
         const ret = new Uint8Array(getObject(arg0));
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_stringify_d6471d300ded9b68 = function() { return handleError(function (arg0) {
-        const ret = JSON.stringify(getObject(arg0));
-        return addHeapObject(ret);
-    }, arguments) };
     imports.wbg.__wbg_get_765201544a2b6869 = function() { return handleError(function (arg0, arg1) {
         const ret = Reflect.get(getObject(arg0), getObject(arg1));
         return addHeapObject(ret);
@@ -574,6 +570,10 @@ function getImports() {
         const ret = Reflect.set(getObject(arg0), getObject(arg1), getObject(arg2));
         return ret;
     }, arguments) };
+    imports.wbg.__wbg_stringify_d6471d300ded9b68 = function() { return handleError(function (arg0) {
+        const ret = JSON.stringify(getObject(arg0));
+        return addHeapObject(ret);
+    }, arguments) };
     imports.wbg.__wbindgen_debug_string = function(arg0, arg1) {
         const ret = debugString(getObject(arg1));
         const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -588,8 +588,8 @@ function getImports() {
         const ret = wasm.memory;
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_closure_wrapper947 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 147, __wbg_adapter_24);
+    imports.wbg.__wbindgen_closure_wrapper929 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 143, __wbg_adapter_24);
         return addHeapObject(ret);
     };
 

apps/gipy/pkg/gpconv_bg.wasm.d.ts

@@ -9,8 +9,8 @@ export function convert_gpx_strings(a: number, b: number, c: number, d: number,
 export function __wbindgen_malloc(a: number): number;
 export function __wbindgen_realloc(a: number, b: number, c: number): number;
 export const __wbindgen_export_2: WebAssembly.Table;
-export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h0601691a32604cdd(a: number, b: number, c: number): void;
+export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h317df853f2d4653e(a: number, b: number, c: number): void;
 export function __wbindgen_add_to_stack_pointer(a: number): number;
 export function __wbindgen_free(a: number, b: number): void;
 export function __wbindgen_exn_store(a: number): void;
-export function wasm_bindgen__convert__closures__invoke2_mut__h25ed812378167476(a: number, b: number, c: number, d: number): void;
+export function wasm_bindgen__convert__closures__invoke2_mut__h573cb80e0bf72240(a: number, b: number, c: number, d: number): void;