@openglobus/og 0.18.0 → 0.18.1

package/{src/layer/Vector.ts → lib/js/layer/Vector.js}

@@ -1,62 +1,32 @@
 import * as math from "../math";
 import * as mercator from "../mercator";
 import * as quadTree from "../quadTree/quadTree";
-import {Entity, IEntityParams} from "../entity/Entity";
-import {EntityCollection} from "../entity/EntityCollection";
-import {
-    EntityCollectionNode,
-    EntityCollectionNodeWGS84
-} from "../quadTree/EntityCollectionNode";
-import {EventsHandler} from "../Events";
-import {Extent} from "../Extent";
-import {GeometryHandler} from "../entity/GeometryHandler";
-import {ILayerParams, Layer, LayerEventsList} from "./Layer";
-import {NumberArray3, Vec3} from "../math/Vec3";
-import {Node} from "../quadTree/Node";
-import {Planet} from "../scene/Planet";
-import {QueueArray} from "../QueueArray";
-import {Material} from "./Material";
-import {NumberArray4} from "../math/Vec4";
-
-export interface IVectorParams extends ILayerParams {
-    entities?: Entity[] | IEntityParams[];
-    polygonOffsetUnits?: number;
-    nodeCapacity?: number;
-    relativeToGround?: boolean;
-    clampToGround?: boolean;
-    async?: boolean;
-    pickingScale?: number;
-    scaleByDistance?: NumberArray3;
-    labelMaxLetters?: number;
-}
-
-type VectorEventsList = [
-    "entitymove",
-    "draw",
-    "entityadd",
-    "entityremove"
-]
-
-export type VectorEventsType = EventsHandler<VectorEventsList> & EventsHandler<LayerEventsList>;
-
+import { Entity } from "../entity/Entity";
+import { EntityCollection } from "../entity/EntityCollection";
+import { EntityCollectionNode, EntityCollectionNodeWGS84 } from "../quadTree/EntityCollectionNode";
+import { Extent } from "../Extent";
+import { GeometryHandler } from "../entity/GeometryHandler";
+import { Layer } from "./Layer";
+import { Vec3 } from "../math/Vec3";
+import { QueueArray } from "../QueueArray";
 /**
  * Creates entity instance array.
  * @param {Entity[] | IEntityParams[]} entities - Entity array.
  * @returns {Entity[]} - Entity array.
  */
-function _entitiesConstructor(entities: Entity[] | IEntityParams[]): Entity[] {
-    let res: Entity[] = [];
+function _entitiesConstructor(entities) {
+    let res = [];
     for (let i = 0; i < entities.length; i++) {
         let ei = entities[i];
-        if ((ei as Entity).instanceName === "Entity") {
-            res.push(ei as Entity);
-        } else {
-            res.push(new Entity(ei as IEntityParams));
+        if (ei.instanceName === "Entity") {
+            res.push(ei);
+        }
+        else {
+            res.push(new Entity(ei));
         }
     }
     return res;
 }
-
 /**
  * Vector layer represents alternative entities store. Used for geospatial data rendering like
  * points, lines, polygons, geometry objects etc.
@@ -90,208 +60,98 @@ function _entitiesConstructor(entities: Entity[] | IEntityParams[]): Entity[] {
  * @fires EventsHandler<VectorEventsList>#visibilitychange
  */
 class Vector extends Layer {
-
-    public override events: VectorEventsType;
-
-    /**
-     * Entities collection.
-     * @protected
-     */
-    protected _entities: Entity[];
-
-    /**
-     * First index - near distance to the entity, after that 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.
-     * @public
-     * @type {NumberArray3} - (exactly 3 entries)
-     */
-    public scaleByDistance: NumberArray3;
-
-    public pickingScale: number;
-
-    /**
-     * Asynchronous data handling before rendering.
-     * @public
-     * @type {boolean}
-     */
-    public async: boolean;
-
-    /**
-     * Clamp vector data to the ground.
-     * @public
-     * @type {boolean}
-     */
-    public clampToGround: boolean;
-
-    /**
-     * Sets vector data relative to the ground relief.
-     * @public
-     * @type {boolean}
-     */
-    public relativeToGround: boolean;
-
-
-    protected _stripEntityCollection: EntityCollection;
-    protected _polylineEntityCollection: EntityCollection;
-    protected _geoObjectEntityCollection: EntityCollection;
-    public _geometryHandler: GeometryHandler;
-
-    /**
-     * Maximum entities quantity in the tree node.
-     * @public
-     */
-    public _nodeCapacity: number;
-
-    protected _entityCollectionsTree: EntityCollectionNode | null;
-    protected _entityCollectionsTreeNorth: EntityCollectionNodeWGS84 | null;
-    protected _entityCollectionsTreeSouth: EntityCollectionNodeWGS84 | null;
-
-    public _renderingNodes: Record<number, boolean>;
-    public _renderingNodesNorth: Record<number, boolean>;
-    public _renderingNodesSouth: Record<number, boolean>;
-
-    protected _counter: number;
-    protected _deferredEntitiesPendingQueue: QueueArray<EntityCollectionNode>;
-
-    protected _pendingsQueue: Entity[];
-
-    /**
-     * Specifies the scale Units for gl.polygonOffset function to calculate depth values, 0.0 is default.
-     * @public
-     * @type {Number}
-     */
-    public polygonOffsetUnits: number;
-
-    public _secondPASS: EntityCollectionNode[];
-
-    protected _labelMaxLetters: number;
-
-
-    constructor(name?: string | null, options: IVectorParams = {}) {
+    constructor(name, options = {}) {
         super(name, options);
-
         // @ts-ignore
         this.events = this.events.registerNames(VECTOR_EVENTS);
-
         this.isVector = true;
-
         this._hasImageryTiles = false;
-
         this.scaleByDistance = options.scaleByDistance || [math.MAX32, math.MAX32, math.MAX32];
-
         this.pickingScale = options.pickingScale || 1;
-
         this.async = options.async !== undefined ? options.async : true;
-
         this.clampToGround = options.clampToGround || false;
-
         this.relativeToGround = options.relativeToGround || false;
-
         this._nodeCapacity = options.nodeCapacity || 30;
-
         this._entities = _entitiesConstructor(options.entities || []);
-
         this._labelMaxLetters = options.labelMaxLetters || 24;
-
         this._stripEntityCollection = new EntityCollection({
             pickingEnabled: this.pickingEnabled
         });
         this._bindEventsDefault(this._stripEntityCollection);
-
         this._polylineEntityCollection = new EntityCollection({
             pickingEnabled: this.pickingEnabled
         });
         this._bindEventsDefault(this._polylineEntityCollection);
-
         this._geoObjectEntityCollection = new EntityCollection({
             pickingEnabled: this.pickingEnabled
         });
         this._bindEventsDefault(this._geoObjectEntityCollection);
-
         this._geometryHandler = new GeometryHandler(this);
-
         this._entityCollectionsTree = null;
         this._entityCollectionsTreeNorth = null;
         this._entityCollectionsTreeSouth = null;
-
         this._renderingNodes = {};
         this._renderingNodesNorth = {};
         this._renderingNodesSouth = {};
-
         this._counter = 0;
-        this._deferredEntitiesPendingQueue = new QueueArray<EntityCollectionNode>();
-
+        this._deferredEntitiesPendingQueue = new QueueArray();
         this._pendingsQueue = [];
-
         this.setEntities(this._entities);
-
         this.polygonOffsetUnits = options.polygonOffsetUnits != undefined ? options.polygonOffsetUnits : 0.0;
-
         this.pickingEnabled = this._pickingEnabled;
-
         this._secondPASS = [];
     }
-
-    public get labelMaxLetters(): number {
+    get labelMaxLetters() {
         return this._labelMaxLetters;
     }
-
-    public override get instanceName() {
+    get instanceName() {
         return "Vector";
     }
-
-    protected override _bindPicking() {
+    _bindPicking() {
         this._pickingColor.clear();
     }
-
     /**
      * Adds layer to the planet.
      * @public
      * @param {Planet} planet - Planet scene object.
      * @returns {Vector} -
      */
-    public override addTo(planet: Planet) {
+    addTo(planet) {
         if (!this._planet) {
             this._assignPlanet(planet);
-            this._geometryHandler.assignHandler(planet.renderer!.handler);
+            this._geometryHandler.assignHandler(planet.renderer.handler);
             this._polylineEntityCollection.addTo(planet, true);
             this._stripEntityCollection.addTo(planet, true);
             this._geoObjectEntityCollection.addTo(planet, true);
             this.setEntities(this._entities);
         }
     }
-
-    public override remove(): this {
+    remove() {
         super.remove();
         this._polylineEntityCollection.remove();
         this._stripEntityCollection.remove();
         this._geoObjectEntityCollection.remove();
         return this;
     }
-
     /**
      * Returns stored entities.
      * @public
      * @returns {Array.<Entity>} -
      */
-    public getEntities(): Entity[] {
-        return ([] as Entity[]).concat(this._entities);
+    getEntities() {
+        return [].concat(this._entities);
     }
-
     //_fitExtent(entity) {
     //    var ee = entity.getExtent(),
     //        e = this._extent,
     //        maxLon = -180, maxLat = -90,
     //        minLon = 180, minLat = 90;
-
     //    if (this._entities.length !== 0) {
     //        maxLon = e.southWest.lon;
     //        minLon = e.northEast.lon;
     //        maxLat = e.northEast.lat;
     //        minLat = e.southWest.lat;
     //    }
-
     //    if (ee.southWest.lon < minLon) {
     //        e.southWest.lon = ee.southWest.lon;
     //    }
@@ -306,7 +166,6 @@ class Vector extends Layer {
     //    }
     //    this.setExtent(this._extent);
     //}
-
     /**
      * Adds entity to the layer.
      * @public
@@ -314,7 +173,7 @@ class Vector extends Layer {
      * @param {boolean} [rightNow=false] - Entity insertion option. False is default.
      * @returns {Vector} - Returns this layer.
      */
-    public add(entity: Entity, rightNow: boolean = false): this {
+    add(entity, rightNow = false) {
         if (!(entity._layer || entity._entityCollection)) {
             entity._layer = this;
             entity._layerIndex = this._entities.length;
@@ -324,7 +183,6 @@ class Vector extends Layer {
         }
         return this;
     }
-
     /**
      * Adds entity to the layer in the index position.
      * @public
@@ -333,7 +191,7 @@ class Vector extends Layer {
      * @param {boolean} [rightNow] - Entity insertion option. False is default.
      * @returns {Vector} - Returns this layer.
      */
-    public insert(entity: Entity, index: number, rightNow: boolean = false): this {
+    insert(entity, index, rightNow = false) {
         if (!(entity._layer || entity._entityCollection)) {
             entity._layer = this;
             entity._layerIndex = index;
@@ -342,67 +200,56 @@ class Vector extends Layer {
             for (let i = index + 1, len = this._entities.length; i < len; i++) {
                 this._entities[i]._layerIndex = i;
             }
-
             this._proceedEntity(entity, rightNow);
         }
-
         return this;
     }
-
-    protected _proceedEntity(entity: Entity, rightNow: boolean = false) {
+    _proceedEntity(entity, rightNow = false) {
         let temp = this._hasImageryTiles;
-
         if (entity.strip) {
             this._stripEntityCollection.add(entity);
         }
-
         if (entity.polyline || entity.ray) {
             this._polylineEntityCollection.add(entity);
         }
-
         if (entity.geoObject) {
             this._geoObjectEntityCollection.add(entity);
         }
-
         if (entity.geometry) {
             this._hasImageryTiles = true;
             if (this._planet) {
-                this._planet.renderer!.assignPickingColor<Entity>(entity);
+                this._planet.renderer.assignPickingColor(entity);
                 this._geometryHandler.add(entity.geometry);
             }
         }
-
         if (entity.billboard || entity.label || entity.geoObject) {
             if (this._planet) {
                 if (entity._cartesian.isZero() && !entity._lonLat.isZero()) {
-                    entity._setCartesian3vSilent(
-                        this._planet.ellipsoid.lonLatToCartesian(entity._lonLat)
-                    );
-                } else {
+                    entity._setCartesian3vSilent(this._planet.ellipsoid.lonLatToCartesian(entity._lonLat));
+                }
+                else {
                     entity._lonLat = this._planet.ellipsoid.cartesianToLonLat(entity._cartesian);
                 }
-
                 // north tree
                 if (entity._lonLat.lat > mercator.MAX_LAT) {
-                    this._entityCollectionsTreeNorth!.__setLonLat__(entity);
-                    this._entityCollectionsTreeNorth!.insertEntity(entity, rightNow);
-                } else if (entity._lonLat.lat < mercator.MIN_LAT) {
-                    this._entityCollectionsTreeSouth!.__setLonLat__(entity);
-                    this._entityCollectionsTreeSouth!.insertEntity(entity, rightNow);
-                } else {
-                    this._entityCollectionsTree!.__setLonLat__(entity);
-                    this._entityCollectionsTree!.insertEntity(entity, rightNow);
+                    this._entityCollectionsTreeNorth.__setLonLat__(entity);
+                    this._entityCollectionsTreeNorth.insertEntity(entity, rightNow);
+                }
+                else if (entity._lonLat.lat < mercator.MIN_LAT) {
+                    this._entityCollectionsTreeSouth.__setLonLat__(entity);
+                    this._entityCollectionsTreeSouth.insertEntity(entity, rightNow);
+                }
+                else {
+                    this._entityCollectionsTree.__setLonLat__(entity);
+                    this._entityCollectionsTree.insertEntity(entity, rightNow);
                 }
             }
         }
-
         if (this._planet && this._hasImageryTiles !== temp) {
             this._planet.updateVisibleLayers();
         }
-
         this.events.dispatch(this.events.entityadd, entity);
     }
-
     /**
      * Adds entity array to the layer.
      * @public
@@ -410,14 +257,13 @@ class Vector extends Layer {
      * @param {boolean} [rightNow=false] - Entity insertion option. False is default.
      * @returns {Vector} - Returns this layer.
      */
-    public addEntities(entities: Entity[], rightNow: boolean = false) {
+    addEntities(entities, rightNow = false) {
         let i = entities.length;
         while (i--) {
             this.add(entities[i], rightNow);
         }
         return this;
     }
-
     /**
      * Remove entity from layer.
      * TODO: memory leaks.
@@ -425,40 +271,29 @@ class Vector extends Layer {
      * @param {Entity} entity - Entity to remove.
      * @returns {Vector} - Returns this layer.
      */
-    public removeEntity(entity: Entity): this {
-
+    removeEntity(entity) {
         if (entity._layer && this.isEqual(entity._layer)) {
-
             this._entities.splice(entity._layerIndex, 1);
-
             this._reindexEntitiesArray(entity._layerIndex);
-
             entity._layer = null;
-
             entity._layerIndex = -1;
-
             if (entity._entityCollection) {
-
                 entity._entityCollection._removeEntitySilent(entity);
-
                 let node = entity._nodePtr;
-
                 while (node) {
                     node.count--;
-                    node = node.parentNode!;
+                    node = node.parentNode;
                 }
-
-                if (
-                    entity._nodePtr &&
+                if (entity._nodePtr &&
                     entity._nodePtr.count === 0 &&
-                    entity._nodePtr.deferredEntities.length === 0
-                ) {
+                    entity._nodePtr.deferredEntities.length === 0) {
                     entity._nodePtr.entityCollection = null;
                     //
                     // ...
                     //
                 }
-            } else if (entity._nodePtr && entity._nodePtr.deferredEntities.length) {
+            }
+            else if (entity._nodePtr && entity._nodePtr.deferredEntities.length) {
                 let defEntities = entity._nodePtr.deferredEntities;
                 let j = defEntities.length;
                 while (j--) {
@@ -467,379 +302,306 @@ class Vector extends Layer {
                         let node = entity._nodePtr;
                         while (node) {
                             node.count--;
-                            node = node.parentNode!;
+                            node = node.parentNode;
                         }
                         break;
                     }
                 }
             }
-
             if (entity.geometry) {
                 if (this._planet) {
                     this._geometryHandler.remove(entity.geometry);
-                    this._planet.renderer!.clearPickingColor(entity);
+                    this._planet.renderer.clearPickingColor(entity);
                 }
             }
-
             entity._nodePtr = undefined;
-
             this.events.dispatch(this.events.entityremove, entity);
         }
-
         return this;
     }
-
     /**
      * Set layer picking events active.
      * @public
      * @param {boolean} picking - Picking enable flag.
      */
-    public override set pickingEnabled(picking: boolean) {
-
+    set pickingEnabled(picking) {
         this._pickingEnabled = picking;
-
         this._stripEntityCollection.setPickingEnabled(picking);
-
         this._polylineEntityCollection.setPickingEnabled(picking);
-
         this._geoObjectEntityCollection.setPickingEnabled(picking);
-
-        this._entityCollectionsTree && this._entityCollectionsTree.traverseTree((node: EntityCollectionNode) => {
-            node.entityCollection!.setPickingEnabled(picking);
+        this._entityCollectionsTree && this._entityCollectionsTree.traverseTree((node) => {
+            node.entityCollection.setPickingEnabled(picking);
         });
-
-        this._entityCollectionsTreeNorth && this._entityCollectionsTreeNorth.traverseTree((node: EntityCollectionNodeWGS84) => {
-            node.entityCollection!.setPickingEnabled(picking);
+        this._entityCollectionsTreeNorth && this._entityCollectionsTreeNorth.traverseTree((node) => {
+            node.entityCollection.setPickingEnabled(picking);
         });
-
-        this._entityCollectionsTreeSouth && this._entityCollectionsTreeSouth.traverseTree((node: EntityCollectionNodeWGS84) => {
-            node.entityCollection!.setPickingEnabled(picking);
+        this._entityCollectionsTreeSouth && this._entityCollectionsTreeSouth.traverseTree((node) => {
+            node.entityCollection.setPickingEnabled(picking);
         });
     }
-
     /**
      * Refresh collected entities indexes from startIndex entities collection array position.
      * @protected
      * @param {number} startIndex - Entity array index.
      */
-    protected _reindexEntitiesArray(startIndex: number) {
+    _reindexEntitiesArray(startIndex) {
         const e = this._entities;
         for (let i = startIndex; i < e.length; i++) {
             e[i]._layerIndex = i;
         }
     }
-
     /**
      * Removes entities from layer.
      * @public
      * @param {Array.<Entity>} entities - Entity array.
      * @returns {Vector} - Returns this layer.
      */
-    public removeEntities(entities: Entity[]): this {
+    removeEntities(entities) {
         let i = entities.length;
         while (i--) {
             this.removeEntity(entities[i]);
         }
         return this;
     }
-
     // public setScaleByDistance(near, far, farInvisible) {
     //     this.scaleByDistance[0] = near;
     //     this.scaleByDistance[1] = far;
     //     this.scaleByDistance[2] = farInvisible || math.MAX32;
     // }
-
     /**
      * TODO: Clear the layer.
      * @public
      */
-    public override clear() {
-        let temp: Entity[] = new Array(this._entities.length);
-
+    clear() {
+        let temp = new Array(this._entities.length);
         for (let i = 0; i < temp.length; i++) {
             temp[i] = this._entities[i];
         }
-
         let i = this._entities.length;
         while (i--) {
             this._entities[i].remove();
         }
-
         this._entities.length = 0;
         this._entities = [];
         for (let i = 0; i < temp.length; i++) {
             this._entities[i] = temp[i];
         }
-
         this._entityCollectionsTree = null;
         this._entityCollectionsTreeNorth = null;
         this._entityCollectionsTreeSouth = null;
     }
-
     /**
      * Safety entities loop.
      * @public
      * @param {(entity: Entity, index?: number) => void} callback - Entity callback.
      */
-    public each(callback: (entity: Entity, index?: number) => void) {
+    each(callback) {
         let e = this._entities;
         let i = e.length;
         while (i--) {
             callback(e[i], i);
         }
     }
-
     /**
      * Removes current entities from layer and adds new entities.
      * @public
      * @param {Array.<Entity>} entities - New entity array.
      * @returns {Vector} - Returns layer instance.
      */
-    public setEntities(entities: Entity[]): this {
-
-        let temp: Entity[] = new Array(entities.length);
-
+    setEntities(entities) {
+        let temp = new Array(entities.length);
         for (let i = 0, len = entities.length; i < len; i++) {
             temp[i] = entities[i];
         }
-
         this.clear();
-
         this._entities = new Array(temp.length);
-
         let entitiesForTree = [];
-
         for (let i = 0; i < temp.length; i++) {
             let ei = temp[i];
-
             ei._layer = this;
             ei._layerIndex = i;
-
             if (ei.strip) {
                 this._stripEntityCollection.add(ei);
-            } else if (ei.polyline || ei.ray) {
+            }
+            else if (ei.polyline || ei.ray) {
                 this._polylineEntityCollection.add(ei);
-            } else if (ei.geoObject) {
+            }
+            else if (ei.geoObject) {
                 this._geoObjectEntityCollection.add(ei);
-            } else if (ei.billboard || ei.label) {
+            }
+            else if (ei.billboard || ei.label) {
                 entitiesForTree.push(ei);
             }
-
             if (ei.geometry) {
                 this._hasImageryTiles = true;
                 if (this._planet) {
-                    this._planet.renderer!.assignPickingColor<Entity>(ei);
+                    this._planet.renderer.assignPickingColor(ei);
                     this._geometryHandler.add(ei.geometry);
                 }
             }
-
             this._entities[i] = ei;
         }
-
         this._createEntityCollectionsTree(entitiesForTree);
-
         return this;
     }
-
     /**
      * @todo: replace to a strategy node collecting algorithm
      */
-    protected _createEntityCollectionsTree(entitiesForTree: Entity[]) {
-
+    _createEntityCollectionsTree(entitiesForTree) {
         if (this._planet) {
-
-            this._entityCollectionsTree = new EntityCollectionNode(
-                this,
-                quadTree.NW,
-                null,
-                0,
-                Extent.createFromArray([-20037508.34, -20037508.34, 20037508.34, 20037508.34]),
-                this._planet,
-                0
-            );
-
-            this._entityCollectionsTreeNorth = new EntityCollectionNodeWGS84(
-                this,
-                quadTree.NW,
-                null,
-                0,
-                Extent.createFromArray([-180, mercator.MAX_LAT, 180, 90]),
-                this._planet,
-                0
-            );
-
-            this._entityCollectionsTreeSouth = new EntityCollectionNodeWGS84(
-                this,
-                quadTree.NW,
-                null,
-                0,
-                Extent.createFromArray([-180, -90, 180, mercator.MIN_LAT]),
-                this._planet,
-                0
-            );
-
+            this._entityCollectionsTree = new EntityCollectionNode(this, quadTree.NW, null, 0, Extent.createFromArray([-20037508.34, -20037508.34, 20037508.34, 20037508.34]), this._planet, 0);
+            this._entityCollectionsTreeNorth = new EntityCollectionNodeWGS84(this, quadTree.NW, null, 0, Extent.createFromArray([-180, mercator.MAX_LAT, 180, 90]), this._planet, 0);
+            this._entityCollectionsTreeSouth = new EntityCollectionNodeWGS84(this, quadTree.NW, null, 0, Extent.createFromArray([-180, -90, 180, mercator.MIN_LAT]), this._planet, 0);
             for (let i = 0, len = entitiesForTree.length; i < len; i++) {
                 let entity = entitiesForTree[i];
                 // north tree
                 if (entity._lonLat.lat > mercator.MAX_LAT) {
                     this._entityCollectionsTreeNorth.__setLonLat__(entity);
-                } else if (entity._lonLat.lat < mercator.MIN_LAT) {
+                }
+                else if (entity._lonLat.lat < mercator.MIN_LAT) {
                     // south tree
                     this._entityCollectionsTreeSouth.__setLonLat__(entity);
-                } else {
+                }
+                else {
                     this._entityCollectionsTree.__setLonLat__(entity);
                 }
             }
-
             this._entityCollectionsTree.buildTree(entitiesForTree);
             this._entityCollectionsTreeNorth.buildTree(entitiesForTree);
             this._entityCollectionsTreeSouth.buildTree(entitiesForTree);
         }
     }
-
     /**
      * @todo (refactoring) could be used in somethig like bindEntityCollectionQuad(...)
      * @param entityCollection
      */
-    public _bindEventsDefault(entityCollection: EntityCollection) {
-
+    _bindEventsDefault(entityCollection) {
         let ve = this.events;
-
         //
         // @todo: replace with arrow functions and '...e'
         //
-        entityCollection.events.on("entitymove", function (e: any) {
+        entityCollection.events.on("entitymove", function (e) {
             ve.dispatch(ve.entitymove, e);
         });
-        entityCollection.events.on("mousemove", function (e: any) {
+        entityCollection.events.on("mousemove", function (e) {
             ve.dispatch(ve.mousemove, e);
         });
-        entityCollection.events.on("mouseenter", function (e: any) {
+        entityCollection.events.on("mouseenter", function (e) {
             ve.dispatch(ve.mouseenter, e);
         });
-        entityCollection.events.on("mouseleave", function (e: any) {
+        entityCollection.events.on("mouseleave", function (e) {
             ve.dispatch(ve.mouseleave, e);
         });
-        entityCollection.events.on("lclick", function (e: any) {
+        entityCollection.events.on("lclick", function (e) {
             ve.dispatch(ve.lclick, e);
         });
-        entityCollection.events.on("rclick", function (e: any) {
+        entityCollection.events.on("rclick", function (e) {
             ve.dispatch(ve.rclick, e);
         });
-        entityCollection.events.on("mclick", function (e: any) {
+        entityCollection.events.on("mclick", function (e) {
             ve.dispatch(ve.mclick, e);
         });
-        entityCollection.events.on("ldblclick", function (e: any) {
+        entityCollection.events.on("ldblclick", function (e) {
             ve.dispatch(ve.ldblclick, e);
         });
-        entityCollection.events.on("rdblclick", function (e: any) {
+        entityCollection.events.on("rdblclick", function (e) {
             ve.dispatch(ve.rdblclick, e);
         });
-        entityCollection.events.on("mdblclick", function (e: any) {
+        entityCollection.events.on("mdblclick", function (e) {
             ve.dispatch(ve.mdblclick, e);
         });
-        entityCollection.events.on("lup", function (e: any) {
+        entityCollection.events.on("lup", function (e) {
             ve.dispatch(ve.lup, e);
         });
-        entityCollection.events.on("rup", function (e: any) {
+        entityCollection.events.on("rup", function (e) {
             ve.dispatch(ve.rup, e);
         });
-        entityCollection.events.on("mup", function (e: any) {
+        entityCollection.events.on("mup", function (e) {
             ve.dispatch(ve.mup, e);
         });
-        entityCollection.events.on("ldown", function (e: any) {
+        entityCollection.events.on("ldown", function (e) {
             ve.dispatch(ve.ldown, e);
         });
-        entityCollection.events.on("rdown", function (e: any) {
+        entityCollection.events.on("rdown", function (e) {
             ve.dispatch(ve.rdown, e);
         });
-        entityCollection.events.on("mdown", function (e: any) {
+        entityCollection.events.on("mdown", function (e) {
             ve.dispatch(ve.mdown, e);
         });
-        entityCollection.events.on("lhold", function (e: any) {
+        entityCollection.events.on("lhold", function (e) {
             ve.dispatch(ve.lhold, e);
         });
-        entityCollection.events.on("rhold", function (e: any) {
+        entityCollection.events.on("rhold", function (e) {
             ve.dispatch(ve.rhold, e);
         });
-        entityCollection.events.on("mhold", function (e: any) {
+        entityCollection.events.on("mhold", function (e) {
             ve.dispatch(ve.mhold, e);
         });
-        entityCollection.events.on("mousewheel", function (e: any) {
+        entityCollection.events.on("mousewheel", function (e) {
             ve.dispatch(ve.mousewheel, e);
         });
-        entityCollection.events.on("touchmove", function (e: any) {
+        entityCollection.events.on("touchmove", function (e) {
             ve.dispatch(ve.touchmove, e);
         });
-        entityCollection.events.on("touchstart", function (e: any) {
+        entityCollection.events.on("touchstart", function (e) {
             ve.dispatch(ve.touchstart, e);
         });
-        entityCollection.events.on("touchend", function (e: any) {
+        entityCollection.events.on("touchend", function (e) {
             ve.dispatch(ve.touchend, e);
         });
-        entityCollection.events.on("doubletouch", function (e: any) {
+        entityCollection.events.on("doubletouch", function (e) {
             ve.dispatch(ve.doubletouch, e);
         });
-        entityCollection.events.on("touchleave", function (e: any) {
+        entityCollection.events.on("touchleave", function (e) {
             ve.dispatch(ve.touchleave, e);
         });
-        entityCollection.events.on("touchenter", function (e: any) {
+        entityCollection.events.on("touchenter", function (e) {
             ve.dispatch(ve.touchenter, e);
         });
     }
-
-    protected _collectStripCollectionPASS(outArr: EntityCollection[]) {
+    _collectStripCollectionPASS(outArr) {
         let ec = this._stripEntityCollection;
-
         ec._fadingOpacity = this._fadingOpacity;
         ec.scaleByDistance = this.scaleByDistance;
         ec.pickingScale = this.pickingScale;
         ec.polygonOffsetUnits = this.polygonOffsetUnits;
-
         outArr.push(ec);
     }
-
-    protected _collectPolylineCollectionPASS(outArr: EntityCollection[]) {
+    _collectPolylineCollectionPASS(outArr) {
         let ec = this._polylineEntityCollection;
-
         ec._fadingOpacity = this._fadingOpacity;
         ec.scaleByDistance = this.scaleByDistance;
         ec.pickingScale = this.pickingScale;
         ec.polygonOffsetUnits = this.polygonOffsetUnits;
-
         outArr.push(ec);
-
         if (this.clampToGround || this.relativeToGround) {
             let rtg = Number(this.relativeToGround);
-
-            const nodes = this._planet!._renderedNodes;
-            const visibleExtent = this._planet!.getViewExtent();
+            const nodes = this._planet._renderedNodes;
+            const visibleExtent = this._planet.getViewExtent();
             let e = ec._entities;
             let e_i = e.length;
             let res = new Vec3();
-
             while (e_i--) {
-                let p = e[e_i].polyline!;
+                let p = e[e_i].polyline;
                 if (p && visibleExtent.overlaps(p._extent)) {
                     // TODO:this works only for mercator area.
                     // needs to be working on poles.
-                    let coords = p._pathLonLatMerc,
-                        c_j = coords.length;
+                    let coords = p._pathLonLatMerc, c_j = coords.length;
                     while (c_j--) {
                         let c_j_h = coords[c_j].length;
                         while (c_j_h--) {
-                            let ll = coords[c_j][c_j_h],
-                                n_k = nodes.length;
+                            let ll = coords[c_j][c_j_h], n_k = nodes.length;
                             while (n_k--) {
                                 let seg = nodes[n_k].segment;
                                 if (seg._extent.isInside(ll)) {
-                                    let cart = p._path3v[c_j][c_j_h] as Vec3;
+                                    let cart = p._path3v[c_j][c_j_h];
                                     seg.getTerrainPoint(cart, ll, res);
                                     let alt = (rtg && p.altitude) || 0.0;
                                     if (alt) {
-                                        let n = this._planet!.ellipsoid.getSurfaceNormal3v(res);
+                                        let n = this._planet.ellipsoid.getSurfaceNormal3v(res);
                                         p.setPoint3v(res.addA(n.scale(alt)), c_j_h, c_j, true);
-                                    } else {
+                                    }
+                                    else {
                                         p.setPoint3v(res, c_j_h, c_j, true);
                                     }
                                     break;
@@ -851,17 +613,13 @@ class Vector extends Layer {
             }
         }
     }
-
-    protected _collectGeoObjectCollectionPASS(outArr: EntityCollection[]) {
+    _collectGeoObjectCollectionPASS(outArr) {
         let ec = this._geoObjectEntityCollection;
-
         ec._fadingOpacity = this._fadingOpacity;
         ec.scaleByDistance = this.scaleByDistance;
         ec.pickingScale = this.pickingScale;
         ec.polygonOffsetUnits = this.polygonOffsetUnits;
-
         outArr.push(ec);
-
         // if (this.clampToGround || this.relativeToGround) {
         //     let rtg = Number(this.relativeToGround);
         //
@@ -903,23 +661,17 @@ class Vector extends Layer {
         //     }
         // }
     }
-
-    public collectVisibleCollections(outArr: EntityCollection[]) {
-        let p = this._planet!;
-
-        if (
-            (this._fading && this._fadingOpacity > 0.0) ||
-            (this.minZoom <= p.maxCurrZoom && this.maxZoom >= p.maxCurrZoom)
-        ) {
+    collectVisibleCollections(outArr) {
+        let p = this._planet;
+        if ((this._fading && this._fadingOpacity > 0.0) ||
+            (this.minZoom <= p.maxCurrZoom && this.maxZoom >= p.maxCurrZoom)) {
             this._renderingNodes = {};
             this._renderingNodesNorth = {};
             this._renderingNodesSouth = {};
-
             // Common collections first
             this._collectStripCollectionPASS(outArr);
             this._collectPolylineCollectionPASS(outArr);
             this._collectGeoObjectCollectionPASS(outArr);
-
             // Merc nodes
             this._secondPASS = [];
             this._entityCollectionsTree && this._entityCollectionsTree.collectRenderCollectionsPASS1(p._visibleNodes, outArr);
@@ -927,7 +679,6 @@ class Vector extends Layer {
             while (i--) {
                 this._secondPASS[i].collectRenderCollectionsPASS2(p._visibleNodes, outArr, this._secondPASS[i].nodeId);
             }
-
             // North nodes
             this._secondPASS = [];
             this._entityCollectionsTreeNorth && this._entityCollectionsTreeNorth.collectRenderCollectionsPASS1(p._visibleNodesNorth, outArr);
@@ -935,7 +686,6 @@ class Vector extends Layer {
             while (i--) {
                 this._secondPASS[i].collectRenderCollectionsPASS2(p._visibleNodesNorth, outArr, this._secondPASS[i].nodeId);
             }
-
             // South nodes
             this._secondPASS = [];
             this._entityCollectionsTreeSouth && this._entityCollectionsTreeSouth.collectRenderCollectionsPASS1(p._visibleNodesSouth, outArr);
@@ -945,26 +695,25 @@ class Vector extends Layer {
             }
         }
     }
-
-    public _queueDeferredNode(node: EntityCollectionNode) {
+    _queueDeferredNode(node) {
         if (this._visibility) {
             node._inTheQueue = true;
             if (this._counter >= 1) {
                 this._deferredEntitiesPendingQueue.push(node);
-            } else {
+            }
+            else {
                 this._execDeferredNode(node);
             }
         }
     }
-
-    protected _execDeferredNode(node: EntityCollectionNode) {
+    _execDeferredNode(node) {
         this._counter++;
         setTimeout(() => {
             node.applyCollection();
             this._counter--;
             if (this._deferredEntitiesPendingQueue.length && this._counter < 1) {
                 while (this._deferredEntitiesPendingQueue.length) {
-                    let n = this._deferredEntitiesPendingQueue.pop()!;
+                    let n = this._deferredEntitiesPendingQueue.pop();
                     n._inTheQueue = false;
                     if (n.isVisible()) {
                         this._execDeferredNode(n);
@@ -974,53 +723,46 @@ class Vector extends Layer {
             }
         }, 0);
     }
-
     /**
      * Start to load tile material.
      * @public
      * @virtual
      * @param {Material} material - Current material.
      */
-    public override loadMaterial(material: Material) {
+    loadMaterial(material) {
         const seg = material.segment;
-
         if (this._isBaseLayer) {
             material.texture = seg._isNorth ? seg.planet.solidTextureOne : seg.planet.solidTextureTwo;
-        } else {
+        }
+        else {
             material.texture = seg.planet.transparentTexture;
         }
-
-        if (this._planet!.layerLock.isFree()) {
+        if (this._planet.layerLock.isFree()) {
             material.isReady = false;
             material.isLoading = true;
-            this._planet!._vectorTileCreator.add(material);
+            this._planet._vectorTileCreator.add(material);
         }
     }
-
     /**
      * Abort exact material loading.
      * @public
      * @override
      * @param {Material} material - Segment material.
      */
-    public override abortMaterialLoading(material: Material) {
+    abortMaterialLoading(material) {
         material.isLoading = false;
         material.isReady = false;
     }
-
-    public override applyMaterial(material: Material, isForced: boolean = false): NumberArray4 {
+    applyMaterial(material, isForced = false) {
         if (material.isReady) {
             return [0, 0, 1, 1];
-        } else {
+        }
+        else {
             !material.isLoading && this.loadMaterial(material);
-
             const segment = material.segment;
-            let pn = segment.node,
-                notEmpty = false;
-
+            let pn = segment.node, notEmpty = false;
             let mId = this.__id;
             let psegm = material;
-
             while (pn.parentNode) {
                 if (psegm && psegm.isReady) {
                     notEmpty = true;
@@ -1029,7 +771,6 @@ class Vector extends Layer {
                 pn = pn.parentNode;
                 psegm = pn.segment.materials[mId];
             }
-
             if (notEmpty) {
                 material.appliedNodeId = pn.nodeId;
                 material.texture = psegm.texture;
@@ -1041,11 +782,13 @@ class Vector extends Layer {
                     dZ2,
                     dZ2
                 ];
-            } else {
+            }
+            else {
                 if (material.textureExists && material._updateTexture) {
                     material.texture = material._updateTexture;
                     material.pickingMask = material._updatePickingMask;
-                } else {
+                }
+                else {
                     material.texture = segment.planet.transparentTexture;
                     material.pickingMask = segment.planet.transparentTexture;
                 }
@@ -1054,67 +797,53 @@ class Vector extends Layer {
             }
         }
     }
-
-    public override clearMaterial(material: Material) {
+    clearMaterial(material) {
         if (material.isReady) {
-            const gl = material.segment.handler.gl!;
-
+            const gl = material.segment.handler.gl;
             material.isReady = false;
             material.pickingReady = false;
-
             let t = material.texture;
             material.texture = null;
             t && !t.default && gl.deleteTexture(t);
-
             t = material.pickingMask;
             material.pickingMask = null;
             t && !t.default && gl.deleteTexture(t);
-
             t = material._updateTexture;
             material._updateTexture = null;
             t && !t.default && gl.deleteTexture(t);
-
             t = material._updatePickingMask;
             material._updatePickingMask = null;
             t && !t.default && gl.deleteTexture(t);
         }
-
         this.abortMaterialLoading(material);
-
         material.isLoading = false;
         material.textureExists = false;
     }
-
-    public update() {
+    update() {
         this._geometryHandler.update();
         this.events.dispatch(this.events.draw, this);
     }
 }
-
-const VECTOR_EVENTS: VectorEventsList = [
+const VECTOR_EVENTS = [
     /**
      * Triggered when entity has moved.
      * @event EventsHandler<VectorEventsList>#draw
      */
     "entitymove",
-
     /**
      * Triggered when layer begin draw.
      * @event EventsHandler<VectorEventsList>#draw
      */
     "draw",
-
     /**
      * Triggered when new entity added to the layer.
      * @event EventsHandler<VectorEventsList>#entityadd
      */
     "entityadd",
-
     /**
      * Triggered when entity removes from the collection.
      * @event EventsHandler<VectorEventsList>#entityremove
      */
     "entityremove"
 ];
-
-export {Vector};
+export { Vector };