From 1fac102afd5c854e853b1b31bf6ca854d8191606 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 17 Mar 2022 08:28:55 +0000
Subject: [PATCH] Undo accidental commits

---
 apps/dsdrelay/dsdrelay.app.js | 25 +++---------------
 apps/openstmap/custom.html    | 49 ++++++++++++++++++++++++++---------
 2 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/apps/dsdrelay/dsdrelay.app.js b/apps/dsdrelay/dsdrelay.app.js
index ddfb935e6..18e7293aa 100644
--- a/apps/dsdrelay/dsdrelay.app.js
+++ b/apps/dsdrelay/dsdrelay.app.js
@@ -78,27 +78,10 @@ function parseDevice(d) {
 })}
 
 function connection_setup() {
-  menu = {
-    "": { "title": "Select relay board" },
-    "re-scan":  () => connection_setup()
-  };
-  waitMessage();
-  NRF.findDevices(devices => {
-    devices.forEach(device =>{
-      let deviceName = device.id.substring(0,17);
-      if (device.name) {
-        deviceName = device.name;
-      }
-      if (device.services!=undefined && device.services.find(e => e.toLowerCase()=="ffe0")) deviceName = "* "+deviceName;
-      menu[deviceName] = () => { E.showMenu(); parseDevice(device); }
-    });
-    E.showMenu(menu);
-  }, { active: true });
-}
-
-function waitMessage() {
-  E.showMenu();
-  E.showMessage("scanning");
+  NRF.setScan();
+  NRF.setScan(parseDevice, { filters: [{services:["FFE0"]}], timeout: 2000});
+  g.clearRect(0, 60, 239, 239).setFontVector(18).setFontAlign(0, 0, 0).setColor(0, 1, 0);
+  g.drawString("Scanning for relay...", 120, 120);
 }
 
 function moveChannelFrame(oldc, newc) {
diff --git a/apps/openstmap/custom.html b/apps/openstmap/custom.html
index 302f9a84a..6e79a6e9a 100644
--- a/apps/openstmap/custom.html
+++ b/apps/openstmap/custom.html
@@ -33,7 +33,7 @@
     <div id="map">
     </div>
     <div id="controls">
-      <div style="display:inline-block;text-align:center;vertical-align: top;"> <input type="checkbox" id="3bit"></input><br/><span>3 bit</span></div>
+      <div style="display:inline-block;text-align:center;vertical-align: top;" id="3bitdiv"> <input type="checkbox" id="3bit"></input><br/><span>3 bit</span></div>
       <button id="getmap" class="btn btn-primary">Get Map</button><br/>
       <canvas id="maptiles" style="display:none"></canvas>
       <div id="uploadbuttons" style="display:none"><button id="upload" class="btn btn-primary">Upload</button>
@@ -52,16 +52,16 @@
 
 TODO:
 
-* Allow a larger tilesize. Currently we use 'evaluate:true' which means we can only send 64x64x8 bit, but with some tweaking we could send 128x128 which would reduce the number of files and make things a bit snappier
 * Could maybe use palettised output?
 * Could potentially use a custom 16 color palette?
 * Allow user to choose size of map area to be uploaded (small/med/large)
 * What is faster? Storing as a compressed image and decompressing, or storing decompressed?
 
     */
-      var TILESIZE = 64;
-      var OSMTILESIZE = 256;
-      var OSMSUBTILES = OSMTILESIZE / TILESIZE;
+      var TILESIZE = 96; // Size of our tiles
+      var OSMTILESIZE = 256; // Size of openstreetmap tiles
+      var MAPSIZE = TILESIZE*5; ///< 480 - Size of map we download
+      var OSMTILECOUNT = 3; // how many tiles do we download in each direction (Math.floor(MAPSIZE / OSMTILESIZE)+1)
       /* Can see possible tiles on http://leaflet-extras.github.io/leaflet-providers/preview/
       However some don't allow cross-origin use */
       var TILELAYER = 'https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png'; // simple, high contrast
@@ -82,11 +82,37 @@ TODO:
       });
       // Could optionally overlay trails: https://wiki.openstreetmap.org/wiki/Tiles
 
+      // Search box:
+      const searchProvider = new window.GeoSearch.OpenStreetMapProvider();
+      const searchControl = new GeoSearch.GeoSearchControl({
+        provider: searchProvider,
+        style: 'button',
+        updateMap: true,
+        autoClose: true,
+        showMarker: false,
+        keepResult: true,
+        autoComplete: false
+      });
+      map.addControl(searchControl);
+
+      function onInit(device) {
+        if (device && device.info && device.info.g) {
+          // On 3 bit devices, don't even offer the option. 3 bit is the only way
+          if (device.info.g.bpp==3) {
+            document.getElementById("3bit").checked = true;
+            document.getElementById("3bitdiv").style = "display:none";
+          }
+        }
+      }
+
       var mapFiles = [];
       previewTileLayer.addTo(map);
 
       function tilesLoaded(ctx, width, height) {
-        var options = { compression:true, mode:"web", output:"string"};
+        var options = {
+          compression:false, output:"raw",
+          mode:"web"
+        };
         if (document.getElementById("3bit").checked) {
           options = {
             compression:false, output:"raw",
@@ -136,8 +162,7 @@ TODO:
             imgstr = imgstr.slice(compress.length,-1);*/
             tiles.push({
               name:"openstmap-"+x+"-"+y+".img",
-              content:imgstr,
-              evaluate:true
+              content:imgstr
             });
           }
         }
@@ -186,10 +211,10 @@ TODO:
         var canvas = document.getElementById("maptiles");
         canvas.style.display="";
         var ctx = canvas.getContext('2d');
-        canvas.width = OSMTILESIZE*2;
-        canvas.height = OSMTILESIZE*2;
-        for (var i = 0; i < 3; i++) {
-            for (var j = 0; j < 3; j++) {
+        canvas.width = MAPSIZE;
+        canvas.height = MAPSIZE;
+        for (var i = 0; i < OSMTILECOUNT; i++) {
+            for (var j = 0; j < OSMTILECOUNT; j++) {
               (function(i,j){
                 var coords = new L.Point(center.x+i-1, center.y+j-1);
                 coords.z = zoom;