nakarte

commit ac34694cc446d4c4e66bbbe81ec4978644113739
parent 73d99a06467740bd68ea83399eae8f28efb512c6
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Thu,  6 Apr 2017 12:37:16 +0300

[print] do not try to load missing google tiles to avoid error messages

Diffstat:
M
src/lib/leaflet.control.printPages/map-render.js
 | 
2
+-
M
src/lib/leaflet.layer.rasterize/Google.js
 | 
2
+-
M
src/lib/leaflet.layer.rasterize/TileLayer.js
 | 
5
++++-

3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/lib/leaflet.control.printPages/map-render.js b/src/lib/leaflet.control.printPages/map-render.js
@@ -114,7 +114,7 @@ class PageComposer {
     }
 
     putTile(tileInfo) {
-        if (tileInfo.image === null) {
+        if (!tileInfo.image) {
             return;
         }
         let zoom;
diff --git a/src/lib/leaflet.layer.rasterize/Google.js b/src/lib/leaflet.layer.rasterize/Google.js
@@ -34,7 +34,7 @@ const GooglePrint = L.Layer.Google.extend({
     },
 
     getTileUrl: function(coords) {
-        return this._readyTiles[this._tileCoordsToKey(coords)];
+        return this._readyTiles[this._tileCoordsToKey(coords)] || null;
     }
 });
 
diff --git a/src/lib/leaflet.layer.rasterize/TileLayer.js b/src/lib/leaflet.layer.rasterize/TileLayer.js
@@ -27,7 +27,7 @@ const GridLayerGrabMixin = {
                     let tilePos = this._getTilePos(coords);
                     const coordsPlusOne = coords.add(L.point(1, 1));
                     coordsPlusOne.z = coords.z;
-                    const tilePlusOne = this._getTilePos(coordsPlusOne)
+                    const tilePlusOne = this._getTilePos(coordsPlusOne);
                     const tileSize = tilePlusOne.subtract(tilePos);
                     const latLngBounds = L.latLngBounds(
                         this._map.unproject(tilePos.add(this._level.origin)),
@@ -60,6 +60,9 @@ const TileLayerGrabMixin = L.Util.extend({}, GridLayerGrabMixin, {
         tileImagePromiseFromCoords: function(coords, printOptions) {
             let {xhrOptions} = printOptions;
             let url = this.getTileUrl(coords);
+            if (!url) {
+                return {tilePromise: Promise.resolve(null), abortLoading: noop};
+            }
             if (this.options.noCors) {
                 url = urlViaCorsProxy(url);
             }