@openglobus/og 0.21.0 → 0.22.1

package/lib/js/layer/Vector.js

@@ -1,14 +1,10 @@
 import * as math from "../math";
-import * as mercator from "../mercator";
-import * as quadTree from "../quadTree/quadTree";
 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";
+import * as mercator from "../mercator";
 /**
  * Creates entity instance array.
  * @param {Entity[] | IEntityParams[]} entities - Entity array.
@@ -69,11 +65,23 @@ class Vector extends Layer {
         this._hasImageryTiles = false;
         this.scaleByDistance = options.scaleByDistance || [math.MAX32, math.MAX32, math.MAX32];
         this._useLighting = options.useLighting !== undefined ? options.useLighting : true;
-        this.pickingScale = options.pickingScale || 1;
+        let pickingScale = new Float32Array([1.0, 1.0, 1.0]);
+        if (options.pickingScale !== undefined) {
+            if (options.pickingScale instanceof Array) {
+                pickingScale[0] = options.pickingScale[0] || pickingScale[0];
+                pickingScale[1] = options.pickingScale[1] || pickingScale[1];
+                pickingScale[2] = options.pickingScale[2] || pickingScale[2];
+            }
+            else if (typeof options.pickingScale === 'number') {
+                pickingScale[0] = options.pickingScale;
+                pickingScale[1] = options.pickingScale;
+                pickingScale[2] = options.pickingScale;
+            }
+        }
+        this.pickingScale = pickingScale;
         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({
@@ -90,19 +98,11 @@ class Vector extends Layer {
         });
         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();
-        this._pendingsQueue = [];
+        this._nodeCapacity = options.nodeCapacity || 60;
+        this._entityCollectionsTreeStrategy = null;
         this.setEntities(this._entities);
         this.polygonOffsetUnits = options.polygonOffsetUnits != undefined ? options.polygonOffsetUnits : 0.0;
         this.pickingEnabled = this._pickingEnabled;
-        this._secondPASS = [];
     }
     get useLighting() {
         return this._useLighting;
@@ -153,31 +153,6 @@ class Vector extends Layer {
     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;
-    //    }
-    //    if (ee.southWest.lat < minLat) {
-    //        e.southWest.lat = ee.southWest.lat;
-    //    }
-    //    if (ee.northEast.lon > maxLon) {
-    //        e.northEast.lon = ee.northEast.lon;
-    //    }
-    //    if (ee.northEast.lat > maxLat) {
-    //        e.northEast.lat = ee.northEast.lat;
-    //    }
-    //    this.setExtent(this._extent);
-    //}
     /**
      * Adds entity to the layer.
      * @public
@@ -218,13 +193,14 @@ class Vector extends Layer {
     }
     _proceedEntity(entity, rightNow = false) {
         let temp = this._hasImageryTiles;
+        let isEmpty = !(entity.strip || entity.polyline || entity.ray || entity.geoObject || entity.geometry);
         if (entity.strip) {
             this._stripEntityCollection.add(entity);
         }
         if (entity.polyline || entity.ray) {
             this._polylineEntityCollection.add(entity);
         }
-        if (entity.geoObject) {
+        if (entity.geoObject || isEmpty) {
             this._geoObjectEntityCollection.add(entity);
         }
         if (entity.geometry) {
@@ -234,28 +210,25 @@ class Vector extends Layer {
                 this._geometryHandler.add(entity.geometry);
             }
         }
-        if (entity.billboard || entity.label || entity.geoObject) {
-            if (this._planet) {
+        if (this._planet) {
+            if (entity.billboard || entity.label || entity.geoObject || isEmpty) {
                 if (entity._cartesian.isZero() && !entity._lonLat.isZero()) {
                     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);
+                    // IT's important event for degrees proj strategies
+                    if (Math.abs(entity._lonLat.lat) < mercator.MAX_LAT) {
+                        entity._lonLatMerc = entity._lonLat.forwardMercator();
+                    }
+                    else {
+                        entity._lonLatMerc.lon = entity._lonLatMerc.lat = entity._lonLatMerc.height = 0;
+                    }
                 }
             }
+            if (entity.billboard || entity.label) {
+                this._entityCollectionsTreeStrategy?.insertEntity(entity);
+            }
         }
         if (this._planet && this._hasImageryTiles !== temp) {
             this._planet.updateVisibleLayers();
@@ -320,11 +293,9 @@ class Vector extends Layer {
                     }
                 }
             }
-            if (entity.geometry) {
-                if (this._planet) {
-                    this._geometryHandler.remove(entity.geometry);
-                    this._planet.renderer.clearPickingColor(entity);
-                }
+            if (this._planet && entity.geometry) {
+                this._geometryHandler.remove(entity.geometry);
+                this._planet.renderer.clearPickingColor(entity);
             }
             entity._nodePtr = undefined;
             this.events.dispatch(this.events.entityremove, entity);
@@ -341,18 +312,7 @@ class Vector extends Layer {
         this._stripEntityCollection.setPickingEnabled(picking);
         this._polylineEntityCollection.setPickingEnabled(picking);
         this._geoObjectEntityCollection.setPickingEnabled(picking);
-        /**
-         * todo: it must be in the quadtree strategy
-         */
-        this._entityCollectionsTree && this._entityCollectionsTree.traverseTree((node) => {
-            node.entityCollection.setPickingEnabled(picking);
-        });
-        this._entityCollectionsTreeNorth && this._entityCollectionsTreeNorth.traverseTree((node) => {
-            node.entityCollection.setPickingEnabled(picking);
-        });
-        this._entityCollectionsTreeSouth && this._entityCollectionsTreeSouth.traverseTree((node) => {
-            node.entityCollection.setPickingEnabled(picking);
-        });
+        this._entityCollectionsTreeStrategy?.setPickingEnabled(picking);
     }
     /**
      * Refresh collected entities indexes from startIndex entities collection array position.
@@ -378,13 +338,8 @@ class Vector extends Layer {
         }
         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.
+     * Clear the layer.
      * @public
      */
     clear() {
@@ -402,9 +357,8 @@ class Vector extends Layer {
         for (let i = 0; i < temp.length; i++) {
             this._entities[i] = temp[i];
         }
-        this._entityCollectionsTree = null;
-        this._entityCollectionsTreeNorth = null;
-        this._entityCollectionsTreeSouth = null;
+        this._entityCollectionsTreeStrategy?.dispose();
+        this._entityCollectionsTreeStrategy = null;
         this._geometryHandler.clear();
     }
     /**
@@ -437,13 +391,14 @@ class Vector extends Layer {
             let ei = temp[i];
             ei._layer = this;
             ei._layerIndex = i;
+            let isEmpty = !(ei.strip || ei.polyline || ei.ray || ei.geoObject || ei.billboard || ei.label);
             if (ei.strip) {
                 this._stripEntityCollection.add(ei);
             }
             else if (ei.polyline || ei.ray) {
                 this._polylineEntityCollection.add(ei);
             }
-            else if (ei.geoObject) {
+            else if (ei.geoObject || isEmpty) {
                 this._geoObjectEntityCollection.add(ei);
             }
             else if (ei.billboard || ei.label) {
@@ -461,35 +416,14 @@ class Vector extends Layer {
         this._createEntityCollectionsTree(entitiesForTree);
         return this;
     }
-    /**
-     * @todo: replace to a strategy node collecting algorithm
-     */
     _createEntityCollectionsTree(entitiesForTree) {
         if (this._planet) {
-            this._entityCollectionsTree = new EntityCollectionNode(this, quadTree.NW, null, Extent.createFromArray([-20037508.34, -20037508.34, 20037508.34, 20037508.34]), this._planet, 0);
-            this._entityCollectionsTreeNorth = new EntityCollectionNodeWGS84(this, quadTree.NW, null, Extent.createFromArray([-180, mercator.MAX_LAT, 180, 90]), this._planet, 0);
-            this._entityCollectionsTreeSouth = new EntityCollectionNodeWGS84(this, quadTree.NW, null, 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) {
-                    // south tree
-                    this._entityCollectionsTreeSouth.__setLonLat__(entity);
-                }
-                else {
-                    this._entityCollectionsTree.__setLonLat__(entity);
-                }
-            }
-            this._entityCollectionsTree.buildTree(entitiesForTree);
-            this._entityCollectionsTreeNorth.buildTree(entitiesForTree);
-            this._entityCollectionsTreeSouth.buildTree(entitiesForTree);
+            this._entityCollectionsTreeStrategy = this._planet.quadTreeStrategy.createEntitiCollectionsTreeStrategy(this, this._nodeCapacity);
+            this._entityCollectionsTreeStrategy.insertEntities(entitiesForTree);
         }
     }
     /**
-     * @todo (refactoring) could be used in somethig like bindEntityCollectionQuad(...)
+     * @todo (refactoring) could be used in something like bindEntityCollectionQuad(...)
      * @param entityCollection
      */
     _bindEventsDefault(entityCollection) {
@@ -682,64 +616,15 @@ class Vector extends Layer {
         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);
-            let i = this._secondPASS.length;
-            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);
-            i = this._secondPASS.length;
-            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);
-            i = this._secondPASS.length;
-            while (i--) {
-                this._secondPASS[i].collectRenderCollectionsPASS2(p._visibleNodesSouth, outArr, this._secondPASS[i].nodeId);
+            if (this._entityCollectionsTreeStrategy) {
+                this._entityCollectionsTreeStrategy.collectVisibleEntityCollections(outArr);
             }
         }
     }
-    _queueDeferredNode(node) {
-        if (this._visibility) {
-            node._inTheQueue = true;
-            if (this._counter >= 1) {
-                this._deferredEntitiesPendingQueue.push(node);
-            }
-            else {
-                this._execDeferredNode(node);
-            }
-        }
-    }
-    _execDeferredNode(node) {
-        this._counter++;
-        requestAnimationFrame(() => {
-            node.applyCollection();
-            this._counter--;
-            if (this._deferredEntitiesPendingQueue.length && this._counter < 1) {
-                while (this._deferredEntitiesPendingQueue.length) {
-                    let n = this._deferredEntitiesPendingQueue.pop();
-                    n._inTheQueue = false;
-                    if (n.isVisible()) {
-                        this._execDeferredNode(n);
-                        return;
-                    }
-                }
-            }
-        });
-    }
     /**
      * Start to load tile material.
      * @public

package/lib/js/layer/XYZ.js

@@ -94,7 +94,7 @@ export class XYZ extends Layer {
         this.url = url;
     }
     _checkSegment(segment) {
-        return segment._projection.id === this._planet.quadTreeStrategy.projection.id; // EPSG4326.id;// EPSG3857.id;
+        return segment._projection.id === this._planet.quadTreeStrategy.projection.id;
     }
     /**
      * Start to load tile material.
@@ -142,9 +142,7 @@ export class XYZ extends Layer {
                             material.textureNotExists();
                         }
                     }
-                }
-                //,this.__id
-                );
+                });
             }
             else {
                 material.textureNotExists();
@@ -277,12 +275,14 @@ export class XYZ extends Layer {
         if (e.southWest.lon === -180.0) {
             em.southWest.lon = -ENLARGE_MERCATOR_LON;
         }
-        if (e.northEast.lat >= mercator.MAX_LAT) {
-            e.northEast.lat = mercator.MAX_LAT;
-        }
-        if (e.northEast.lat <= mercator.MIN_LAT) {
-            e.northEast.lat = mercator.MIN_LAT;
-        }
+        // WHY!???
+        // if (e.northEast.lat >= mercator.MAX_LAT) {
+        //     e.northEast.lat = mercator.MAX_LAT;
+        // }
+        //
+        // if (e.northEast.lat <= mercator.MIN_LAT) {
+        //     e.northEast.lat = mercator.MIN_LAT;
+        // }
     }
 }
 const XYZ_EVENTS = [

package/lib/js/proj/equi.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @module og/proj/equi
+ */
+import { Proj } from "./Proj";
+/**
+ * Any equrectangualr projection object.
+ * @type {Proj}
+ */
+export declare const equi: Proj;

package/lib/js/proj/equi.js

@@ -0,0 +1,9 @@
+/**
+ * @module og/proj/equi
+ */
+import { Proj, Units } from "./Proj";
+/**
+ * Any equrectangualr projection object.
+ * @type {Proj}
+ */
+export const equi = new Proj({ code: "equi", units: Units.DEGREES });

package/lib/js/quadTree/{EPSG4326QuadTreeStrategy.d.ts → EPSG4326/EPSG4326QuadTreeStrategy.d.ts}

@@ -1,5 +1,5 @@
-import { Planet } from "../scene/Planet";
-import { QuadTreeStrategy } from "./QuadTreeStrategy";
+import { Planet } from "../../scene/Planet";
+import { QuadTreeStrategy } from "../QuadTreeStrategy";
 export declare class EPSG4326QuadTreeStrategy extends QuadTreeStrategy {
     constructor(planet: Planet);
     init(): void;

package/lib/js/quadTree/EPSG4326/EPSG4326QuadTreeStrategy.js

@@ -0,0 +1,16 @@
+import { Extent } from "../../Extent";
+import { EPSG4326 } from "../../proj/EPSG4326";
+import { Node } from "../Node";
+import { QuadTreeStrategy } from "../QuadTreeStrategy";
+import { SegmentLonLatEqui } from "../../segment/SegmentLonLatEqui";
+export class EPSG4326QuadTreeStrategy extends QuadTreeStrategy {
+    constructor(planet) {
+        super(planet, "EPSG4326", EPSG4326);
+    }
+    init() {
+        this._quadTreeList = [
+            new Node(SegmentLonLatEqui, this.planet, 0, null, 0, Extent.createFromArray([-180, -90, 0, 90])),
+            new Node(SegmentLonLatEqui, this.planet, 0, null, 0, Extent.createFromArray([0, -90, 180, 90]))
+        ];
+    }
+}

package/lib/js/quadTree/EntityCollectionNode.d.ts

@@ -7,12 +7,14 @@ import { Sphere } from '../bv/Sphere';
 import { Segment } from "../segment/Segment";
 import { Vector } from "../layer/Vector";
 import { Entity } from "../entity/Entity";
-type NodesDict = Record<number, Node>;
+import { EntityCollectionsTreeStrategy } from "./EntityCollectionsTreeStrategy";
+export type NodesDict = Record<number, Node>;
 /**
  * @todo: remove planet parameter. It's already available in the layer.
  */
 declare class EntityCollectionNode {
     layer: Vector;
+    strategy: EntityCollectionsTreeStrategy;
     parentNode: EntityCollectionNode | null;
     childrenNodes: EntityCollectionNode[];
     partId: number;
@@ -25,7 +27,7 @@ declare class EntityCollectionNode {
     zoom: number;
     bsphere: Sphere;
     _inTheQueue: boolean;
-    constructor(layer: Vector, partId: number, parent: EntityCollectionNode | null, extent: Extent, planet: Planet, zoom: number);
+    constructor(strategy: EntityCollectionsTreeStrategy, partId: number, parent: EntityCollectionNode | null, extent: Extent, planet: Planet, zoom: number);
     insertEntity(entity: Entity, rightNow?: boolean): void;
     protected _addEntitiesToCollection(entities: Entity[], rightNow?: boolean): void;
     protected _setExtentBounds(): void;
@@ -41,14 +43,4 @@ declare class EntityCollectionNode {
     alignEntityToTheGround(entity: Entity, segment: Segment): void;
     isVisible(): boolean;
 }
-declare class EntityCollectionNodeWGS84 extends EntityCollectionNode {
-    isNorth: boolean;
-    constructor(layer: Vector, partId: number, parent: EntityCollectionNodeWGS84 | null, extent: Extent, planet: Planet, zoom: number);
-    createChildrenNodes(): void;
-    protected _setExtentBounds(): void;
-    __setLonLat__(entity: Entity): LonLat;
-    isVisible(): boolean;
-    isInside(entity: Entity): boolean;
-    renderCollection(outArr: EntityCollection[], visibleNodes: NodesDict, renderingNode: number): void;
-}
-export { EntityCollectionNode, EntityCollectionNodeWGS84 };
+export { EntityCollectionNode };

package/lib/js/quadTree/EntityCollectionNode.js

@@ -9,8 +9,9 @@ import { Vec3 } from '../math/Vec3';
  * @todo: remove planet parameter. It's already available in the layer.
  */
 class EntityCollectionNode {
-    constructor(layer, partId, parent, extent, planet, zoom) {
-        this.layer = layer;
+    constructor(strategy, partId, parent, extent, planet, zoom) {
+        this.strategy = strategy;
+        this.layer = strategy._layer;
         this.parentNode = parent;
         this.childrenNodes = [];
         this.partId = partId;
@@ -120,7 +121,7 @@ class EntityCollectionNode {
         }
     }
     createChildrenNodes() {
-        const l = this.layer;
+        const s = this.strategy;
         const ext = this.extent;
         const size_x = ext.getWidth() * 0.5;
         const size_y = ext.getHeight() * 0.5;
@@ -130,10 +131,10 @@ class EntityCollectionNode {
         const nd = this.childrenNodes;
         const p = this.layer._planet;
         const z = this.zoom + 1;
-        nd[NW] = new EntityCollectionNode(l, NW, this, new Extent(new LonLat(sw.lon, sw.lat + size_y), new LonLat(sw.lon + size_x, ne.lat)), p, z);
-        nd[NE] = new EntityCollectionNode(l, NE, this, new Extent(c, new LonLat(ne.lon, ne.lat)), p, z);
-        nd[SW] = new EntityCollectionNode(l, SW, this, new Extent(new LonLat(sw.lon, sw.lat), c), p, z);
-        nd[SE] = new EntityCollectionNode(l, SE, this, new Extent(new LonLat(sw.lon + size_x, sw.lat), new LonLat(ne.lon, sw.lat + size_y)), p, z);
+        nd[NW] = new EntityCollectionNode(s, NW, this, new Extent(new LonLat(sw.lon, sw.lat + size_y), new LonLat(sw.lon + size_x, ne.lat)), p, z);
+        nd[NE] = new EntityCollectionNode(s, NE, this, new Extent(c, new LonLat(ne.lon, ne.lat)), p, z);
+        nd[SW] = new EntityCollectionNode(s, SW, this, new Extent(new LonLat(sw.lon, sw.lat), c), p, z);
+        nd[SE] = new EntityCollectionNode(s, SE, this, new Extent(new LonLat(sw.lon + size_x, sw.lat), new LonLat(ne.lon, sw.lat + size_y)), p, z);
     }
     collectRenderCollectionsPASS1(visibleNodes, outArr) {
         const n = visibleNodes[this.nodeId];
@@ -144,7 +145,7 @@ class EntityCollectionNode {
             }
             else if (cn.length) {
                 if (n.state === RENDERING) {
-                    this.layer._secondPASS.push(this);
+                    this.strategy._secondPASS.push(this);
                 }
                 else {
                     cn[NW].collectRenderCollectionsPASS1(visibleNodes, outArr);
@@ -160,7 +161,7 @@ class EntityCollectionNode {
         const cam = p.camera;
         const altVis = (cam.eye.distance(this.bsphere.center) - this.bsphere.radius <
             VISIBLE_DISTANCE * Math.sqrt(cam._lonLat.height)) || cam._lonLat.height > 10000;
-        if (this.count > 0 && altVis && cam.frustum.containsSphere(this.bsphere)) {
+        if (this.count > 0 && altVis && cam.containsSphere(this.bsphere)) {
             const cn = this.childrenNodes;
             if (this.entityCollection) {
                 this.renderCollection(outArr, visibleNodes, renderingNodeId);
@@ -192,17 +193,18 @@ class EntityCollectionNode {
         }
     }
     renderCollection(outArr, visibleNodes, renderingNodeId) {
-        const l = this.layer;
-        l._renderingNodes[this.nodeId] = true;
+        const s = this.strategy;
+        s._renderingNodes[this.nodeId] = true;
         if (this.deferredEntities.length && !this._inTheQueue) {
-            if (l.async) {
-                l._queueDeferredNode(this);
+            if (this.layer.async) {
+                s._queueDeferredNode(this);
             }
             else {
                 this.applyCollection();
             }
         }
-        const ec = this.entityCollection;
+        let ec = this.entityCollection;
+        let l = this.layer;
         ec._fadingOpacity = l._fadingOpacity;
         ec.scaleByDistance = l.scaleByDistance;
         ec.pickingScale = l.pickingScale;
@@ -251,77 +253,10 @@ class EntityCollectionNode {
         }
     }
     isVisible() {
-        if (this.layer._renderingNodes[this.nodeId]) {
-            return true;
-        }
-        return false;
-    }
-}
-class EntityCollectionNodeWGS84 extends EntityCollectionNode {
-    constructor(layer, partId, parent, extent, planet, zoom) {
-        super(layer, partId, parent, extent, planet, zoom);
-        this.isNorth = false;
-    }
-    createChildrenNodes() {
-        const l = this.layer;
-        const ext = this.extent;
-        const size_x = ext.getWidth() * 0.5;
-        const size_y = ext.getHeight() * 0.5;
-        const ne = ext.northEast;
-        const sw = ext.southWest;
-        const c = new LonLat(sw.lon + size_x, sw.lat + size_y);
-        const nd = this.childrenNodes;
-        const p = this.layer._planet;
-        const z = this.zoom + 1;
-        nd[NW] = new EntityCollectionNodeWGS84(l, NW, this, new Extent(new LonLat(sw.lon, sw.lat + size_y), new LonLat(sw.lon + size_x, ne.lat)), p, z);
-        nd[NE] = new EntityCollectionNodeWGS84(l, NE, this, new Extent(c, new LonLat(ne.lon, ne.lat)), p, z);
-        nd[SW] = new EntityCollectionNodeWGS84(l, SW, this, new Extent(new LonLat(sw.lon, sw.lat), c), p, z);
-        nd[SE] = new EntityCollectionNodeWGS84(l, SE, this, new Extent(new LonLat(sw.lon + size_x, sw.lat), new LonLat(ne.lon, sw.lat + size_y)), p, z);
-    }
-    _setExtentBounds() {
-        if (this.extent.northEast.lat > 0) {
-            this.isNorth = true;
-        }
-        this.bsphere.setFromExtent(this.layer._planet.ellipsoid, this.extent);
-    }
-    __setLonLat__(entity) {
-        if (entity._lonLat.isZero()) {
-            entity._lonLat = this.layer._planet.ellipsoid.cartesianToLonLat(entity._cartesian);
-        }
-        return entity._lonLat;
-    }
-    isVisible() {
-        if (this.isNorth && this.layer._renderingNodesNorth[this.nodeId]) {
-            return true;
-        }
-        else if (this.layer._renderingNodesSouth[this.nodeId]) {
+        if (this.strategy._renderingNodes[this.nodeId]) {
             return true;
         }
         return false;
     }
-    isInside(entity) {
-        return this.extent.isInside(entity._lonLat);
-    }
-    renderCollection(outArr, visibleNodes, renderingNode) {
-        if (this.isNorth) {
-            this.layer._renderingNodesNorth[this.nodeId] = true;
-        }
-        else {
-            this.layer._renderingNodesSouth[this.nodeId] = true;
-        }
-        if (this.deferredEntities.length && !this._inTheQueue) {
-            if (this.layer.async) {
-                this.layer._queueDeferredNode(this);
-            }
-            else {
-                this.applyCollection();
-            }
-        }
-        const ec = this.entityCollection;
-        ec._fadingOpacity = this.layer._fadingOpacity;
-        ec.scaleByDistance = this.layer.scaleByDistance;
-        ec.pickingScale = this.layer.pickingScale;
-        outArr.push(ec);
-    }
 }
-export { EntityCollectionNode, EntityCollectionNodeWGS84 };
+export { EntityCollectionNode };

package/lib/js/quadTree/EntityCollectionsTreeStrategy.d.ts

@@ -0,0 +1,25 @@
+import { Vector } from "../layer/Vector";
+import { EntityCollectionNode } from "./EntityCollectionNode";
+import { Entity } from "../entity/Entity";
+import { EntityCollection } from "../entity/EntityCollection";
+import { QueueArray } from "../QueueArray";
+export declare class EntityCollectionsTreeStrategy {
+    _layer: Vector;
+    /**
+     * Maximum entities quantity in the tree node.
+     * @public
+     */
+    _nodeCapacity: number;
+    _secondPASS: EntityCollectionNode[];
+    protected _counter: number;
+    protected _deferredEntitiesPendingQueue: QueueArray<EntityCollectionNode>;
+    _renderingNodes: Record<number, boolean>;
+    constructor(layer: Vector, nodeCapacity: number);
+    insertEntity(entity: Entity, rightNow?: boolean): void;
+    setPickingEnabled(pickingEnabled: boolean): void;
+    dispose(): void;
+    insertEntities(entitiesForTree: Entity[]): void;
+    collectVisibleEntityCollections(outArr: EntityCollection[]): void;
+    _queueDeferredNode(node: EntityCollectionNode): void;
+    protected _execDeferredNode(node: EntityCollectionNode): void;
+}