@deck.gl/geo-layers 8.9.9 → 8.9.11

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/geo-layers",
   "description": "deck.gl layers supporting geospatial use cases and GIS formats",
   "license": "MIT",
-  "version": "8.9.9",
+  "version": "8.9.11",
   "publishConfig": {
     "access": "public"
   },
@@ -55,5 +55,5 @@
     "@loaders.gl/core": "^3.3.0",
     "@luma.gl/core": "^8.0.0"
   },
-  "gitHead": "84804c8413f59f27e5d8fefd828192b06e839bfa"
+  "gitHead": "ec059b9b2bde01fecc8017ed39b9898d85794561"
 }

package/src/wms-layer/wms-layer.ts

@@ -76,11 +76,18 @@ export class WMSLayer<ExtraPropsT extends {} = {}> extends CompositeLayer<
       height: number;
     };
     lastRequestId: number;
-
     _nextRequestId: number;
+    /** TODO: Change any => setTimeout return type. Different between Node and browser... */
     _timeoutId: any;
+    loadCounter: number;
   };
 
+  /** Returns true if all async resources are loaded */
+  get isLoaded(): boolean {
+    // Track the explicit loading done by this layer
+    return Boolean(this.state) && this.state.loadCounter === 0 && super.isLoaded;
+  }
+
   /** Lets deck.gl know that we want viewport change events */
   override shouldUpdateState(): boolean {
     return true;
@@ -90,6 +97,7 @@ export class WMSLayer<ExtraPropsT extends {} = {}> extends CompositeLayer<
     // intentionally empty, initialization is done in updateState
     this.state._nextRequestId = 0;
     this.state.lastRequestId = -1;
+    this.state.loadCounter = 0;
   }
 
   override updateState({changeFlags, props, oldProps}: UpdateParameters<this>): void {
@@ -167,6 +175,7 @@ export class WMSLayer<ExtraPropsT extends {} = {}> extends CompositeLayer<
   async _loadMetadata(): Promise<void> {
     const {imageSource} = this.state;
     try {
+      this.state.loadCounter++;
       const metadata = await imageSource.getMetadata();
 
       // If a request takes a long time, it may no longer be expected
@@ -175,6 +184,8 @@ export class WMSLayer<ExtraPropsT extends {} = {}> extends CompositeLayer<
       }
     } catch (error) {
       this.getCurrentLayer()?.props.onMetadataLoadError(error as Error);
+    } finally {
+      this.state.loadCounter--;
     }
   }
 
@@ -209,6 +220,7 @@ export class WMSLayer<ExtraPropsT extends {} = {}> extends CompositeLayer<
     }
 
     try {
+      this.state.loadCounter++;
       this.props.onImageLoadStart(requestId);
 
       const image = await this.state.imageSource.getImage(requestParams);
@@ -227,6 +239,8 @@ export class WMSLayer<ExtraPropsT extends {} = {}> extends CompositeLayer<
     } catch (error) {
       this.raiseError(error as Error, 'Load image');
       this.getCurrentLayer()?.props.onImageLoadError(requestId, error as Error);
+    } finally {
+      this.state.loadCounter--;
     }
   }
 

package/typed/wms-layer/wms-layer.d.ts

@@ -34,8 +34,12 @@ export declare class WMSLayer<ExtraPropsT extends {} = {}> extends CompositeLaye
         };
         lastRequestId: number;
         _nextRequestId: number;
+        /** TODO: Change any => setTimeout return type. Different between Node and browser... */
         _timeoutId: any;
+        loadCounter: number;
     };
+    /** Returns true if all async resources are loaded */
+    get isLoaded(): boolean;
     /** Lets deck.gl know that we want viewport change events */
     shouldUpdateState(): boolean;
     initializeState(): void;

package/typed/wms-layer/wms-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wms-layer.d.ts","sourceRoot":"","sources":["../../src/wms-layer/wms-layer.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,EACL,cAAc,EACd,mBAAmB,EACnB,gBAAgB,EAChB,YAAY,EACZ,QAAQ,EAGT,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,EAAC,mBAAmB,EAAE,SAAS,EAAE,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAAC,WAAW,EAAoB,MAAM,iBAAiB,CAAC;AAG/D,2CAA2C;AAC3C,oBAAY,aAAa,GAAG,mBAAmB,GAAG,cAAc,CAAC;AAEjE,mCAAmC;AACnC,aAAK,cAAc,GAAG;IACpB,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,WAAW,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,GAAG,CAAC,EAAE,WAAW,GAAG,WAAW,GAAG,MAAM,CAAC;IACzC,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACzD,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAC7C,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IAC3C,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAC/D,CAAC;AAqBF;;GAEG;AACH,qBAAa,QAAQ,CAAC,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CACvE,WAAW,GAAG,QAAQ,CAAC,cAAc,CAAC,CACvC;IACC,MAAM,CAAC,SAAS,SAAc;IAC9B,MAAM,CAAC,YAAY,EAAE,YAAY,CAAgB;IAEjD,KAAK,EAAG;QACN,WAAW,EAAE,WAAW,CAAC;QACzB,KAAK,EAAE,SAAS,CAAC;QACjB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACzC,qBAAqB,EAAE;YACrB,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YACvC,MAAM,EAAE,MAAM,EAAE,CAAC;YACjB,GAAG,EAAE,WAAW,GAAG,WAAW,CAAC;YAC/B,KAAK,EAAE,MAAM,CAAC;YACd,MAAM,EAAE,MAAM,CAAC;SAChB,CAAC;QACF,aAAa,EAAE,MAAM,CAAC;QAEtB,cAAc,EAAE,MAAM,CAAC;QACvB,UAAU,EAAE,GAAG,CAAC;KACjB,CAAC;IAEF,4DAA4D;IACnD,iBAAiB,IAAI,OAAO;IAI5B,eAAe,IAAI,IAAI;IAMvB,WAAW,CAAC,EAAC,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAgBzE,aAAa,IAAI,IAAI;IAIrB,YAAY,IAAI,KAAK;IAmBxB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAgBtE,kBAAkB,CAAC,KAAK,EAAE,aAAa,GAAG,WAAW;IAgBrD,6CAA6C;IACvC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpC,oBAAoB;IACd,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqDlE,oDAAoD;IACpD,OAAO,CAAC,YAAY;IAIpB,8FAA8F;IAC9F,OAAO,CAAC,QAAQ;CAIjB"}
+{"version":3,"file":"wms-layer.d.ts","sourceRoot":"","sources":["../../src/wms-layer/wms-layer.ts"],"names":[],"mappings":"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"}