@gisatcz/deckgl-geolib 1.10.2-dev.5 → 1.10.2-dev.7

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

@@ -46,6 +46,10 @@ type _TerrainLayerProps = {
     wireframe?: boolean;
     /** Material props for lighting effect. * */
     material?: Material;
+    /**
+     * TODO
+     */
+    terrainOptions: Object;
     /**
      * @deprecated Use `loadOptions.terrain.workerUrl` instead
      */

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

@@ -22,7 +22,7 @@ declare class CogTiles {
     getResolutionFromZoomLevel(tileSize: number, z: number): number;
     getZoomLevelFromResolution(tileSize: number, resolution: number): number;
     getLatLon(input: number[]): number[];
-    getTile(x: number, y: number, z: number, bounds: Bounds): Promise<string>;
+    getTile(x: number, y: number, z: number, bounds: Bounds, meshMaxError: number): Promise<string>;
     getFormat(sampleFormat: number[] | number, bitsPerSample: number[] | number): any;
     getNoDataValue(tags: any): number;
 }

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

@@ -44,7 +44,7 @@ export default class GeoImage {
         height: number;
         rasters: any[];
         bounds: Bounds;
-    }, options: GeoImageOptions): Promise<string | {
+    }, options: GeoImageOptions, meshMaxError: any): Promise<string | {
         loaderData: {
             header: {};
         };
@@ -73,7 +73,7 @@ export default class GeoImage {
         width: number;
         height: number;
         rasters: any[];
-    }, options: GeoImageOptions): Promise<{
+    }, options: GeoImageOptions, meshMaxError: any): Promise<{
         loaderData: {
             header: {};
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisatcz/deckgl-geolib",
-  "version": "1.10.2-dev.5",
+  "version": "1.10.2-dev.7",
   "private": false,
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -10,8 +10,8 @@
   "scripts": {
     "rollup": "rollup -c",
     "start": "yarn && yarn rollup",
-    "lint": "eslint src/**/* -c ./.eslintrc.cjs",
-    "lintFix": "eslint src/**/* -c ./.eslintrc.cjs --fix"
+    "lint": "eslint 'src/**/*.{js, ts,tsx}' -c ./.eslintrc.cjs",
+    "lintFix": "eslint 'src/**/*.{js, ts,tsx}' -c ./.eslintrc.cjs --fix"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^25.0.1",

package/src/cogterrainlayer/CogTerrainLayer.ts

@@ -159,10 +159,15 @@ export type TerrainLayerProps = _TerrainLayerProps &
 	/** Material props for lighting effect. * */
 	material?: Material;
 
+  /**
+   * TODO
+   */
+  terrainOptions: Object
+
 	/**
 	 * @deprecated Use `loadOptions.terrain.workerUrl` instead
 	 */
-	workerUrl?: string;
+  workerUrl?: string;
   };
 
 // TODO remove elevationDecoder
@@ -230,8 +235,8 @@ export default class TerrainLayer<ExtraPropsT extends {} = {}> extends Composite
 
 	  if (!this.state.isTiled && shouldReload) {
       // When state.isTiled, elevationData cannot be an array
-      const terrain = this.loadTerrain(props as TerrainLoadProps);
-      this.setState({ terrain });
+      // const terrain = this.loadTerrain(props as TerrainLoadProps);
+      // this.setState({ terrain });
 	  }
 
 	  // TODO - remove in v9
@@ -266,7 +271,7 @@ export default class TerrainLayer<ExtraPropsT extends {} = {}> extends Composite
 	  const { fetch } = this.props;
 
 	  return fetch(elevationData, {
-      propName: 'elevationData', layer: this, loadOptions, signal,
+      propName: 'elevationData', layer: this, loadOptions, signal, loaders: [],
     });
   }
 
@@ -300,6 +305,7 @@ export default class TerrainLayer<ExtraPropsT extends {} = {}> extends Composite
       tile.index.y,
       tile.index.z,
       bounds,
+      this.props.meshMaxError,
     );
 
     return Promise.all([terrain]);

package/src/cogtiles/cogtiles.ts

@@ -143,7 +143,7 @@ class CogTiles {
     return cartographicPositionAdjusted;
   }
 
-  async getTile(x: number, y: number, z: number, bounds:Bounds) {
+  async getTile(x: number, y: number, z: number, bounds:Bounds, meshMaxError: number) {
     const wantedMpp = this.getResolutionFromZoomLevel(this.tileSize, z);
     const img = this.cog.getImageByResolution(wantedMpp);
     // await img.loadGeoTiffTags(1)
@@ -248,7 +248,7 @@ img.tags.get(339).value as Array<number>,
         width: this.tileSize,
         height: this.tileSize,
         bounds,
-      }, this.options);
+      }, this.options, meshMaxError);
 
       // console.log(decompressed.length)
 

package/src/geoimage/geoimage.ts

@@ -107,6 +107,7 @@ export default class GeoImage {
         bounds: Bounds
         },
     options: GeoImageOptions,
+    meshMaxError,
   ) {
     const mergedOptions = { ...DefaultGeoImageOptions, ...options };
 
@@ -114,7 +115,7 @@ export default class GeoImage {
       case 'image':
         return this.getBitmap(input, mergedOptions);
       case 'terrain':
-        return this.getHeightmap(input, mergedOptions);
+        return this.getHeightmap(input, mergedOptions, meshMaxError);
       default:
         return null;
     }
@@ -128,6 +129,7 @@ export default class GeoImage {
         height: number,
         rasters: any[] },
     options: GeoImageOptions,
+    meshMaxError,
   ) {
     let rasters = [];
     let width: number;
@@ -186,7 +188,7 @@ export default class GeoImage {
     let mesh;
     switch (tesselator) {
       case 'martini':
-        mesh = getMartiniTileMesh(terrainSkirtHeight, width, terrain);
+        mesh = getMartiniTileMesh(meshMaxError, width, terrain);
 
         break;
       case 'delatin':
@@ -197,7 +199,7 @@ export default class GeoImage {
         if (width === height && !(height && (width - 1))) {
           // fixme get terrain to separate method
           // terrain = getTerrain(data, width, height, elevationDecoder, 'martini');
-          mesh = getMartiniTileMesh(terrainSkirtHeight, width, terrain);
+          mesh = getMartiniTileMesh(meshMaxError, width, terrain);
         } else {
           // fixme get terrain to separate method
           // terrain = getTerrain(data, width, height, elevationDecoder, 'delatin');