fix: reverseY check

hongfaqiu · Nov 20, 2023 · fc695f5 · fc695f5
1 parent d8875f9
commit fc695f5
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 29 deletions.
diff --git a/packages/TIFFImageryProvider/src/TIFFImageryProvider.ts b/packages/TIFFImageryProvider/src/TIFFImageryProvider.ts
@@ -233,7 +233,7 @@ export class TIFFImageryProvider {
     // 获取空间范围
     this.origin = this._getOrigin(image);
     this.bbox = image.getBoundingBox();
-    this.reverseY = (this.origin[1] - this.bbox[0]) > (this.origin[1] - this.bbox[3])
+    this.reverseY = this._checkIfReversed(image);
     const [west, south, east, north] = this.bbox;
 
     const prjCode = +(image.geoKeys.ProjectedCSTypeGeoKey ?? image.geoKeys.GeographicTypeGeoKey)
@@ -424,6 +424,22 @@ export class TIFFImageryProvider {
     }
   }
 
+  private _checkIfReversed(image: GeoTIFFImage) {
+    const pixelScale = image.getFileDirectory().ModelPixelScale;
+    if (pixelScale) {
+      const pixelScaleY = pixelScale[1];
+      if (pixelScaleY < 0) return true;
+    }
+
+    const transformation = image.getFileDirectory().ModelTransformation;
+    if (transformation) {
+      const originX = transformation[3];
+      const originY = transformation[7];
+      if (originY > originX) return true;
+    }
+    return false;
+  }
+
   /**
    * get suitable cog levels
    */

diff --git a/vite-example/src/index.ts b/vite-example/src/index.ts
@@ -1,9 +1,12 @@
-import { ArcGisMapServerImageryProvider, Viewer } from 'cesium';
+import { ArcGisMapServerImageryProvider, ImageryLayer, Viewer } from 'cesium';
 import './index.css';
 import TIFFImageryProvider from 'tiff-imagery-provider';
 import proj4 from 'proj4-fully-loaded'; 
 
 const viewer = new Viewer('cesiumContainer', {
+  baseLayer: ImageryLayer.fromProviderAsync(ArcGisMapServerImageryProvider.fromUrl('https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer', {
+    enablePickFeatures: false
+  }), {}),
   baseLayerPicker: false,
   animation: false,
   fullscreenButton: false,
@@ -17,33 +20,27 @@ const viewer = new Viewer('cesiumContainer', {
   orderIndependentTranslucency: false,
 });
 
-ArcGisMapServerImageryProvider.fromUrl('https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer', {
-  enablePickFeatures: false
-}).then(async imageryProvider => {
-  viewer.imageryLayers.remove(viewer.imageryLayers.get(0));
-  viewer.imageryLayers.addImageryProvider(imageryProvider)
-  const provider: any = await TIFFImageryProvider.fromUrl('https://sentinel-cogs.s3.us-west-2.amazonaws.com/sentinel-s2-l2a-cogs/56/J/NP/2023/4/S2A_56JNP_20230410_0_L2A/TCI.tif', {
-    enablePickFeatures: true,
-    projFunc: (code) => {
-      if (![4326, 3857, 900913].includes(code)) {
-        {
-          try {
-            let prj = proj4("EPSG:4326", `EPSG:${code}`, )
-            if (prj) return {
-              project: prj.forward,
-              unproject: prj.inverse
-            }
-          } catch (e) {
-            console.error(e);
+const provider: any = await TIFFImageryProvider.fromUrl('https://sentinel-cogs.s3.us-west-2.amazonaws.com/sentinel-s2-l2a-cogs/56/J/NP/2023/4/S2A_56JNP_20230410_0_L2A/TCI.tif', {
+  enablePickFeatures: true,
+  projFunc: (code) => {
+    if (![4326, 3857, 900913].includes(code)) {
+      {
+        try {
+          let prj = proj4("EPSG:4326", `EPSG:${code}`, )
+          if (prj) return {
+            project: prj.forward,
+            unproject: prj.inverse
           }
+        } catch (e) {
+          console.error(e);
         }
       }
-      return undefined
-    },
-  });
-  
-  const imageryLayer = viewer.imageryLayers.addImageryProvider(provider);
-  viewer.flyTo(imageryLayer, {
-    duration: 1,
-  });
-})
+    }
+    return undefined
+  },
+});
+
+const imageryLayer = viewer.imageryLayers.addImageryProvider(provider);
+viewer.flyTo(imageryLayer, {
+  duration: 1,
+});