@gisatcz/deckgl-geolib 1.9.2 → 1.9.3-dev.0

package/dist/esm/types/cogbitmaplayer/CogBitmapLayer.d.ts

@@ -1,4 +1,8 @@
 import { CompositeLayer } from '@deck.gl/core';
+import { TileLayer } from '@deck.gl/geo-layers';
+import { BitmapLayer } from '@deck.gl/layers';
+import { _TerrainExtension as TerrainExtension } from '@deck.gl/extensions';
+import { GL } from '@luma.gl/constants';
 import CogTiles from '../cogtiles/cogtiles.ts';
 import { GeoImageOptions } from '../geoimage/geoimage.ts';
 declare class CogBitmapLayer extends CompositeLayer<any> {
@@ -14,6 +18,25 @@ declare class CogBitmapLayer extends CompositeLayer<any> {
     constructor(id: string, url: string, options: GeoImageOptions);
     initializeState(): void;
     init(url: string): Promise<void>;
-    renderLayers(): any;
+    renderLayers(): TileLayer<any, {
+        id: `${string}-${string}`;
+        getTileData: (tileData: any) => Promise<string>;
+        minZoom: number;
+        maxZoom: number;
+        tileSize: number;
+        maxRequests: 6;
+        extent: [number, number, number, number];
+        renderSubLayers: (props: any) => BitmapLayer<{
+            terrainDrawMode: any;
+            data: null;
+            image: any;
+            bounds: [any, any, any, any];
+            opacity: number;
+            textureParameters: {
+                10241: GL;
+            };
+            extensions: TerrainExtension[];
+        }>;
+    }>;
 }
 export default CogBitmapLayer;

package/dist/esm/types/cogterrainlayer/CogTerrainLayer.d.ts

@@ -1,4 +1,5 @@
 import { CompositeLayer } from '@deck.gl/core';
+import { TileLayer, TerrainLayer } from '@deck.gl/geo-layers';
 import CogTiles from '../cogtiles/cogtiles.ts';
 import { GeoImageOptions } from '../geoimage/geoimage.ts';
 declare class CogTerrainLayer extends CompositeLayer<any> {
@@ -20,6 +21,41 @@ declare class CogTerrainLayer extends CompositeLayer<any> {
     initializeState(): Promise<void>;
     shouldUpdateState(): boolean;
     init(terrainUrl: string): Promise<void>;
-    renderLayers(): any[];
+    renderLayers(): TileLayer<any, {
+        id: `${string}-${string}`;
+        zoomOffset: -1;
+        getTileData: (tileData: any) => Promise<string>;
+        minZoom: number;
+        maxZoom: number;
+        tileSize: number;
+        maxRequests: 6;
+        refinementStrategy: "best-available";
+        extent: [number, number, number, number];
+        renderSubLayers: (props: any) => TerrainLayer<{
+            id: `terrain-${any}-${any}-${any}`;
+            pickable: boolean;
+            elevationDecoder: {
+                rScaler: number;
+                gScaler: number;
+                bScaler: number;
+                offset: number;
+            };
+            elevationData: any;
+            texture: string;
+            opacity: number;
+            bounds: [any, any, any, any];
+            color: number[];
+            operation: "terrain+draw";
+            minZoom: number;
+            maxZoom: number;
+            loadOptions: {
+                terrain: {
+                    skirtHeight: number;
+                    tesselator: string;
+                };
+            };
+            meshMaxError: number;
+        }>;
+    }>[];
 }
 export default CogTerrainLayer;

package/dist/esm/types/cogtiles/cogtiles.d.ts

@@ -1,8 +1,8 @@
-import { CogTiff, CogTiffImage } from '@cogeotiff/core';
+import { Tiff, TiffImage } from '@cogeotiff/core';
 import LZWDecoder from './lzw';
 import GeoImage, { GeoImageOptions } from '../geoimage/geoimage.ts';
 declare class CogTiles {
-    cog: CogTiff;
+    cog: Tiff;
     zoomRange: number[];
     tileSize: number;
     lowestOriginTileOffset: number[];
@@ -12,12 +12,12 @@ declare class CogTiles {
     lzw: LZWDecoder;
     options: GeoImageOptions;
     constructor(options: GeoImageOptions);
-    initializeCog(url: string): Promise<CogTiff>;
-    getTileSize(cog: CogTiff): number;
-    getZoomRange(cog: CogTiff): number[];
-    getBoundsAsLatLon(cog: CogTiff): [number, number, number, number];
-    getOriginAsLatLon(cog: CogTiff): number[];
-    getImageTileIndex(img: CogTiffImage): number[];
+    initializeCog(url: string): Promise<Tiff>;
+    getTileSize(cog: Tiff): number;
+    getZoomRange(cog: Tiff): number[];
+    getBoundsAsLatLon(cog: Tiff): [number, number, number, number];
+    getOriginAsLatLon(cog: Tiff): number[];
+    getImageTileIndex(img: TiffImage): number[];
     getResolutionFromZoomLevel(tileSize: number, z: number): number;
     getZoomLevelFromResolution(tileSize: number, resolution: number): number;
     getLatLon(input: number[]): number[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisatcz/deckgl-geolib",
-  "version": "1.9.2",
+  "version": "1.9.3-dev.0",
   "private": false,
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -28,19 +28,19 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "@chunkd/source-http": "^11.0.2",
-    "@cogeotiff/core": "8.1.0",
-    "@deck.gl/core": "^8.9.34",
-    "@deck.gl/extensions": "^8.9.34",
-    "@deck.gl/geo-layers": "^8.9.34",
-    "@deck.gl/layers": "^8.9.34",
-    "@deck.gl/mesh-layers": "^8.9.34",
-    "@deck.gl/react": "^8.9.34",
+    "@chunkd/source-http": "^11.1.0",
+    "@cogeotiff/core": "^9.0.3",
+    "@deck.gl/core": "^9.0.4",
+    "@deck.gl/extensions": "^9.0.4",
+    "@deck.gl/geo-layers": "^9.0.4",
+    "@deck.gl/layers": "^9.0.4",
+    "@deck.gl/mesh-layers": "^9.0.4",
+    "@deck.gl/react": "^9.0.4",
     "@fortawesome/fontawesome-svg-core": "^6.4.0",
-    "@luma.gl/constants": "^8.5.21",
-    "@math.gl/web-mercator": "^3.6.3",
+    "@luma.gl/constants": "^9.0.9",
+    "@math.gl/web-mercator": "^4.0.1",
     "chroma-js": "^2.4.2",
-    "geotiff": "^2.0.7",
+    "geotiff": "^2.1.3",
     "jpeg-js": "^0.4.4",
     "pako": "^2.1.0"
   }

package/src/cogbitmaplayer/CogBitmapLayer.ts

@@ -2,7 +2,7 @@ import { CompositeLayer } from '@deck.gl/core';
 import { TileLayer } from '@deck.gl/geo-layers';
 import { BitmapLayer } from '@deck.gl/layers';
 import { _TerrainExtension as TerrainExtension } from '@deck.gl/extensions';
-import GL from '@luma.gl/constants';
+import { GL } from '@luma.gl/constants';
 import CogTiles from '../cogtiles/cogtiles.ts';
 
 import { GeoImageOptions } from '../geoimage/geoimage.ts';
@@ -98,7 +98,7 @@ class CogBitmapLayer extends CompositeLayer<any> {
             bounds: [west, south, east, north],
             opacity: 1, // 0.6
             textureParameters: {
-              [GL.TEXTURE_MAG_FILTER]: this.blurredTexture ? GL.LINEAR : GL.NEAREST,
+              [GL.TEXTURE_MIN_FILTER]: this.blurredTexture ? GL.LINEAR : GL.NEAREST,
             },
             extensions: this.cogTiles?.options?.clampToTerrain ? [new TerrainExtension()] : [],
             ...(this.cogTiles?.options?.clampToTerrain?.terrainDrawMode

package/src/cogtiles/cogtiles.ts

@@ -1,6 +1,6 @@
 /* eslint 'max-len': [1, { code: 100, comments: 999, ignoreStrings: true, ignoreUrls: true }] */
 // COG loading
-import { CogTiff, CogTiffImage } from '@cogeotiff/core';
+import { Tiff, TiffImage } from '@cogeotiff/core';
 import { SourceHttp } from '@chunkd/source-http';
 
 // Image compression support
@@ -16,7 +16,7 @@ const EARTH_CIRCUMFERENCE = 40075000.0;
 const EARTH_HALF_CIRCUMFERENCE = 20037500.0;
 
 class CogTiles {
-  cog: CogTiff;
+  cog: Tiff;
 
   zoomRange = [0, 0];
 
@@ -48,9 +48,9 @@ class CogTiles {
     };
 
     const source = new SourceHttp(url);
-    this.cog = await CogTiff.create(source);
+    this.cog = await Tiff.create(source);
 
-    this.cog.images.forEach((image:CogTiffImage) => {
+    this.cog.images.forEach((image:TiffImage) => {
       image.loadGeoTiffTags();
     });
 
@@ -76,11 +76,11 @@ class CogTiles {
     return this.cog;
   }
 
-  getTileSize(cog: CogTiff) {
+  getTileSize(cog: Tiff) {
     return cog.images[cog.images.length - 1].tileSize.width;
   }
 
-  getZoomRange(cog: CogTiff) {
+  getZoomRange(cog: Tiff) {
     const img = cog.images[cog.images.length - 1];
 
     const minZoom = this.getZoomLevelFromResolution(
@@ -92,7 +92,7 @@ class CogTiles {
     return [minZoom, maxZoom];
   }
 
-  getBoundsAsLatLon(cog: CogTiff) {
+  getBoundsAsLatLon(cog: Tiff) {
     const { bbox } = cog.images[cog.images.length - 1];
 
     // console.log(bbox)
@@ -108,12 +108,12 @@ class CogTiles {
     return [minXYDeg[0], minXYDeg[1], maxXYDeg[0], maxXYDeg[1]] as [number, number, number, number];
   }
 
-  getOriginAsLatLon(cog: CogTiff) {
+  getOriginAsLatLon(cog: Tiff) {
     const { origin } = cog.images[cog.images.length - 1];
     return this.getLatLon(origin);
   }
 
-  getImageTileIndex(img: CogTiffImage) {
+  getImageTileIndex(img: TiffImage) {
     const ax = EARTH_HALF_CIRCUMFERENCE + img.origin[0];
     const ay = -(EARTH_HALF_CIRCUMFERENCE + (img.origin[1] - EARTH_CIRCUMFERENCE));
     // let mpt = img.resolution[0] * img.tileSize.width;