@openglobus/og 1.0.0-rc30 → 1.0.0-rc31

package/lib/layer/BaseTileMaterialLayer.d.ts

@@ -1,21 +1,30 @@
+import type { EventsHandler } from "../Events";
 import { Layer } from "./Layer";
-import type { ILayerParams } from "./Layer";
+import type { ILayerParams, LayerEventsList } from "./Layer";
 import { Material } from "./Material";
 import type { NumberArray4 } from "../math/Vec4";
 import type { Node } from "../quadTree/Node";
+import type { Planet } from "../scene/Planet";
 import { Segment } from "../segment/Segment";
 export interface IBaseTileMaterialLayerParams extends ILayerParams {
     minNativeZoom?: number;
     maxNativeZoom?: number;
 }
+type BaseTileMaterialLayerEventsList = ["load", "loadend"];
+export type BaseTileMaterialLayerEventsType = EventsHandler<BaseTileMaterialLayerEventsList> & EventsHandler<LayerEventsList>;
 /**
  * Shared tile material application for imagery/canvas tile layers.
  * It can be applied to any type of tiled data that can be displayed on the planet in either of these two ways, such as BUildings, vector tiles etc.
  */
 export declare abstract class BaseTileMaterialLayer extends Layer {
+    events: BaseTileMaterialLayerEventsType;
     minNativeZoom: number;
     maxNativeZoom: number;
     constructor(name?: string | null, options?: IBaseTileMaterialLayerParams);
+    addTo(planet: Planet): void;
+    remove(): this;
+    protected _checkLoadend(): void;
+    protected _onLoadend: () => void;
     applyMaterial(material: Material, forceLoading?: boolean): NumberArray4;
     protected _applyMaterialDefaultCore(material: Material, forceLoading?: boolean): NumberArray4;
     protected _applyMaterialFastCore(material: Material, forceLoading?: boolean): NumberArray4;
@@ -34,3 +43,4 @@ export declare abstract class BaseTileMaterialLayer extends Layer {
     protected _defaultMaterialLoadForce(_mat: Material, material: Material, targetNode: Node, forceLoading: boolean): boolean;
     clearMaterial(material: Material): void;
 }
+export {};

package/lib/layer/CanvasTiles.d.ts

@@ -1,9 +1,6 @@
-import type { EventCallback, EventsHandler } from "../Events";
 import { BaseTileMaterialLayer } from "./BaseTileMaterialLayer";
 import type { IBaseTileMaterialLayerParams } from "./BaseTileMaterialLayer";
-import type { LayerEventsList } from "./Layer";
 import { Material } from "../layer/Material";
-import { Planet } from "../scene/Planet";
 type ApplyImageFunc = (material: HTMLCanvasElement | ImageBitmap | HTMLImageElement) => void;
 type DrawTileCallback = (material: Material, applyImage: ApplyImageFunc) => void;
 export interface ICanvasTilesParams extends IBaseTileMaterialLayerParams {
@@ -12,8 +9,6 @@ export interface ICanvasTilesParams extends IBaseTileMaterialLayerParams {
     minNativeZoom?: number;
     maxNativeZoom?: number;
 }
-type CanvasTilesEventsList = ["load", "loadend"];
-type CanvasTilesEventsType = EventsHandler<CanvasTilesEventsList> & EventsHandler<LayerEventsList>;
 /**
  * Layer that renders each tile as a separate canvas object.
  * @class
@@ -36,7 +31,6 @@ type CanvasTilesEventsType = EventsHandler<CanvasTilesEventsList> & EventsHandle
 declare class CanvasTiles extends BaseTileMaterialLayer {
     static MAX_REQUESTS: number;
     static __requestsCounter: number;
-    events: CanvasTilesEventsType;
     animated: boolean;
     /**
      * Current creating tiles counter.
@@ -56,11 +50,7 @@ declare class CanvasTiles extends BaseTileMaterialLayer {
      * @public
      */
     drawTile: DrawTileCallback;
-    protected _onLoadend_: EventCallback | null;
     constructor(name: string | null, options: ICanvasTilesParams);
-    addTo(planet: Planet): void;
-    remove(): this;
-    _onLoadend(): void;
     get instanceName(): string;
     get isIdle(): boolean;
     /**

package/lib/layer/GeoTIFFLayer.d.ts

@@ -1,7 +1,8 @@
 import type { EventsHandler } from "../Events";
 import { Material } from "./Material";
 import { BaseTileMaterialLayer } from "./BaseTileMaterialLayer";
-import type { LayerEventsList } from "./Layer";
+import type { BaseTileMaterialLayerEventsType } from "./BaseTileMaterialLayer";
+import type { Planet } from "../scene/Planet";
 import type { Segment } from "../segment/Segment";
 import { type IGeoTIFFLayerParams, type IGeoTIFFMetadata, type IGeoTIFFReader, type IGeoTIFFRenderOptions, type IGeoTIFFSourceItem, type DecodedTileData } from "./geotiff";
 interface ICachedTile {
@@ -12,8 +13,8 @@ interface IPendingTile {
     material: Material;
     forceLoading: boolean;
 }
-type GeoTIFFEventsList = ["load", "loadend", "ready", "error"];
-type GeoTIFFEventsType = EventsHandler<GeoTIFFEventsList> & EventsHandler<LayerEventsList>;
+type GeoTIFFEventsList = ["ready", "error"];
+type GeoTIFFEventsType = EventsHandler<GeoTIFFEventsList> & BaseTileMaterialLayerEventsType;
 /**
  * GeoTIFFLayer renders Cloud Optimized GeoTIFF (COG) and standard GeoTIFF rasters
  * onto the OpenGlobus 3D globe using progressive overview pyramid tiles.
@@ -33,11 +34,18 @@ export declare class GeoTIFFLayer extends BaseTileMaterialLayer {
     protected _renderOptionsVersion: number;
     protected _debounceUpdateTimer: any;
     protected _pendingsQueue: IPendingTile[];
+    protected _sourceOptions: IGeoTIFFLayerParams;
+    protected _readerDestroyed: boolean;
     static MAX_REQUESTS: number;
     constructor(name: string | null, options?: IGeoTIFFLayerParams);
+    /**
+     * Opens the layer source. Also used to reopen it when the layer returns to the planet.
+     */
+    protected _initReader(): Promise<IGeoTIFFMetadata>;
     static fromUrl(name: string, url: string, options?: IGeoTIFFLayerParams): Promise<GeoTIFFLayer>;
     static fromBlob(name: string, blob: Blob | File, options?: IGeoTIFFLayerParams): Promise<GeoTIFFLayer>;
     static fromSources(name: string, sources: IGeoTIFFSourceItem[], options?: IGeoTIFFLayerParams): Promise<GeoTIFFLayer>;
+    addTo(planet: Planet): void;
     get instanceName(): string;
     get isIdle(): boolean;
     get reader(): IGeoTIFFReader;

package/lib/layer/Vector.d.ts

@@ -5,8 +5,7 @@ import { EntityCollectionsTreeStrategy } from "../quadTree/EntityCollectionsTree
 import type { EventsHandler } from "../Events";
 import { GeometryHandler } from "../entity/geometry/GeometryHandler";
 import { BaseTileMaterialLayer } from "./BaseTileMaterialLayer";
-import type { IBaseTileMaterialLayerParams } from "./BaseTileMaterialLayer";
-import type { LayerEventsList } from "./Layer";
+import type { BaseTileMaterialLayerEventsType, IBaseTileMaterialLayerParams } from "./BaseTileMaterialLayer";
 import type { NumberArray3 } from "../math/Vec3";
 import { Planet } from "../scene/Planet";
 import { Material } from "./Material";
@@ -35,7 +34,7 @@ type VectorEventsList = [
     "entityadd",
     "entityremove"
 ];
-export type VectorEventsType = EventsHandler<VectorEventsList> & EventsHandler<LayerEventsList>;
+export type VectorEventsType = EventsHandler<VectorEventsList> & BaseTileMaterialLayerEventsType;
 /**
  * Vector layer is an alternative entity storage. Used for geospatial data rendering like
  * points, lines, polygons, geometry objects, etc.

package/lib/layer/XYZ.d.ts

@@ -1,8 +1,6 @@
 import { BaseTileMaterialLayer } from "./BaseTileMaterialLayer";
 import type { IBaseTileMaterialLayerParams } from "./BaseTileMaterialLayer";
-import type { LayerEventsList } from "./Layer";
 import { Segment } from "../segment/Segment";
-import type { EventsHandler } from "../Events";
 import { Material } from "./Material";
 import type { FetchCache } from "../utils/Loader";
 export interface IXYZParams extends IBaseTileMaterialLayerParams {
@@ -18,8 +16,6 @@ export interface IXYZParams extends IBaseTileMaterialLayerParams {
      */
     cache?: FetchCache;
 }
-type XYZEventsList = ["load", "loadend"];
-type XYZEventsType = EventsHandler<XYZEventsList> & EventsHandler<LayerEventsList>;
 /**
  * Represents an imagery tiles source provider.
  * @class
@@ -52,7 +48,6 @@ type XYZEventsType = EventsHandler<XYZEventsList> & EventsHandler<LayerEventsLis
  * });
  */
 export declare class XYZ extends BaseTileMaterialLayer {
-    events: XYZEventsType;
     /**
      * Tile url source template.
      * @public
@@ -137,4 +132,3 @@ export declare class XYZ extends BaseTileMaterialLayer {
      */
     protected _correctFullExtent(): void;
 }
-export {};

package/lib/layer/geotiff/GeoTIFFReader.d.ts

@@ -7,6 +7,8 @@ export declare class GeoTIFFReader implements IGeoTIFFReader {
     options: IGeoTIFFReaderParams;
     source: GeoTIFF | null;
     images: GeoTIFFImage[];
+    /** Internal transparency mask of every entry of images, null when the file has none */
+    masks: (GeoTIFFImage | null)[];
     workerPool: Pool | null;
     metadata: IGeoTIFFMetadata | null;
     extentWgs84: Extent;
@@ -18,6 +20,7 @@ export declare class GeoTIFFReader implements IGeoTIFFReader {
     isReady: boolean;
     private _poolHandle;
     private _projHelper;
+    private _convertPhotometric;
     private _activeReads;
     private _destroyed;
     constructor(options?: IGeoTIFFReaderParams);