fix: multi band tiff single band rendering #20

hongfaqiu · Sep 4, 2023 · eb4a653 · eb4a653
1 parent 845648b
commit eb4a653
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/packages/TIFFImageryProvider/README.md b/packages/TIFFImageryProvider/README.md
@@ -16,7 +16,7 @@ Load GeoTIFF/COG(Cloud optimized GeoTIFF) on Cesium
 - Web Workers speed up.
 - WebGL accelerated rendering.
 - Band calculation.
-- Support any projected TIFF (experimental).
+- **[experimental]** Support any projected TIFF .
 
 ## Install
 
@@ -130,6 +130,10 @@ interface TIFFImageryProviderOptions {
   enablePickFeatures?: boolean;
   hasAlphaChannel?: boolean;
   renderOptions?: TIFFImageryProviderRenderOptions;
+  /**
+   * If TIFF's projection is not EPSG:4326 or EPSG:3857, you can pass the ``projFunc`` to handle the projection
+   * @experimental
+   */
   projFunc?: (code: number) => {
     /** projection function, convert [lon, lat] position to [x, y] */
     project: ((pos: number[]) => number[]);

diff --git a/packages/TIFFImageryProvider/README_CN.md b/packages/TIFFImageryProvider/README_CN.md
@@ -129,6 +129,10 @@ interface TIFFImageryProviderOptions {
   enablePickFeatures?: boolean;
   hasAlphaChannel?: boolean;
   renderOptions?: TIFFImageryProviderRenderOptions;
+  /**
+   * 如果 TIFF 的投影不是 EPSG:4326，你可以通过 ``projFunc`` 来处理投影
+   * @experimental
+   */
   projFunc?: (code: number) => {
     /** 投影函数，将 [lon, lat] 位置转换为 [x, y] */
     project: ((pos: number[]) => number[]);

diff --git a/packages/TIFFImageryProvider/src/TIFFImageryProvider.ts b/packages/TIFFImageryProvider/src/TIFFImageryProvider.ts
@@ -123,6 +123,10 @@ export interface TIFFImageryProviderOptions {
   enablePickFeatures?: boolean;
   hasAlphaChannel?: boolean;
   renderOptions?: TIFFImageryProviderRenderOptions;
+  /**
+   * If TIFF's projection is not EPSG:4326 or EPSG:3857, you can pass the ``projFunc`` to handle the projection
+   * @experimental
+   */
   projFunc?: (code: number) => {
     /** projection function, convert [lon, lat] position to [x, y] */
     project: ((pos: number[]) => number[]);
@@ -175,7 +179,6 @@ export class TIFFImageryProvider {
     data: ImageBitmap | HTMLCanvasElement | HTMLImageElement;
   }> = {};
   private _generateImageworkerFarm: WorkerFarm | null;
-  private _reprojectionworkerFarm: WorkerFarm;
   private _cacheTime: number;
   private _isTiled: boolean;
   private _proj?: {
@@ -278,7 +281,7 @@ export class TIFFImageryProvider {
       throw error;
     }
     if (!this.renderOptions.single && !this.renderOptions.multi && !this.renderOptions.convertToRGB) {
-      if (samples > 1) {
+      if (samples > 2) {
         this.renderOptions = {
           convertToRGB: true,
           ...this.renderOptions
@@ -297,7 +300,7 @@ export class TIFFImageryProvider {
     }
 
     const { single, multi, convertToRGB } = this.renderOptions;
-    this.readSamples = multi ? [multi.r.band - 1, multi.g.band - 1, multi.b.band - 1] : convertToRGB ? [0, 1, 2] : [0]
+    this.readSamples = multi ? [multi.r.band - 1, multi.g.band - 1, multi.b.band - 1] : convertToRGB ? [0, 1, 2] : Array.from({ length: samples }, (_, index) => index);
     if (single?.expression) {
       this.readSamples = findAndSortBandNumbers(single.expression);
     }
@@ -470,7 +473,6 @@ export class TIFFImageryProvider {
       ]
     }
 
-
     const options = {
       window,
       pool: getWorkerPool(),