@gisatcz/deckgl-geolib 1.3.0 → 1.3.1-dev.1

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

@@ -1,10 +1,15 @@
 import { CompositeLayer } from '@deck.gl/core';
-import { GeoImageOptions } from '../geoimage/geoimage';
+import CogTiles from '../cogtiles/cogtiles.ts';
+import { GeoImageOptions } from '../geoimage/geoimage.ts';
 declare class CogBitmapLayer extends CompositeLayer<any> {
     static layerName: string;
     id: string;
     url: string;
     static displayName: string;
+    cogTiles: CogTiles;
+    tileSize: number;
+    minZoom: number;
+    maxZoom: number;
     constructor(id: string, url: string, options: GeoImageOptions);
     initializeState(): void;
     init(url: string): Promise<void>;

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

@@ -1,7 +1,13 @@
 import { CompositeLayer } from '@deck.gl/core';
-import { GeoImageOptions } from '../geoimage/geoimage';
+import CogTiles from '../cogtiles/cogtiles.ts';
+import { GeoImageOptions } from '../geoimage/geoimage.ts';
 declare class CogTerrainLayer extends CompositeLayer<any> {
     static layerName: string;
+    terrainCogTiles: CogTiles;
+    bitmapCogTiles: CogTiles;
+    tileSize: number;
+    minZoom: number;
+    maxZoom: number;
     bitmapUrl: string;
     urlType: 'none' | 'tile' | 'cog';
     id: string;

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

@@ -1,6 +1,6 @@
 import { CogTiff, CogTiffImage } from '@cogeotiff/core';
-import LZWDecoder from './lzw';
-import GeoImage, { GeoImageOptions } from '../geoimage/geoimage';
+import LZWDecoder from './lzw.js';
+import GeoImage, { GeoImageOptions } from '../geoimage/geoimage.ts';
 declare class CogTiles {
     cog: CogTiff;
     zoomRange: number[];

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

@@ -1,7 +1,7 @@
-import CogBitmapLayer from './cogbitmaplayer/CogBitmapLayer';
-import CogTerrainLayer from './cogterrainlayer/CogTerrainLayer';
-import cogtiles from './cogtiles/cogtiles';
-import GeoImage from './geoimage/geoimage';
+import CogBitmapLayer from './cogbitmaplayer/CogBitmapLayer.ts';
+import CogTerrainLayer from './cogterrainlayer/CogTerrainLayer.ts';
+import cogtiles from './cogtiles/cogtiles.ts';
+import GeoImage from './geoimage/geoimage.ts';
 declare const _default: {
     CogBitmapLayer: typeof CogBitmapLayer;
     CogTerrainLayer: typeof CogTerrainLayer;

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@gisatcz/deckgl-geolib",
-  "version": "1.3.0",
+  "version": "1.3.1-dev.1",
   "private": false,
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
+  "type": "module",
   "types": "dist/index.d.ts",
   "sideEffects": false,
   "scripts": {
@@ -49,6 +50,7 @@
     "jpeg-js": "^0.4.4",
     "pako": "^2.1.0",
     "rollup": "^3.25.1",
+    "rollup-plugin-polyfill-node": "^0.12.0",
     "url": "^0.11.1"
   }
 }

package/rollup.config.mjs

@@ -4,6 +4,7 @@ import typescript from '@rollup/plugin-typescript';
 // import dts from 'rollup-plugin-dts';
 import { terser } from 'rollup-plugin-terser';
 import json from '@rollup/plugin-json';
+import polyfills from 'rollup-plugin-polyfill-node';
 import path from 'path';
 
 const packageJson = {
@@ -56,6 +57,7 @@ export default [
       },
     ],
     plugins: [
+      polyfills(),
       json(),
       resolve({
         preferBuiltins: true,

package/src/cogbitmaplayer/CogBitmapLayer.ts

@@ -1,15 +1,10 @@
 import { CompositeLayer } from '@deck.gl/core';
 import { TileLayer } from '@deck.gl/geo-layers';
 import { BitmapLayer } from '@deck.gl/layers';
-import CogTiles from '../cogtiles/cogtiles';
+import CogTiles from '../cogtiles/cogtiles.ts';
 
-import { GeoImageOptions } from '../geoimage/geoimage';
+import { GeoImageOptions } from '../geoimage/geoimage.ts';
 
-let cogTiles: CogTiles;
-
-let tileSize: number;
-let minZoom: number;
-let maxZoom: number;
 // let needsRerender: boolean = false;
 // let extent = [0, 0, 0, 0]
 
@@ -24,6 +19,14 @@ class CogBitmapLayer extends CompositeLayer<any> {
 
   static displayName: string;
 
+  cogTiles: CogTiles;
+
+  tileSize: number;
+
+  minZoom: number;
+
+  maxZoom: number;
+
   constructor(id:string, url:string, options:GeoImageOptions) {
     super({});
     this.id = id;
@@ -31,7 +34,7 @@ class CogBitmapLayer extends CompositeLayer<any> {
     //   initialized: false,
     // };
     // this._isLoaded = false;
-    cogTiles = new CogTiles(options);
+    this.cogTiles = new CogTiles(options);
 
     this.url = url;
     // setTimeout(() => {
@@ -48,11 +51,11 @@ class CogBitmapLayer extends CompositeLayer<any> {
   }
 
   async init(url:string) {
-    const cog = await cogTiles.initializeCog(url);
+    const cog = await this.cogTiles.initializeCog(url);
     this.setState({ initialized: true });
-    tileSize = cogTiles.getTileSize(cog);
-    const zoomRange = cogTiles.getZoomRange(cog);
-    [minZoom, maxZoom] = zoomRange;
+    this.tileSize = this.cogTiles.getTileSize(cog);
+    const zoomRange = this.cogTiles.getZoomRange(cog);
+    [this.minZoom, this.maxZoom] = zoomRange;
 
     // console.log(zoomRange)
 
@@ -64,19 +67,19 @@ class CogBitmapLayer extends CompositeLayer<any> {
   }
 
   renderLayers() {
-    if (cogTiles.cog) {
+    if (this.cogTiles.cog) {
       const layer = new TileLayer({
         id: `${this.id}-${String(performance.now())}`,
-        getTileData: (tileData: any) => cogTiles.getTile(
+        getTileData: (tileData: any) => this.cogTiles.getTile(
           tileData.index.x,
           tileData.index.y,
           tileData.index.z,
         ),
-        minZoom,
-        maxZoom,
-        tileSize,
+        minZoom: this.minZoom,
+        maxZoom: this.maxZoom,
+        tileSize: this.tileSize,
         maxRequests: 6,
-        extent: cogTiles.cog ? cogTiles.getBoundsAsLatLon(cogTiles.cog) : null,
+        extent: this.cogTiles.cog ? this.cogTiles.getBoundsAsLatLon(this.cogTiles.cog) : null,
 
         renderSubLayers: (props: any) => {
           const {

package/src/cogterrainlayer/CogTerrainLayer.ts

@@ -3,22 +3,24 @@ import { TileLayer, TerrainLayer } from '@deck.gl/geo-layers';
 
 // FIXME
 // eslint-disable-next-line
-import { getTileUrl, isCogUrl, isTileServiceUrl } from '../utilities/tileurls';
-import CogTiles from '../cogtiles/cogtiles';
+import { getTileUrl, isCogUrl, isTileServiceUrl } from '../utilities/tileurls.ts';
+import CogTiles from '../cogtiles/cogtiles.ts';
 
-import { GeoImageOptions } from '../geoimage/geoimage';
-
-let terrainCogTiles: CogTiles;
-let bitmapCogTiles: CogTiles;
-
-let tileSize: number;
-let minZoom: number;
-let maxZoom: number;
-// let needsRerender: boolean = false;
+import { GeoImageOptions } from '../geoimage/geoimage.ts';
 
 class CogTerrainLayer extends CompositeLayer<any> {
   static layerName = 'CogTerrainLayer';
 
+  terrainCogTiles: CogTiles;
+
+  bitmapCogTiles: CogTiles;
+
+  tileSize: number;
+
+  minZoom: number;
+
+  maxZoom: number;
+
   bitmapUrl: string;
 
   urlType: 'none' | 'tile' | 'cog' = 'none';
@@ -44,15 +46,15 @@ class CogTerrainLayer extends CompositeLayer<any> {
         this.bitmapUrl = bitmapUrl;
         this.urlType = 'tile';
       } else if (isCogUrl(bitmapUrl)) {
-        bitmapCogTiles = new CogTiles(bitmapOptions!);
-        bitmapCogTiles.initializeCog(bitmapUrl);
+        this.bitmapCogTiles = new CogTiles(bitmapOptions!);
+        this.bitmapCogTiles.initializeCog(bitmapUrl);
         this.urlType = 'cog';
       } else {
         console.warn('URL needs to point to a valid cog file, or needs to be in the {x}{y}{z} format.');
       }
     }
 
-    terrainCogTiles = new CogTiles(terrainOptions);
+    this.terrainCogTiles = new CogTiles(terrainOptions);
     // this.init(terrainUrl);
     this.terrainUrl = terrainUrl;
   }
@@ -70,17 +72,17 @@ class CogTerrainLayer extends CompositeLayer<any> {
   async init(terrainUrl: string) {
     // console.log("LAYER INITIALIZE STATE");
 
-    const cog = await terrainCogTiles.initializeCog(terrainUrl);
-    tileSize = terrainCogTiles.getTileSize(cog);
+    const cog = await this.terrainCogTiles.initializeCog(terrainUrl);
+    this.tileSize = this.terrainCogTiles.getTileSize(cog);
 
-    const zoomRange = terrainCogTiles.getZoomRange(cog);
-    [minZoom, maxZoom] = zoomRange;
+    const zoomRange = this.terrainCogTiles.getZoomRange(cog);
+    [this.minZoom, this.maxZoom] = zoomRange;
 
     this.setState({ initialized: true });
   }
 
   renderLayers() {
-    if (terrainCogTiles.cog) {
+    if (this.terrainCogTiles.cog) {
     // console.log("LAYER RENDER");
 
       let bitmapTile: string;
@@ -99,17 +101,17 @@ class CogTerrainLayer extends CompositeLayer<any> {
       const layer = new TileLayer({
         id: `${this.id}-${String(performance.now())}`,
         zoomOffset: -1,
-        getTileData: (tileData: any) => terrainCogTiles.getTile(
+        getTileData: (tileData: any) => this.terrainCogTiles.getTile(
           tileData.index.x,
           tileData.index.y,
           tileData.index.z,
         ),
-        minZoom,
-        maxZoom,
-        tileSize,
+        minZoom: this.minZoom,
+        maxZoom: this.maxZoom,
+        tileSize: this.tileSize,
         maxRequests: 6,
         refinementStrategy: 'best-available',
-        extent: terrainCogTiles.getBoundsAsLatLon(terrainCogTiles.cog),
+        extent: this.terrainCogTiles.getBoundsAsLatLon(this.terrainCogTiles.cog),
 
         renderSubLayers: (props: any) => {
           if (props.data && (props.tile.index.x !== undefined)) {
@@ -123,7 +125,7 @@ class CogTerrainLayer extends CompositeLayer<any> {
                 );
                 break;
               case 'cog':
-                bitmapTile = bitmapCogTiles.getTile(
+                bitmapTile = this.bitmapCogTiles.getTile(
                   props.tile.index.x,
                   props.tile.index.y,
                   props.tile.index.z,
@@ -149,8 +151,8 @@ class CogTerrainLayer extends CompositeLayer<any> {
                 props.tile.bbox.east,
                 props.tile.bbox.north,
               ],
-              minZoom,
-              maxZoom,
+              minZoom: this.minZoom,
+              maxZoom: this.maxZoom,
               loadOptions: {
                 terrain: {
                   skirtHeight: 2000,

package/src/cogtiles/cogtiles.ts

@@ -7,10 +7,10 @@ import { SourceUrl } from '@chunkd/source-url';
 import { inflate } from 'pako';
 import jpeg from 'jpeg-js';
 import { worldToLngLat } from '@math.gl/web-mercator';
-import LZWDecoder from './lzw';
+import LZWDecoder from './lzw.js';
 
 // Bitmap styling
-import GeoImage, { GeoImageOptions } from '../geoimage/geoimage'; // TODO: remove absolute path
+import GeoImage, { GeoImageOptions } from '../geoimage/geoimage.ts'; // TODO: remove absolute path
 
 const EARTH_CIRCUMFERENCE = 40075000.0;
 const EARTH_HALF_CIRCUMFERENCE = 20037500.0;

package/src/index.ts

@@ -1,7 +1,7 @@
-import CogBitmapLayer from './cogbitmaplayer/CogBitmapLayer';
-import CogTerrainLayer from './cogterrainlayer/CogTerrainLayer';
-import cogtiles from './cogtiles/cogtiles';
-import GeoImage from './geoimage/geoimage';
+import CogBitmapLayer from './cogbitmaplayer/CogBitmapLayer.ts';
+import CogTerrainLayer from './cogterrainlayer/CogTerrainLayer.ts';
+import cogtiles from './cogtiles/cogtiles.ts';
+import GeoImage from './geoimage/geoimage.ts';
 
 export default {
   CogBitmapLayer,