step toward fixing broken addRasterImage; displays now but still not working

Author: timelyportfolio

inst/errors/errors.Rmd

@@ -44,4 +44,13 @@ leaflet-label now in main leaflet as L.tooltip.  How do we handle changed option
 - Bonus: new option `sticky` will make the label follow the mouse instead of being displayed at the feature center
 
 
-# removed leaflet-label source and in yaml in [commit]()
+* removed leaflet-label source and in yaml in [commit]()
+
+
+### tileLayer.canvas no longer available
+
+```
+library(mapview)
+
+leaflet() %>% addRasterImage(poppendorf[[1]])
+```

inst/htmlwidgets/leaflet.js

@@ -2100,14 +2100,17 @@ methods.addRasterImage = function (uri, bounds, opacity, attribution, layerId, g
   };
   img.src = uri;
 
-  var canvasTiles = _leaflet2.default.tileLayer.canvas({
+  var canvasTiles = _leaflet2.default.gridLayer({
     opacity: opacity,
     attribution: attribution,
     detectRetina: true,
     async: true
   });
 
-  canvasTiles.drawTile = function (canvas, tilePoint, zoom) {
+  canvasTiles.createTile = function (tilePoint) {
+    var zoom = tilePoint.z;
+    var canvas = _leaflet2.default.DomUtil.create("canvas", "leaflet-tile");
+
     getImageData(function (imgData, w, h, mipmapper) {
       try {
         var _ret7 = function () {
@@ -2236,9 +2239,10 @@ methods.addRasterImage = function (uri, bounds, opacity, attribution, layerId, g
 
         if ((typeof _ret7 === "undefined" ? "undefined" : _typeof(_ret7)) === "object") return _ret7.v;
       } finally {
-        canvasTiles.tileDrawn(canvas);
+        return canvas;
       }
     });
+    return canvas;
   };
 
   this.layerManager.addLayer(canvasTiles, "image", layerId, group);

javascript/src/methods.js

@@ -1034,14 +1034,17 @@ methods.addRasterImage = function(uri, bounds, opacity, attribution, layerId, gr
   };
   img.src = uri;
 
-  let canvasTiles = L.tileLayer.canvas({
+  let canvasTiles = L.gridLayer({
     opacity: opacity,
     attribution: attribution,
     detectRetina: true,
     async: true
   });
 
-  canvasTiles.drawTile = function(canvas, tilePoint, zoom) {
+  canvasTiles.createTile = function(tilePoint) {
+    let zoom = tilePoint.z;
+    let canvas = L.DomUtil.create("canvas", "leaflet-tile");
+
     getImageData(function(imgData, w, h, mipmapper) {
       try {
         // The Context2D we'll being drawing onto. It's always 256x256.
@@ -1171,9 +1174,10 @@ methods.addRasterImage = function(uri, bounds, opacity, attribution, layerId, gr
           }
         }
       } finally {
-        canvasTiles.tileDrawn(canvas);
+        return canvas;
       }
     });
+    return canvas;
   };
 
   this.layerManager.addLayer(canvasTiles, "image", layerId, group);