@openglobus/og 0.28.7 → 1.0.0-rc10

package/lib/layer/Layer.d.ts

@@ -23,7 +23,7 @@ export interface ILayerParams {
     fading?: boolean;
     height?: number;
     textureFilter?: string;
-    isSRGB?: boolean;
+    colorSpace?: string | number;
     pickingEnabled?: boolean;
     preLoadZoomLevels?: number[];
     extent?: Extent | [[number, number], [number, number]];
@@ -33,51 +33,67 @@ export interface ILayerParams {
     shininess?: number;
     nightTextureCoefficient?: number;
     iconSrc?: string | null;
+    waitForParentMaterial?: boolean;
 }
 /**
  * @class
  * Base class; normally only used for creating subclasses and not instantiated in apps.
  * A visual representation of raster or vector map data well known as a layer.
  * @class
- * @param {String} [name="noname"] - Layer name.
- * @param {Object} [options] - Layer options:
+ * @param {string|null} [name="noname"] - Layer name.
+ * @param {ILayerParams} [options={}] - Layer options.
+ * @param {*} [options.properties={}] - Custom user properties.
+ * @param {number} [options.labelMaxLetters] - Label max letters (reserved for specific layer implementations).
+ * @param {boolean} [options.hideInLayerSwitcher=false] - Presence in LayerSwitcher control.
  * @param {number} [options.opacity=1.0] - Layer opacity.
  * @param {number} [options.minZoom=0] - Minimal visibility zoom level.
- * @param {number} [options.maxZoom=0] - Maximal visibility zoom level.
- * @param {string} [options.attribution] - Layer attribution that displayed in the attribution area on the screen.
- * @param {boolean} [options.isBaseLayer=false] - This is a base layer.
+ * @param {number} [options.maxZoom=50] - Maximal visibility zoom level.
+ * @param {string} [options.attribution=""] - Layer attribution shown in the attribution area.
+ * @param {number} [options.zIndex=0] - Layer z-index.
+ * @param {boolean} [options.isBaseLayer=false] - Base layer flag.
+ * @param {Array.<IDefaultTextureParams>} [options.defaultTextures=[null, null]] - Default textures.
  * @param {boolean} [options.visibility=true] - Layer visibility.
- * @param {boolean} [options.hideInLayerSwitcher=false] - Presence of layer in dialog window of LayerSwitcher control.
- * @param {boolean} [options.isSRGB=false] - Layer image webgl internal format.
- * @param {Extent} [options.extent=[[-180.0, -90.0], [180.0, 90.0]]] - Visible extent.
- * @param {string} [options.textureFilter="anisotropic"] - Image texture filter. Available values: "nearest", "linear", "mipmap" and "anisotropic".
- * @param {string} [options.icon] - Icon for LayerSwitcher
- * @fires EventsHandler<LayerEventsList>#visibilitychange
- * @fires EventsHandler<LayerEventsList>#add
- * @fires EventsHandler<LayerEventsList>#remove
- * @fires EventsHandler<LayerEventsList>#mousemove
- * @fires EventsHandler<LayerEventsList>#mouseenter
- * @fires EventsHandler<LayerEventsList>#mouseleave
- * @fires EventsHandler<LayerEventsList>#lclick
- * @fires EventsHandler<LayerEventsList>#rclick
- * @fires EventsHandler<LayerEventsList>#mclick
- * @fires EventsHandler<LayerEventsList>#ldblclick
- * @fires EventsHandler<LayerEventsList>#rdblclick
- * @fires EventsHandler<LayerEventsList>#mdblclick
- * @fires EventsHandler<LayerEventsList>#lup
- * @fires EventsHandler<LayerEventsList>#rup
- * @fires EventsHandler<LayerEventsList>#mup
- * @fires EventsHandler<LayerEventsList>#ldown
- * @fires EventsHandler<LayerEventsList>#rdown
- * @fires EventsHandler<LayerEventsList>#mdown
- * @fires EventsHandler<LayerEventsList>#lhold
- * @fires EventsHandler<LayerEventsList>#rhold
- * @fires EventsHandler<LayerEventsList>#mhold
- * @fires EventsHandler<LayerEventsList>#mousewheel
- * @fires EventsHandler<LayerEventsList>#touchmove
- * @fires EventsHandler<LayerEventsList>#touchstart
- * @fires EventsHandler<LayerEventsList>#touchend
- * @fires EventsHandler<LayerEventsList>#doubletouch
+ * @param {boolean} [options.fading=false] - Enables fade-in/fade-out opacity transitions.
+ * @param {number} [options.height=0] - Height over the ground.
+ * @param {string} [options.textureFilter="mipmap"] - Image texture filter. Available values: "nearest", "linear", "mipmap" and "anisotropic".
+ * @param {string|number} [options.colorSpace="srgb"] - Layer color space. Available values: "linear", "srgb", 0, 1.
+ * @param {boolean} [options.pickingEnabled=true] - Enables layer picking.
+ * @param {number[]} [options.preLoadZoomLevels=[0, 1]] - Zoom levels to preload when layer becomes visible.
+ * @param {Extent|Array.<Array.<number>>} [options.extent=[[-180.0, -90.0], [180.0, 90.0]]] - Visible extent.
+ * @param {string|NumberArray3|Vec3} [options.ambient] - Ambient color.
+ * @param {string|NumberArray3|Vec3} [options.diffuse] - Diffuse color.
+ * @param {string|NumberArray3|Vec3} [options.specular] - Specular color.
+ * @param {number} [options.shininess=20.0] - Specular shininess coefficient.
+ * @param {number} [options.nightTextureCoefficient=1.0] - Night texture blending coefficient.
+ * @param {string|null} [options.iconSrc=null] - Icon for LayerSwitcher.
+ * @param {boolean} [options.waitForParentMaterial=true] - Wait for parent material while loading current tile material.
+ * @fires visibilitychange
+ * @fires baselayerchange
+ * @fires add
+ * @fires remove
+ * @fires mousemove
+ * @fires mouseenter
+ * @fires mouseleave
+ * @fires lclick
+ * @fires rclick
+ * @fires mclick
+ * @fires ldblclick
+ * @fires rdblclick
+ * @fires mdblclick
+ * @fires lup
+ * @fires rup
+ * @fires mup
+ * @fires ldown
+ * @fires rdown
+ * @fires mdown
+ * @fires lhold
+ * @fires rhold
+ * @fires mhold
+ * @fires mousewheel
+ * @fires touchmove
+ * @fires touchstart
+ * @fires touchend
+ * @fires doubletouch
  */
 declare class Layer {
     static __counter__: number;
@@ -163,7 +179,7 @@ declare class Layer {
      */
     _height: number;
     protected _textureFilter: string;
-    protected _isSRGB: boolean;
+    protected _colorSpace: number;
     _internalFormat: number | null;
     /**
      * Visible degrees extent.
@@ -191,7 +207,9 @@ declare class Layer {
     _specular: Float32Array | null;
     isVector: boolean;
     protected _iconSrc: string | null;
+    waitForParentMaterial: boolean;
     constructor(name?: string | null, options?: ILayerParams);
+    static getColorSpace(colorSpace?: string | number): number;
     get iconSrc(): string | null;
     set iconSrc(src: string | null);
     set diffuse(rgb: string | NumberArray3 | Vec3 | null | undefined);
@@ -213,13 +231,13 @@ declare class Layer {
      * Returns true if a layer has imagery tiles.
      * @public
      * @virtual
-     * @returns {boolean} - Imagery tiles flag.
+     * @returns {boolean} Imagery tiles flag.
      */
     hasImageryTiles(): boolean;
     /**
      * Gets layer identifier.
      * @public
-     * @returns {string} - Layer object id.
+     * @returns {number} Layer object id.
      */
     getID(): number;
     get id(): number;
@@ -231,7 +249,7 @@ declare class Layer {
      * Compares layers instances.
      * @public
      * @param {Layer} layer - Layer instance to compare.
-     * @returns {boolean} - Returns true if the layers is the same instance of the input.
+     * @returns {boolean} Returns true if the layer is the same instance as the input.
      */
     isEqual(layer: Layer): boolean;
     /**
@@ -255,9 +273,9 @@ declare class Layer {
      */
     addTo(planet: Planet): void;
     /**
-     * Removes from planet.
+     * Removes from a planet.
      * @public
-     * @returns {Layer} -This layer.
+     * @returns {Layer} This layer.
      */
     remove(): this;
     /**
@@ -272,13 +290,13 @@ declare class Layer {
     /**
      * Sets layer attribution text.
      * @public
-     * @param {string} html - HTML code that represents layer attribution, it could be just a text.
+     * @param {string} html - HTML string that represents layer attribution.
      */
     setAttribution(html: string): void;
     /**
      * Gets layer attribution.
      * @public
-     * @returns {string} Layer attribution
+     * @returns {string} Layer attribution.
      */
     getAttribution(): string;
     /**
@@ -290,7 +308,7 @@ declare class Layer {
     /**
      * Gets layer height.
      * @public
-     * @returns {number} -
+     * @returns {number}
      */
     getHeight(): number;
     /**
@@ -302,22 +320,22 @@ declare class Layer {
     /**
      * Gets z-index.
      * @public
-     * @returns {number} -
+     * @returns {number}
      */
     getZIndex(): number;
     /**
-     * Set zIndex to the maximal value depend on other layers on the planet.
+     * Sets z-index to the maximum value relative to other layers on the planet.
      * @public
      */
     bringToFront(): void;
     /**
      * Returns true if the layer is a base.
      * @public
-     * @returns {boolean} - Base layer flag.
+     * @returns {boolean} Base layer flag.
      */
     isBaseLayer(): boolean;
     /**
-     * Sets base layer type true.
+     * Sets base layer type flag.
      * @public
      * @param {boolean} isBaseLayer -
      */
@@ -338,7 +356,7 @@ declare class Layer {
     /**
      * Gets layer visibility.
      * @public
-     * @returns {boolean} - Layer visibility.
+     * @returns {boolean} Layer visibility.
      */
     getVisibility(): boolean;
     /**
@@ -350,13 +368,13 @@ declare class Layer {
     /**
      * Gets layer extent.
      * @public
-     * @return {Extent} - Layer geodetic extent.
+     * @returns {Extent} Layer geodetic extent.
      */
     getExtent(): Extent;
     /**
      * Gets layer web-mercator extent.
      * @public
-     * @return {Extent} - Layer extent.
+     * @returns {Extent} Layer extent.
      */
     getExtentMerc(): Extent;
     /**
@@ -384,6 +402,7 @@ declare class Layer {
 }
 export type LayerEventsList = [
     "visibilitychange",
+    "baselayerchange",
     "add",
     "remove",
     "mousemove",

package/lib/layer/Vector.d.ts

@@ -3,16 +3,19 @@ import type { IEntityParams } from "../entity/Entity";
 import { EntityCollection } from "../entity/EntityCollection";
 import { EntityCollectionsTreeStrategy } from "../quadTree/EntityCollectionsTreeStrategy";
 import type { EventsHandler } from "../Events";
-import { GeometryHandler } from "../entity/GeometryHandler";
-import { Layer } from "./Layer";
-import type { ILayerParams, LayerEventsList } from "./Layer";
+import { GeometryHandler } from "../entity/geometry/GeometryHandler";
+import { BaseTileMaterialLayer } from "./BaseTileMaterialLayer";
+import type { IBaseTileMaterialLayerParams } from "./BaseTileMaterialLayer";
+import type { LayerEventsList } from "./Layer";
 import type { NumberArray3 } from "../math/Vec3";
 import { Planet } from "../scene/Planet";
 import { Material } from "./Material";
+import { Segment } from "../segment/Segment";
 import type { NumberArray4 } from "../math/Vec4";
-export interface IVectorParams extends ILayerParams {
+import { type ShadeMode, type ShadeModeInput } from "../shadeModeConstants";
+export interface IVectorParams extends IBaseTileMaterialLayerParams {
     entities?: Entity[] | IEntityParams[];
-    polygonOffsetUnits?: number;
+    depthOffset?: number;
     nodeCapacity?: number;
     relativeToGround?: boolean;
     clampToGround?: boolean;
@@ -20,8 +23,12 @@ export interface IVectorParams extends ILayerParams {
     pickingScale?: number | NumberArray3;
     scaleByDistance?: NumberArray3;
     labelMaxLetters?: number;
-    useLighting?: boolean;
+    shadeMode?: ShadeModeInput;
     depthOrder?: number;
+    disableCullFace?: boolean;
+    receiveProjectors?: boolean;
+    receiveFrameTransparency?: boolean;
+    receiveShadows?: boolean;
 }
 type VectorEventsList = [
     "draw",
@@ -30,39 +37,52 @@ type VectorEventsList = [
 ];
 export type VectorEventsType = EventsHandler<VectorEventsList> & EventsHandler<LayerEventsList>;
 /**
- * Vector layer represents alternative entities store. Used for geospatial data rendering like
- * points, lines, polygons, geometry objects etc.
+ * Vector layer is an alternative entity storage. Used for geospatial data rendering like
+ * points, lines, polygons, geometry objects, etc.
  * @class
  * @extends {Layer}
  * @param {string} [name="noname"] - Layer name.
  * @param {IVectorParams} [options] - Layer options:
- * @param {number} [options.minZoom=0] - Minimal visible zoom. 0 is default
- * @param {number} [options.maxZoom=50] - Maximal visible zoom. 50 is default.
+ * @param {number} [options.minZoom=0] - Minimal visible zoom.
+ * @param {number} [options.maxZoom=50] - Maximal visible zoom.
  * @param {string} [options.attribution] - Layer attribution.
- * @param {string} [options.zIndex=0] - Layer Z-order index. 0 is default.
- * @param {boolean} [options.visibility=true] - Layer visibility. True is default.
- * @param {boolean} [options.isBaseLayer=false] - Layer base layer. False is default.
- * @param {Array.<Entity>} [options.entities] - Entities array.
+ * @param {number} [options.zIndex=0] - Layer Z-order index.
+ * @param {boolean} [options.visibility=true] - Layer visibility.
+ * @param {boolean} [options.isBaseLayer=false] - Layer base layer.
+ * @param {number} [options.opacity=1.0] - Layer opacity.
+ * @param {boolean} [options.pickingEnabled=true] - Enables/disables picking.
+ * @param {boolean} [options.fading=false] - Enables layer fade-in/fade-out transition logic.
+ * @param {number} [options.height=0] - Layer height level used for rendering order.
+ * @param {Array.<Entity|IEntityParams>} [options.entities] - Entities array or entity init params.
  * @param {Array.<number>} [options.scaleByDistance] - Scale by distance parameters. (exactly 3 entries)
  *      First index - near distance to the entity, after entity becomes full scale.
  *      Second index - far distance to the entity, when entity becomes zero scale.
  *      Third index - far distance to the entity, when entity becomes invisible.
- *      Use [1.0, 1.0, 1.0] for real sized objects
- * @param {number} [options.nodeCapacity=30] - Maximum entities quantity in the tree node. Rendering optimization parameter. 30 is default.
- * @param {boolean} [options.async=true] - Asynchronous vector data handling before rendering. True for optimization huge data.
- * @param {boolean} [options.clampToGround = false] - Clamp vector data to the ground.
- * @param {boolean} [options.relativeToGround = false] - Place vector data relative to the ground relief.
- * @param {Number} [options.polygonOffsetUnits=0.0] - The multiplier by which an implementation-specific value is multiplied with to create a constant depth offset.
+ *      Default is `[MAX32, MAX32, MAX32]` (no distance scaling).
+ * @param {number|Array.<number>} [options.pickingScale=[1,1,1]] - Picking scale value or xyz scale array.
+ * @param {number} [options.nodeCapacity=60] - Maximum entities quantity in a quadtree node.
+ * @param {boolean} [options.async=true] - Asynchronous vector data handling before rendering.
+ * @param {boolean} [options.clampToGround=false] - Clamp vector data to the ground.
+ * @param {boolean} [options.relativeToGround=false] - Place vector data relative to the ground relief.
+ * @param {number} [options.labelMaxLetters=24] - Maximum label letters per line for label entities.
+ * @param {Number} [options.depthOffset=0.0] - Signed world-space depth offset along the camera ray.
+ * Negative values move geometry closer to the camera, positive values move it farther.
+ * @param {number|string} [options.shadeMode=1] - Geo object shading: 0/none unlit, 0.5/phong, 1/pbr.
+ * @param {number} [options.depthOrder=0] - Rendering order group for vector collections.
+ * @param {boolean} [options.disableCullFace=false] - Disables back-face culling for geo object rendering.
+ * @param {boolean} [options.receiveProjectors=true] - Enables/disables projector effect reception for this layer entities.
+ * @param {boolean} [options.receiveFrameTransparency=false] - Enables/disables frame transparency reception for this layer entities.
+ * @param {boolean} [options.receiveShadows=true] - Enables/disables shadow map reception for this layer entities.
  *
- * //@fires EventsHandler<VectorEventsList>#entitymove
- * @fires EventsHandler<VectorEventsList>#draw
- * @fires EventsHandler<VectorEventsList>#add
- * @fires EventsHandler<VectorEventsList>#remove
- * @fires EventsHandler<VectorEventsList>#entityadd
- * @fires EventsHandler<VectorEventsList>#entityremove
- * @fires EventsHandler<VectorEventsList>#visibilitychange
+ * //@fires entitymove
+ * @fires draw
+ * @fires add
+ * @fires remove
+ * @fires entityadd
+ * @fires entityremove
+ * @fires visibilitychange
  */
-declare class Vector extends Layer {
+declare class Vector extends BaseTileMaterialLayer {
     events: VectorEventsType;
     protected _depthOrder: number;
     /**
@@ -105,22 +125,67 @@ declare class Vector extends Layer {
     /** todo: combine into one */
     protected _stripEntityCollection: EntityCollection;
     protected _polylineEntityCollection: EntityCollection;
-    protected _geoObjectEntityCollection: EntityCollection;
+    _geoObjectEntityCollection: EntityCollection;
     _geometryHandler: GeometryHandler;
     protected _entityCollectionsTreeStrategy: EntityCollectionsTreeStrategy | null;
     /**
-     * Specifies the scale Units for gl.polygonOffset function to calculate depth values, 0.0 is default.
+     * Signed world-space depth offset along the camera ray.
+     * Negative values move geometry closer to the camera, positive values move it farther.
+     * 0.0 means no offset.
      * @public
      * @type {Number}
      */
-    polygonOffsetUnits: number;
+    depthOffset: number;
     protected _labelMaxLetters: number;
-    protected _useLighting: boolean;
+    protected _shadeMode: ShadeMode;
+    protected _disableCullFace: boolean;
+    protected _receiveProjectors: boolean;
+    protected _receiveFrameTransparency: boolean;
+    protected _receiveShadows: boolean;
     constructor(name?: string | null, options?: IVectorParams);
     get depthOrder(): number;
     set depthOrder(d: number);
-    get useLighting(): boolean;
-    set useLighting(f: boolean);
+    get shadeMode(): ShadeMode;
+    set shadeMode(m: ShadeModeInput);
+    get disableCullFace(): boolean;
+    set disableCullFace(v: boolean);
+    /**
+     * Gets projector effect reception state for this vector layer entities.
+     * @public
+     * @returns {boolean}
+     */
+    get receiveProjectors(): boolean;
+    /**
+     * Enables/disables projector effect reception for this vector layer entities.
+     * @public
+     * @param {boolean} v - `true` to receive projector effects, `false` to ignore them.
+     */
+    set receiveProjectors(v: boolean);
+    /**
+     * Gets frame transparency reception state for this vector layer entities.
+     * @public
+     * @returns {boolean}
+     */
+    get receiveFrameTransparency(): boolean;
+    /**
+     * Enables/disables frame transparency reception for this vector layer entities.
+     * @public
+     * @param {boolean} v - `true` to receive frame transparency, `false` to ignore it.
+     */
+    set receiveFrameTransparency(v: boolean);
+    /**
+     * Gets shadow map reception state for this vector layer entities.
+     * @public
+     * @returns {boolean}
+     */
+    get receiveShadows(): boolean;
+    /**
+     * Enables/disables shadow map reception for this vector layer entities.
+     * Stored in the same material flags channel as projectors and frame transparency.
+     * @public
+     * @param {boolean} v - `true` to receive shadow map effects, `false` to ignore them.
+     */
+    set receiveShadows(v: boolean);
     get labelMaxLetters(): number;
     get instanceName(): string;
     protected _bindPicking(): void;
@@ -134,7 +199,7 @@ declare class Vector extends Layer {
     /**
      * Returns stored entities.
      * @public
-     * @returns {Array.<Entity>} -
+     * @returns {Array.<Entity>} Stored entities.
      */
     getEntities(): Entity[];
     /**
@@ -169,7 +234,7 @@ declare class Vector extends Layer {
      */
     removeEntity(entity: Entity): this;
     /**
-     * Set layer picking events active.
+     * Sets layer picking events active.
      * @public
      * @param {boolean} picking - Picking enable flag.
      */
@@ -221,7 +286,7 @@ declare class Vector extends Layer {
      * @virtual
      * @param {Material} material - Current material.
      */
-    loadMaterial(material: Material): void;
+    loadMaterial(material: Material, _forceLoading?: boolean): void;
     /**
      * Abort exact material loading.
      * @public
@@ -230,6 +295,10 @@ declare class Vector extends Layer {
      */
     abortMaterialLoading(material: Material): void;
     applyMaterial(material: Material): NumberArray4;
+    protected _allowsLoadWithoutPassReady(): boolean;
+    protected _hasParentMaterial(psegm: Material): boolean;
+    protected _onParentMaterialApplied(material: Material, psegm: Material): void;
+    protected _applyNoParentMaterial(material: Material, segment: Segment): void;
     clearMaterial(material: Material): void;
     update(): void;
 }

package/lib/layer/WMS.d.ts

@@ -18,7 +18,7 @@ interface IWMSParams extends IXYZParams {
  * @param {number} [options.opacity=1.0] - Layer opacity.
  * @param {number} [options.minZoom=0] - Minimal visibility zoom level.
  * @param {number} [options.maxZoom=0] - Maximal visibility zoom level.
- * @param {string} [options.attribution] - Layer attribution that displayed in the attribution area on the screen.
+ * @param {string} [options.attribution] - Layer attribution shown in the attribution area.
  * @param {boolean} [options.isBaseLayer=false] - Base layer flag.
  * @param {boolean} [options.visibility=true] - Layer visibility.
  * @param {string} options.url - WMS url source.

package/lib/layer/XYZ.d.ts

@@ -1,11 +1,11 @@
-import { Layer } from "./Layer";
-import type { ILayerParams, LayerEventsList } from "./Layer";
+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 { NumberArray4 } from "../math/Vec4";
 import type { FetchCache } from "../utils/Loader";
-export interface IXYZParams extends ILayerParams {
+export interface IXYZParams extends IBaseTileMaterialLayerParams {
     url?: string;
     subdomains?: string[];
     minNativeZoom?: number;
@@ -18,10 +18,7 @@ export interface IXYZParams extends ILayerParams {
      */
     cache?: FetchCache;
 }
-type XYZEventsList = [
-    "load",
-    "loadend"
-];
+type XYZEventsList = ["load", "loadend"];
 type XYZEventsType = EventsHandler<XYZEventsList> & EventsHandler<LayerEventsList>;
 /**
  * Represents an imagery tiles source provider.
@@ -35,16 +32,16 @@ type XYZEventsType = EventsHandler<XYZEventsList> & EventsHandler<LayerEventsLis
  * @param {number} [options.maxZoom=0] - Maximal visibility zoom level.
  * @param {number} [options.minNativeZoom=0] - Minimal available zoom level.
  * @param {number} [options.maxNativeZoom=19] - Maximal available zoom level.
- * @param {string} [options.attribution] - Layer attribution that displayed in the attribution area on the screen.
+ * @param {string} [options.attribution] - Layer attribution shown in the attribution area.
  * @param {boolean} [options.isBaseLayer=false] - Base layer flag.
  * @param {boolean} [options.visibility=true] - Layer visibility.
  * @param {string} [options.crossOrigin=true] - If true, all tiles will have their crossOrigin attribute set to ''.
  * @param {string} options.url - Tile url source template(see example below).
- * @param {string} options.textureFilter - texture gl filter. NEAREST, LINEAR, MIPMAP, ANISOTROPIC.
- * @param {Function} options.urlRewrite - Url rewrite function.
+ * @param {string} options.textureFilter - Texture WebGL filter: NEAREST, LINEAR, MIPMAP, ANISOTROPIC.
+ * @param {Function} options.urlRewrite - URL rewrite function.
  *
- * @fires EventsHandler<XYZEventsList>#load
- * @fires EventsHandler<XYZEventsList>#loadend
+ * @fires load
+ * @fires loadend
  *
  * @example <caption>Creates OpenStreetMap base tile layer</caption>
  * new og.layer.XYZ("OpenStreetMap", {
@@ -54,7 +51,7 @@ type XYZEventsType = EventsHandler<XYZEventsList> & EventsHandler<LayerEventsLis
  *     attribution: 'Data @ <a href="http://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="http://www.openstreetmap.org/copyright">ODbL</a>'
  * });
  */
-export declare class XYZ extends Layer {
+export declare class XYZ extends BaseTileMaterialLayer {
     events: XYZEventsType;
     /**
      * Tile url source template.
@@ -66,24 +63,12 @@ export declare class XYZ extends Layer {
      * @protected
      */
     protected _s: string[];
-    /**
-     * Minimal native zoom level when tiles are available.
-     * @public
-     * @type {number}
-     */
-    minNativeZoom: number;
-    /**
-     * Maximal native zoom level when tiles are available.
-     * @public
-     * @type {number}
-     */
-    maxNativeZoom: number;
     /**
      * Rewrites imagery tile url query.
      * @private
      * @param {Segment} segment - Segment to load.
      * @param {string} url - Created url.
-     * @returns {string} - Url query string.
+     * @returns {string} URL query string.
      */
     protected _urlRewriteCallback: Function | null;
     protected _requestsPeerSubdomains: number;
@@ -130,7 +115,7 @@ export declare class XYZ extends Layer {
      * @protected
      * @virtual
      * @param {Segment} segment - Creates specific url for current segment.
-     * @returns {string} - Returns url string.
+     * @returns {string} URL string.
      */
     protected _createUrl(segment: Segment): string;
     protected _getSubdomain(): string;
@@ -138,7 +123,7 @@ export declare class XYZ extends Layer {
      * Returns actual url query string.
      * @protected
      * @param {Segment} segment - Segment that loads image data.
-     * @returns {string} - Url string.
+     * @returns {string} URL string.
      */
     protected _getHTTPRequestString(segment: Segment): any;
     /**
@@ -147,8 +132,6 @@ export declare class XYZ extends Layer {
      * @param {Function} ur - The callback that returns tile custom created url.
      */
     setUrlRewriteCallback(ur: Function): void;
-    applyMaterial(material: Material, forceLoading?: boolean): NumberArray4;
-    clearMaterial(material: Material): void;
     /**
      * @protected
      */

package/lib/layer/index.d.ts

@@ -1,12 +1,12 @@
-export * from './CanvasTiles';
-export * from './GeoImage';
-export * from './GeoTexture2d';
-export * from './GeoVideo';
-export * from './KML';
-export * from './Layer';
-export * from './Vector';
-export * from './WMS';
-export * from './XYZ';
-export * from './Material';
-export * from './OpenStreetMap';
-export * from './Bing';
+export * from "./CanvasTiles";
+export * from "./GeoImage";
+export * from "./GeoTexture2d";
+export * from "./GeoVideo";
+export * from "./KML";
+export * from "./Layer";
+export * from "./Vector";
+export * from "./WMS";
+export * from "./XYZ";
+export * from "./Material";
+export * from "./OpenStreetMap";
+export * from "./Bing";

package/lib/math/Line2.d.ts

@@ -1,4 +1,4 @@
-import { Vec2 } from './Vec2';
+import { Vec2 } from "./Vec2";
 export declare class Line2 {
     a: number;
     b: number;
@@ -7,5 +7,14 @@ export declare class Line2 {
     static get(p0: Vec2, p1: Vec2): Line2;
     static getParallel(l: Line2, p: Vec2): Line2;
     static getIntersection(L0: Line2, L1: Line2): Vec2;
+    static getSegmentCircleIntersectionInto(p0: Vec2, p1: Vec2, center: Vec2, radius: number, out0: Vec2, out1: Vec2): 0 | 1 | 2;
+    static getSegmentCircleIntersection(p0: Vec2, p1: Vec2, center: Vec2, radius: number): [] | [Vec2] | [Vec2, Vec2];
     intersects(l: Line2): Vec2;
+    /**
+     * Finds the intersection of the line with a circle.
+     * @param {Vec2} center - Circle center.
+     * @param {number} radius - Circle radius.
+     * @returns {[Vec2] | [Vec2, Vec2] | []}
+     */
+    getCircleIntersection(center: Vec2, radius: number): [] | [Vec2] | [Vec2, Vec2];
 }

package/lib/math/Line3.d.ts

@@ -1,5 +1,5 @@
 import { Sphere } from "../bv/Sphere";
-import { Vec3 } from './Vec3';
+import { Vec3 } from "./Vec3";
 /**
  * @todo: write tests
  * @class Line3