VectorTileLayer add loadTileErrorLog for log loadTile error (#2641)

* VectorTileLayer add loadTileErrorLog for log loadTile error

* fix typing

Author: deyihu

packages/vt/src/layer/layer/VectorTileLayer.ts

@@ -88,7 +88,9 @@ const defaultOptions: VectorTileLayerOptionsType = {
   tileStackDepth: 2,
 
   altitudePropertyName: null,
-  disableAltitudeWarning: false
+  disableAltitudeWarning: false,
+  loadTileErrorLog: true,
+  loadTileErrorLogIgnoreCodes: [404, 204]
 };
 
 /**
@@ -347,12 +349,12 @@ class VectorTileLayer extends maptalks.TileLayer {
   }
 
   forceReload(): this {
-      // expire cached tiles in worker
-      const renderer = this.getRenderer() as any;
-      if (renderer) {
-        renderer._incrWorkerCacheIndex();
-      }
-      return super.forceReload();
+    // expire cached tiles in worker
+    const renderer = this.getRenderer() as any;
+    if (renderer) {
+      renderer._incrWorkerCacheIndex();
+    }
+    return super.forceReload();
   }
 
   onWorkerReady() { }
@@ -1832,7 +1834,7 @@ class VectorTileLayer extends maptalks.TileLayer {
   clear() {
     const renderer = this.getRenderer();
     if (renderer) {
-        renderer.clearData();
+      renderer.clearData();
     }
     return super.clear();
   }
@@ -2011,7 +2013,9 @@ export type VectorTileLayerOptionsType = {
   style?: any,
 
   altitudePropertyName?: string,
-  disableAltitudeWarning?: boolean
+  disableAltitudeWarning?: boolean,
+  loadTileErrorLog?: boolean,
+  loadTileErrorLogIgnoreCodes?: Array<number>;
 } & TileLayerOptionsType;
 
 export type AsyncFeatureQueryOptions = {

packages/vt/src/layer/renderer/VectorTileLayerRenderer.js

@@ -537,6 +537,8 @@ class VectorTileLayerRenderer extends CanvasCompatible(TileLayerRendererable(Lay
             const referrer = window && window.location.href;
             const altitudePropertyName = this.layer.options['altitudePropertyName'];
             const disableAltitudeWarning = this.layer.options['disableAltitudeWarning'];
+            const loadTileErrorLog = this.layer.options.loadTileErrorLog;
+            const loadTileErrorLogIgnoreCodes = this.layer.options.loadTileErrorLogIgnoreCodes;
             const loadTileOpitons = {
                 tileInfo: {
                     res: tileInfo.res,
@@ -549,6 +551,8 @@ class VectorTileLayerRenderer extends CanvasCompatible(TileLayerRendererable(Lay
                 },
                 glScale,
                 disableAltitudeWarning,
+                loadTileErrorLog,
+                loadTileErrorLogIgnoreCodes,
                 altitudePropertyName,
                 zScale: this._zScale,
                 centimeterToPoint,

packages/vt/src/worker/index.js

@@ -1,3 +1,4 @@
+import { isNumber } from '../common/Util';
 import Dispatcher from './Dispatcher';
 
 export const initialize = function () {
@@ -15,11 +16,19 @@ export const onmessage = function (message, postResponse) {
         }
     } else {
         const command = data.command;
+        const loadTileErrorLog = (data.params || {}).loadTileErrorLog;
+        const loadTileErrorLogIgnoreCodes = (data.params || {}).loadTileErrorLogIgnoreCodes || [];
         this.dispatcher[command]({ actorId: message.actorId, mapId: data.mapId, layerId: data.layerId, params: data.params }, (err, data, buffers) => {
-            if (err && err.status !== 404 && err.status !== 204 && !err.loading) {
-                // err.loading 为true时，说明geojson-vt正在创建索引
-                console.error(command, err);
+            if (loadTileErrorLog && err && !err.loading) {
+                const status = err.status;
+                if (isNumber(status) && loadTileErrorLogIgnoreCodes.indexOf(status) === -1) {
+                    console.error(command, err);
+                }
             }
+            // if (err && err.status !== 404 && err.status !== 204 && !err.loading) {
+            //     // err.loading 为true时，说明geojson-vt正在创建索引
+            //     console.error(command, err);
+            // }
             postResponse(err, data, buffers);
         });
     }

packages/vt/src/worker/layer/VectorTileLayerWorker.js

@@ -48,6 +48,7 @@ export default class VectorTileLayerWorker extends LayerWorker {
             }, 1);
         }
         fetchOptions.referrer = context.referrer;
+        fetchOptions.errorLog = context.loadTileErrorLog;
         return Ajax.getArrayBuffer(url, fetchOptions, (err, response) => {
             if (!this._cache) {
                 // removed

packages/vt/src/worker/util/Ajax.js

@@ -1,6 +1,6 @@
-import { isFunction, uid } from '../../common/Util';
+import { isFunction, isNil, uid } from '../../common/Util';
 
-const USE_FETCH = typeof fetch === 'function' && typeof AbortController  === 'function';
+const USE_FETCH = typeof fetch === 'function' && typeof AbortController === 'function';
 
 /**
  * @classdesc
@@ -68,6 +68,10 @@ const Ajax = {
             options = t;
         }
         options = options || {};
+        let errorLog = options.errorLog;
+        if (isNil(errorLog)) {
+            errorLog = true;
+        }
         if (options.method) {
             options.method = options.method.toUpperCase();
         }
@@ -115,14 +119,18 @@ const Ajax = {
                         }
                     }).catch(err => {
                         if (!err.code || err.code !== DOMException.ABORT_ERR) {
-                            console.error('Fetch error:', url, err);
+                            if (errorLog) {
+                                console.error('Fetch error:', url, err);
+                            }
                             cb(err);
                         }
                     });
                 }
             }).catch(err => {
                 if (!err.code || err.code !== DOMException.ABORT_ERR) {
-                    console.error('Fetch error:', url, err);
+                    if (errorLog) {
+                        console.error('Fetch error:', url, err);
+                    }
                     cb(err);
                 }
             });
@@ -185,7 +193,7 @@ const Ajax = {
             client = new XMLHttpRequest();
         } catch (e) {
             try { client = new ActiveXObject('Msxml2.XMLHTTP'); } catch (e) {
-                try { client = new ActiveXObject('Microsoft.XMLHTTP'); } catch (e) {}
+                try { client = new ActiveXObject('Microsoft.XMLHTTP'); } catch (e) { }
             }
         }
         client.onreadystatechange = Ajax._wrapCallback(client, cb);