@openglobus/og 1.0.0-rc33 → 1.0.0-rc34

package/lib/proj/epsgIo.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Registers the CRS in {@link proj4}, taking its definition from epsg.io. Returns whether the
+ * projection became available, i.e. whether the data in that CRS is worth reading again.
+ */
+export declare function defineProjection(crsCode: number): Promise<boolean>;

package/lib/proj/proj4.d.ts

@@ -0,0 +1 @@
+export declare const proj4: any;

package/lib/quadTree/EntityCollectionNode.d.ts

@@ -33,6 +33,8 @@ declare class EntityCollectionNode {
     protected _setExtentBounds(): void;
     __setLonLat__(entity: Entity): LonLat;
     buildTree(entities: Entity[], rightNow?: boolean): void;
+    protected _addEntitiesToChildNodes(entities: Entity[], rightNow?: boolean): void;
+    protected _moveCollectionToChildNodes(): void;
     isInside(entity: Entity): boolean;
     createChildNodes(): void;
     collectRenderCollectionsPASS1(visibleNodes: NodesDict, outArr: EntityCollection[]): void;

package/lib/terrain/GlobusTerrain.d.ts

@@ -103,6 +103,13 @@ declare class GlobusTerrain extends EmptyTerrain {
      * @param {boolean} [forceLoading=false] - Forces loading even if default filter would skip it.
      */
     loadTerrain(segment: Segment, forceLoading?: boolean): void;
+    /**
+     * Converts loaded segment data to elevations and applies them.
+     * @protected
+     * @param {Segment} segment - Segment that requested terrain data.
+     * @param {any} data - Loaded data.
+     */
+    protected _onTerrainLoaded(segment: Segment, data: any): void;
     protected _getSubdomain(): string;
     buildURL(x: number, y: number, z: number, tileGroup: number): string;
     /**

package/lib/terrain/RgbTerrain.d.ts

@@ -4,6 +4,7 @@ import { GlobusTerrain } from "./GlobusTerrain";
 import { LonLat } from "../LonLat";
 import { Segment } from "../segment/Segment";
 import type { TypedArray } from "../utils/shared";
+import type { DecodeHeightsRowFunc, IRgbHeightsParams } from "./rgbTerrainGrid";
 export type RgbTerrainEncoding = "rgb" | "terrarium";
 export type RgbToHeightFunc = (r: number, g: number, b: number, minHeight: number, resolution: number) => number;
 export declare function rgbToHeightRgb(r: number, g: number, b: number, minHeight: number, resolution: number): number;
@@ -39,16 +40,37 @@ declare class RgbTerrain extends GlobusTerrain {
     protected _minHeight: number;
     protected _resolution: number;
     protected _rgbToHeight: RgbToHeightFunc;
+    protected _encoding: number;
     constructor(name: string | null, options?: IRgbTerrainParams);
     static checkNoDataValue(noDataValues: number[] | TypedArray, value: number): boolean;
     rgb2Height(r: number, g: number, b: number): number;
     isBlur(segment: Segment): boolean;
     protected _createTemporalCanvas(size: number): CanvasRenderingContext2D;
+    /**
+     * Returns true when "rgb" or "terrarium" heights are decoded without rgb2Height calls.
+     * @protected
+     * @returns {boolean} -
+     */
+    protected _isBuiltInDecoding(): boolean;
+    /**
+     * Returns true when the loaded image heights are created in the worker.
+     * @protected
+     * @param {HTMLImageElement | ImageBitmap} data - Loaded image.
+     * @returns {boolean} -
+     */
+    protected _isWorkerDecoding(data: HTMLImageElement | ImageBitmap): boolean;
+    protected _getHeightsParams(segment: Segment | null, tileZoom: number, preventChildren: boolean): IRgbHeightsParams;
+    protected _createDecodeRow(rgbaData: number[] | TypedArray, p: IRgbHeightsParams): DecodeHeightsRowFunc;
+    /**
+     * Saves the tile and its subdivision levels heights to cache.
+     * @protected
+     * @returns {Float32Array} - Tile heights.
+     */
+    protected _cacheHeightsLevels(heights: Float32Array, p: IRgbHeightsParams, tileGroup: number, tileX: number, tileY: number, tileZoom: number, extent: Extent): Float32Array;
+    protected _onTerrainLoaded(segment: Segment, data: HTMLImageElement | ImageBitmap): void;
     protected _createHeights(data: HTMLImageElement | ImageBitmap, segment: Segment | null, tileGroup: number, tileX: number, tileY: number, tileZoom: number, extent: Extent, preventChildren: boolean): TypedArray | number[];
     getHeightAsync(lonLat: LonLat, callback: (h: number) => void, zoom?: number): boolean;
-    extractElevationSimple(rgbaData: number[] | TypedArray, noDataValues: number[] | TypedArray, availableParentData: (TypedArray | number[] | null) | undefined, availableParentOffsetX: number, availableParentOffsetY: number, availableZoomDiff: number, skipPositiveHeights: boolean, outCurrenElevations: number[] | TypedArray, heightFactor: number | undefined, imageSize: number): void;
+    extractHeightsRgbRow(rgbaData: number[] | TypedArray, row: number, heightFactor: number, noDataValues: number[] | TypedArray, availableParentData: TypedArray | number[] | null, availableParentOffsetX: number, availableParentOffsetY: number, availableZoomDiff: number, skipPositiveHeights: boolean, size: number, parentScale: number, outHeights: Float32Array, noDataHeight: number): void;
     extractElevationTilesRgbNonPowerOfTwo(rgbaData: number[] | TypedArray, outCurrenElevations: number[] | TypedArray, heightFactor?: number): void;
-    extractElevationTilesRgb(rgbaData: number[] | TypedArray, heightFactor: number, noDataValues: number[] | TypedArray, availableParentData: (TypedArray | number[] | null) | undefined, availableParentTileX: number, availableParentTileY: number, availableParentTileZoom: number, currentTileX: number, currentTileY: number, currentTileZoom: number, skipPositiveHeights: boolean, outCurrenElevations: number[] | TypedArray, outChildrenElevations: number[][][] | TypedArray[][]): void;
-    extractElevationTilesRgbNoChildren(rgbaData: number[] | TypedArray, heightFactor: number, noDataValues: number[] | TypedArray, availableParentData: (TypedArray | number[] | null) | undefined, availableParentTileX: number, availableParentTileY: number, availableParentTileZoom: number, currentTileX: number, currentTileY: number, currentTileZoom: number, skipPositiveHeights: boolean, outCurrenElevations: number[] | TypedArray): void;
 }
 export { RgbTerrain };

package/lib/terrain/rgbTerrainGrid.d.ts

@@ -0,0 +1,81 @@
+import type { TypedArray } from "../utils/shared";
+export declare const RGB_ENCODING_CUSTOM = -1;
+export declare const RGB_ENCODING_RGB = 0;
+export declare const RGB_ENCODING_TERRARIUM = 1;
+/** Writes a row of pixel heights, NaN for no data pixels. */
+export type DecodeHeightsRowFunc = (row: number, outHeights: Float32Array) => void;
+export interface IRgbDecodeParams {
+    encoding: number;
+    minHeight: number;
+    resolution: number;
+    heightFactor: number;
+    noDataValues: number[] | TypedArray;
+    parentData: number[] | TypedArray | null;
+    parentOffsetX: number;
+    parentOffsetY: number;
+    parentZoomDiff: number;
+    skipPositiveHeights: boolean;
+}
+export interface IRgbHeightsParams {
+    decode: IRgbDecodeParams;
+    size: number;
+    gridSize: number;
+    levels: number;
+    noDataHeight: number;
+}
+/**
+ * Packs heights parameters to the buffer for the worker message.
+ * @param {number} id - Worker task id.
+ * @param {IRgbHeightsParams} p - Heights parameters, parent data is sent separately.
+ * @returns {Float64Array} -
+ */
+export declare function packRgbHeightsParams(id: number, p: IRgbHeightsParams): Float64Array;
+/**
+ * Unpacks heights parameters from the worker message buffer.
+ * @param {Float64Array} params - Packed parameters.
+ * @param {Float32Array | null} parentData - Parent segment elevations.
+ * @returns {Array} - Task id and parameters (exactly 2 entries).
+ */
+export declare function unpackRgbHeightsParams(params: Float64Array, parentData: Float32Array | null): [number, IRgbHeightsParams];
+/**
+ * Returns vertex grid cells for the image size, 2^n and (2^n + 1) sizes only.
+ * @param {number} size - Image size.
+ * @returns {number} -
+ */
+export declare function getGridCells(size: number): number;
+export declare function getParentHeight(oneByDz2: number, offsetX: number, offsetY: number, heights: TypedArray | number[], i: number, j: number, skipPositiveHeights?: boolean): number;
+/**
+ * Decodes "rgb" or "terrarium" encoded pixel row heights.
+ * @param {number[] | TypedArray} rgbaData - Image RGBA data.
+ * @param {number} row - Pixel row.
+ * @param {number} size - Image size.
+ * @param {number} parentScale - Parent grid cells by image grid cells.
+ * @param {IRgbDecodeParams} p - Decode parameters.
+ * @param {Float32Array} outHeights - Row heights.
+ * @param {number} noDataHeight - Height for no data pixels.
+ */
+export declare function decodeRgbHeightsRow(rgbaData: number[] | TypedArray, row: number, size: number, parentScale: number, p: IRgbDecodeParams, outHeights: Float32Array, noDataHeight: number): void;
+/**
+ * Converts size x size pixel heights to (size + 1) x (size + 1) vertex grid in pixel corners.
+ * @param {number} size - Image size.
+ * @param {DecodeHeightsRowFunc} decodeRow - Decodes pixel row heights, NaN for no data.
+ * @param {number} noDataHeight - Height for vertices without data around.
+ * @returns {Float32Array} -
+ */
+export declare function createVertexGrid(size: number, decodeRow: DecodeHeightsRowFunc, noDataHeight: number): Float32Array;
+/**
+ * Takes (gridSize + 1) x (gridSize + 1) vertices of the cells x cells square starting at
+ * the row0, col0 vertex of the (size + 1) x (size + 1) grid. Cells must be gridSize multiplied by a power of two.
+ */
+export declare function sampleSubGrid(grid: Float32Array, size: number, row0: number, col0: number, cells: number, gridSize: number, out?: Float32Array, outOffset?: number): Float32Array;
+/**
+ * Creates the tile heights grid and its subdivision levels, each tile is (gridSize + 1) x (gridSize + 1).
+ * Output order is the tile itself, then 2x2 tiles of the first level, 4x4 of the second and so on, row by row.
+ * @param {number} size - Image size, 2^n or (2^n + 1).
+ * @param {number} gridSize - Tile grid size.
+ * @param {number} levels - Subdivision levels.
+ * @param {DecodeHeightsRowFunc} decodeRow - Decodes pixel row heights, NaN for no data.
+ * @param {number} noDataHeight - Height for vertices without data.
+ * @returns {Float32Array} -
+ */
+export declare function createHeightsLevels(size: number, gridSize: number, levels: number, decodeRow: DecodeHeightsRowFunc, noDataHeight: number): Float32Array;

package/lib/utils/RgbTerrainWorker.d.ts

@@ -0,0 +1,21 @@
+import { BaseWorker } from "./BaseWorker";
+import { Segment } from "../segment/Segment";
+import type { IRgbHeightsParams } from "../terrain/rgbTerrainGrid";
+export interface IRgbTerrainWorkerTask {
+    segment: Segment;
+    bitmap: ImageBitmap;
+    params: IRgbHeightsParams;
+    callback: (heights: Float32Array | null) => void;
+}
+type MessageEventExt = MessageEvent & {
+    data: {
+        id: number;
+        heights: Float32Array | null;
+    };
+};
+declare class RgbTerrainWorker extends BaseWorker<IRgbTerrainWorkerTask> {
+    constructor(numWorkers?: number);
+    protected _onMessage(e: MessageEventExt): void;
+    make(task: IRgbTerrainWorkerTask): void;
+}
+export { RgbTerrainWorker };

package/lib/utils/RgbTerrainWorker.worker.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@openglobus/og",
-    "version": "1.0.0-rc33",
+    "version": "1.0.0-rc34",
     "description": "[openglobus](https://www.openglobus.org/) is a javascript/typescript library designed to display interactive 3d maps and planets with map tiles, imagery and vector data, markers, and 3D objects. It uses the WebGL technology, open source, and completely free.",
     "main": "lib/og.es.js",
     "types": "lib/index.d.ts",
@@ -55,6 +55,7 @@
         "@rollup/plugin-terser": "^1.0.0",
         "@types/draco3d": "^1.4.10",
         "@types/node": "^22.15.3",
+        "@types/proj4": "^2.5.6",
         "@typescript-eslint/eslint-plugin": "^8.65.0",
         "@typescript-eslint/parser": "^8.65.0",
         "clean-jsdoc-theme": "^5.1.0",
@@ -80,8 +81,9 @@
         "og"
     ],
     "dependencies": {
+        "@photostructure/tz-lookup": "^11.6.1",
         "geotiff": "^3.0.5",
-        "tz-lookup": "^6.1.25",
-        "@photostructure/tz-lookup": "^11.6.1"
+        "proj4": "^2.22.0",
+        "tz-lookup": "^6.1.25"
     }
 }