From 0f431d53cfe0a8269c9752b68e99237e70abc4d8 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Fri, 9 Jun 2023 14:16:27 +0100
Subject: [PATCH] Nav messages with '/' now get split on newlines

---
 apps/messagegui/ChangeLog | 3 ++-
 apps/messagegui/app.js    | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/messagegui/ChangeLog b/apps/messagegui/ChangeLog
index ace1d3091..2e8f9bb3c 100644
--- a/apps/messagegui/ChangeLog
+++ b/apps/messagegui/ChangeLog
@@ -92,4 +92,5 @@
 0.67: Support for 'Ignore' for messages from Gadgetbridge
       Message view is now taller, and we use swipe left/right to dismiss messages rather than buttons
 0.68: More navigation icons (for roundabouts)
-0.69: More navigation icons (keep/uturn left/right)
\ No newline at end of file
+0.69: More navigation icons (keep/uturn left/right)
+      Nav messages with '/' now get split on newlines
\ No newline at end of file
diff --git a/apps/messagegui/app.js b/apps/messagegui/app.js
index 614552371..97396496f 100644
--- a/apps/messagegui/app.js
+++ b/apps/messagegui/app.js
@@ -17,6 +17,7 @@ require("messages").pushMessage({"t":"add","id":1575479849,"src":"Skype","title"
 // maps
 GB({t:"nav",src:"maps",title:"Navigation",instr:"High St towards Tollgate Rd",distance:966,action:"continue",eta:"08:39"})
 GB({t:"nav",src:"maps",title:"Navigation",instr:"High St",distance:12345,action:"left_slight",eta:"08:39"})
+GB({t:"nav",src:"maps",title:"Navigation",instr:"Main St / I-29 ALT / Centerpoint Dr",distance:12345,action:"left_slight",eta:"08:39"})
 // call
 require("messages").pushMessage({"t":"add","id":"call","src":"Phone","title":"Bob","body":"12421312",positive:true,negative:true})
 */
@@ -84,12 +85,13 @@ function showMapMessage(msg) {
   if (msg.distance!==undefined)
     distance = require("locale").distance(msg.distance);
   if (msg.instr) {
-    if (msg.instr.includes("towards") || msg.instr.includes("toward")) {
-      m = msg.instr.split(/towards|toward/);
+    var instr = msg.instr.replace(/\s*\/\s*/g," \/\n"); // convert slashes to newlines
+    if (instr.includes("towards") || instr.includes("toward")) {
+      m = instr.split(/towards|toward/);
       target = m[0].trim();
       street = m[1].trim();
     }else
-      target = msg.instr;
+      target = instr;
   }
   switch (msg.action) {
   case "continue": img = "EBgBAIABwAPgD/Af+D/8f/773/PPY8cDwAPAA8ADwAPAA8AAAAPAA8ADwAAAA8ADwAPA";break;