@openglobus/og 0.19.3 → 0.20.0

package/lib/js/entity/index.d.ts

@@ -1,11 +1,10 @@
-import { Billboard } from "./Billboard";
-import { Entity } from "./Entity";
-import { EntityCollection } from "./EntityCollection";
-import { Geometry } from "./Geometry";
-import { GeoObject } from "./GeoObject";
-import { Label } from "./Label";
-import { PointCloud } from "./PointCloud";
-import { Polyline } from "./Polyline";
-import { Ray } from "./Ray";
-import { Strip } from "./Strip";
-export { Billboard, Entity, EntityCollection, Geometry, GeoObject, Label, PointCloud, Polyline, Ray, Strip };
+export * from "./Billboard";
+export * from "./Entity";
+export * from "./EntityCollection";
+export * from "./Geometry";
+export * from "./GeoObject";
+export * from "./Label";
+export * from "./PointCloud";
+export * from "./Polyline";
+export * from "./Ray";
+export * from "./Strip";

package/lib/js/entity/index.js

@@ -1,11 +1,10 @@
-import { Billboard } from "./Billboard";
-import { Entity } from "./Entity";
-import { EntityCollection } from "./EntityCollection";
-import { Geometry } from "./Geometry";
-import { GeoObject } from "./GeoObject";
-import { Label } from "./Label";
-import { PointCloud } from "./PointCloud";
-import { Polyline } from "./Polyline";
-import { Ray } from "./Ray";
-import { Strip } from "./Strip";
-export { Billboard, Entity, EntityCollection, Geometry, GeoObject, Label, PointCloud, Polyline, Ray, Strip };
+export * from "./Billboard";
+export * from "./Entity";
+export * from "./EntityCollection";
+export * from "./Geometry";
+export * from "./GeoObject";
+export * from "./Label";
+export * from "./PointCloud";
+export * from "./Polyline";
+export * from "./Ray";
+export * from "./Strip";

package/lib/js/index.d.ts

@@ -8,7 +8,7 @@ import * as scene from './scene/index';
 import * as terrain from './terrain/index';
 import * as layer from './layer/index';
 import * as webgl from './webgl/index';
-import { Globe } from './Globe';
+export * from './Globe';
 import { Geoid } from './terrain/Geoid';
 import { input } from './input/input';
 import { Ellipsoid, wgs84 } from './ellipsoid/index';
@@ -27,7 +27,7 @@ import { EarthQuadTreeStrategy, MarsQuadTreeStrategy, QuadTreeStrategy, quadTree
 import { Object3d } from './Object3d';
 import { Handler, Program, Framebuffer, Multisample } from './webgl/index';
 import { Control } from './control/Control';
-import { Entity, EntityCollection, Billboard, Geometry, Label, PointCloud, Polyline, GeoObject } from './entity/index';
-import { Layer, Vector, XYZ, CanvasTiles, WMS, GeoImage, GeoVideo, GeoTexture2d, KML, Material } from './layer/index';
-import { EmptyTerrain, GlobusTerrain, MapboxTerrain, BilTerrain } from './terrain/index';
-export { bv, jd, math, mercator, utils, input, control, scene, quadTreeStrategyType, wgs84, terrain, layer, webgl, Framebuffer, Material, KML, Layer, XYZ, Vector, CanvasTiles, WMS, GeoImage, GeoVideo, GeoTexture2d, EmptyTerrain, GlobusTerrain, MapboxTerrain, BilTerrain, Control, Camera, Ellipsoid, Planet, PlanetCamera, Globe, LightSource, Entity, EntityCollection, Billboard, Geometry, Label, PointCloud, Polyline, Program, GeoObject, Handler, Multisample, Renderer, Clock, Events, Extent, LonLat, RenderNode, Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4, Geoid, Popup, QuadTreeStrategy, MarsQuadTreeStrategy, EarthQuadTreeStrategy, Wgs84QuadTreeStrategy, Object3d };
+export * from './entity/index';
+export * from './layer/index';
+import { EmptyTerrain, GlobusTerrain, RgbTerrain, BilTerrain, GlobusRgbTerrain } from './terrain/index';
+export { bv, jd, math, mercator, utils, input, control, scene, quadTreeStrategyType, wgs84, terrain, layer, webgl, Framebuffer, EmptyTerrain, GlobusTerrain, RgbTerrain, GlobusRgbTerrain, BilTerrain, Control, Camera, Ellipsoid, Planet, PlanetCamera, LightSource, Program, Handler, Multisample, Renderer, Clock, Events, Extent, LonLat, RenderNode, Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4, Geoid, Popup, QuadTreeStrategy, MarsQuadTreeStrategy, EarthQuadTreeStrategy, Wgs84QuadTreeStrategy, Object3d };

package/lib/js/index.js

@@ -8,7 +8,7 @@ import * as scene from './scene/index';
 import * as terrain from './terrain/index';
 import * as layer from './layer/index';
 import * as webgl from './webgl/index';
-import { Globe } from './Globe';
+export * from './Globe';
 import { Geoid } from './terrain/Geoid';
 import { input } from './input/input';
 import { Ellipsoid, wgs84 } from './ellipsoid/index';
@@ -27,7 +27,7 @@ import { EarthQuadTreeStrategy, MarsQuadTreeStrategy, QuadTreeStrategy, quadTree
 import { Object3d } from './Object3d';
 import { Handler, Program, Framebuffer, Multisample } from './webgl/index';
 import { Control } from './control/Control';
-import { Entity, EntityCollection, Billboard, Geometry, Label, PointCloud, Polyline, GeoObject } from './entity/index';
-import { Layer, Vector, XYZ, CanvasTiles, WMS, GeoImage, GeoVideo, GeoTexture2d, KML, Material } from './layer/index';
-import { EmptyTerrain, GlobusTerrain, MapboxTerrain, BilTerrain } from './terrain/index';
-export { bv, jd, math, mercator, utils, input, control, scene, quadTreeStrategyType, wgs84, terrain, layer, webgl, Framebuffer, Material, KML, Layer, XYZ, Vector, CanvasTiles, WMS, GeoImage, GeoVideo, GeoTexture2d, EmptyTerrain, GlobusTerrain, MapboxTerrain, BilTerrain, Control, Camera, Ellipsoid, Planet, PlanetCamera, Globe, LightSource, Entity, EntityCollection, Billboard, Geometry, Label, PointCloud, Polyline, Program, GeoObject, Handler, Multisample, Renderer, Clock, Events, Extent, LonLat, RenderNode, Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4, Geoid, Popup, QuadTreeStrategy, MarsQuadTreeStrategy, EarthQuadTreeStrategy, Wgs84QuadTreeStrategy, Object3d };
+export * from './entity/index';
+export * from './layer/index';
+import { EmptyTerrain, GlobusTerrain, RgbTerrain, BilTerrain, GlobusRgbTerrain } from './terrain/index';
+export { bv, jd, math, mercator, utils, input, control, scene, quadTreeStrategyType, wgs84, terrain, layer, webgl, Framebuffer, EmptyTerrain, GlobusTerrain, RgbTerrain, GlobusRgbTerrain, BilTerrain, Control, Camera, Ellipsoid, Planet, PlanetCamera, LightSource, Program, Handler, Multisample, Renderer, Clock, Events, Extent, LonLat, RenderNode, Line2, Line3, Mat3, Mat4, Plane, Quat, Ray, Vec2, Vec3, Vec4, Geoid, Popup, QuadTreeStrategy, MarsQuadTreeStrategy, EarthQuadTreeStrategy, Wgs84QuadTreeStrategy, Object3d };

package/lib/js/layer/Bing.d.ts

@@ -0,0 +1,4 @@
+import { XYZ, IXYZParams } from "./XYZ";
+export declare class Bing extends XYZ {
+    constructor(name: string | null, options?: IXYZParams);
+}

package/lib/js/layer/Bing.js

@@ -0,0 +1,40 @@
+import { XYZ } from "./XYZ";
+import { stringTemplate } from "../utils/shared";
+function toQuadKey(x, y, z) {
+    var index = '';
+    for (let i = z; i > 0; i--) {
+        var b = 0;
+        var mask = 1 << (i - 1);
+        if ((x & mask) !== 0)
+            b++;
+        if ((y & mask) !== 0)
+            b += 2;
+        index += b.toString();
+    }
+    return index;
+}
+export class Bing extends XYZ {
+    constructor(name, options = {}) {
+        super(name || "Bing", {
+            iconSrc: "https://ecn.t0.tiles.virtualearth.net/tiles/a120.jpeg?n=z&g=7146",
+            subdomains: ['t0', 't1', 't2', 't3'],
+            url: "https://ecn.{s}.tiles.virtualearth.net/tiles/a{quad}.jpeg?n=z&g=7146",
+            isBaseLayer: true,
+            maxNativeZoom: 17,
+            defaultTextures: [{ color: "#001522" }, { color: "#E4E6F3" }],
+            attribution: `<div style="transform: scale(0.8); margin-top:-2px;"><a href="https://www.bing.com" target="_blank"><img style="position: relative; top: 2px;" title="Bing Imagery" src="https://sandcastle.cesium.com/CesiumUnminified/Assets/Images/bing_maps_credit.png"></a> © 2021 Microsoft Corporation</div>`,
+            urlRewrite: (s, u) => {
+                return stringTemplate(u, {
+                    's': this._getSubdomain(),
+                    'quad': toQuadKey(s.tileX, s.tileY, s.tileZoom)
+                });
+            },
+            specular: [0.00063, 0.00055, 0.00032],
+            ambient: "rgb(90,90,90)",
+            diffuse: "rgb(350,350,350)",
+            shininess: 20,
+            nightTextureCoefficient: 2.7,
+            ...options
+        });
+    }
+}

package/lib/js/layer/GeoImage.d.ts

@@ -1,6 +1,6 @@
 import { BaseGeoImage, IBaseGeoImageParams } from "./BaseGeoImage";
 import { Material } from "./Material";
-interface IGeoImageParams extends IBaseGeoImageParams {
+export interface IGeoImageParams extends IBaseGeoImageParams {
     image?: HTMLImageElement | HTMLCanvasElement | ImageBitmap;
     src?: string;
 }

package/lib/js/layer/GeoVideo.d.ts

@@ -1,6 +1,6 @@
 import { BaseGeoImage, IBaseGeoImageParams } from "./BaseGeoImage";
 import { Material } from "./Material";
-interface IGeoVideoParams extends IBaseGeoImageParams {
+export interface IGeoVideoParams extends IBaseGeoImageParams {
     videoElement?: HTMLVideoElement;
     src?: string;
 }

package/lib/js/layer/Layer.d.ts

@@ -202,7 +202,7 @@ declare class Layer {
         y: number;
         z: number;
     };
-    static getTileIndex(...arr: number[]): string;
+    static getTileIndex(x: number, y: number, z: number, tileGroup: number): string;
     get instanceName(): string;
     get rendererEvents(): EventsHandler<LayerEventsList>;
     set opacity(opacity: number);

package/lib/js/layer/Layer.js

@@ -165,8 +165,8 @@ class Layer {
             z: z
         };
     }
-    static getTileIndex(...arr) {
-        return arr.join("_");
+    static getTileIndex(x, y, z, tileGroup) {
+        return `${tileGroup}::${x}_${y}_${z}`;
     }
     get instanceName() {
         return "Layer";

package/lib/js/layer/OpenStreetMap.d.ts

@@ -0,0 +1,4 @@
+import { XYZ, IXYZParams } from "./XYZ";
+export declare class OpenStreetMap extends XYZ {
+    constructor(name: string | null, options?: IXYZParams);
+}

package/lib/js/layer/OpenStreetMap.js

@@ -0,0 +1,19 @@
+import { XYZ } from "./XYZ";
+export class OpenStreetMap extends XYZ {
+    constructor(name, options = {}) {
+        super(name || "OpenStreetMap", {
+            iconSrc: "https://tile.openstreetmap.org/8/138/95.png",
+            url: "http://tile.openstreetmap.org/{z}/{x}/{y}.png",
+            attribution: 'Data @ OpenStreetMap contributors, ODbL',
+            isBaseLayer: true,
+            maxNativeZoom: 19,
+            defaultTextures: [{ color: "#AAD3DF" }, { color: "#F2EFE9" }],
+            isSRGB: false,
+            shininess: 18,
+            specular: [0.00063, 0.00055, 0.00032],
+            ambient: [0.2, 0.2, 0.3],
+            diffuse: [0.9, 0.9, 0.7],
+            ...options
+        });
+    }
+}

package/lib/js/layer/Vector.d.ts

@@ -101,6 +101,9 @@ declare class Vector extends Layer {
      * @public
      */
     _nodeCapacity: number;
+    /**
+     * @todo: remove, or replace with node strategy
+     */
     protected _entityCollectionsTree: EntityCollectionNode | null;
     protected _entityCollectionsTreeNorth: EntityCollectionNodeWGS84 | null;
     protected _entityCollectionsTreeSouth: EntityCollectionNodeWGS84 | null;

package/lib/js/layer/Vector.js

@@ -449,9 +449,9 @@ class Vector extends Layer {
      */
     _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, 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

package/lib/js/layer/index.d.ts

@@ -1,11 +1,12 @@
-import { CanvasTiles } from './CanvasTiles';
-import { GeoImage } from './GeoImage';
-import { GeoTexture2d } from './GeoTexture2d';
-import { GeoVideo } from './GeoVideo';
-import { KML } from './KML';
-import { Layer } from './Layer';
-import { Vector } from './Vector';
-import { WMS } from './WMS';
-import { XYZ } from './XYZ';
-import { Material } from './Material';
-export { CanvasTiles, GeoImage, GeoTexture2d, GeoVideo, KML, Layer, Vector, WMS, XYZ, Material };
+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/js/layer/index.js

@@ -1,11 +1,12 @@
-import { CanvasTiles } from './CanvasTiles';
-import { GeoImage } from './GeoImage';
-import { GeoTexture2d } from './GeoTexture2d';
-import { GeoVideo } from './GeoVideo';
-import { KML } from './KML';
-import { Layer } from './Layer';
-import { Vector } from './Vector';
-import { WMS } from './WMS';
-import { XYZ } from './XYZ';
-import { Material } from './Material';
-export { CanvasTiles, GeoImage, GeoTexture2d, GeoVideo, KML, Layer, Vector, WMS, XYZ, Material };
+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/js/math/Mat4.js

@@ -384,23 +384,24 @@ export class Mat4 {
      * @returns {Mat4} -
      */
     setPerspective(left, right, bottom, top, near, far) {
-        let h = right - left, i = top - bottom, j = far - near;
-        this._m[0] = (near * 2) / h;
-        this._m[1] = 0;
-        this._m[2] = 0;
-        this._m[3] = 0;
-        this._m[4] = 0;
-        this._m[5] = (near * 2) / i;
-        this._m[6] = 0;
-        this._m[7] = 0;
-        this._m[8] = (right + left) / h;
-        this._m[9] = (top + bottom) / i;
-        this._m[10] = -(far + near) / j;
-        this._m[11] = -1;
-        this._m[12] = 0;
-        this._m[13] = 0;
-        this._m[14] = -(far * near * 2) / j;
-        this._m[15] = 0;
+        let h = right - left, i = top - bottom, j = near - far, n2 = 2 * near;
+        let mm = this._m;
+        mm[0] = n2 / h;
+        mm[1] = 0;
+        mm[2] = 0;
+        mm[3] = 0;
+        mm[4] = 0;
+        mm[5] = n2 / i;
+        mm[6] = 0;
+        mm[7] = 0;
+        mm[8] = (right + left) / h;
+        mm[9] = (top + bottom) / i;
+        mm[10] = (far + near) / j;
+        mm[11] = -1;
+        mm[12] = 0;
+        mm[13] = 0;
+        mm[14] = (n2 * far) / j;
+        mm[15] = 0;
         return this;
     }
     /**

package/lib/js/mercator.js

@@ -102,7 +102,8 @@ export function forwardArray(lonlatArr) {
     return res;
 }
 export function getTileExtent(x, y, z) {
-    let size = POLE2 / Math.pow(2, z), sw = new LonLat(-POLE + x * size, POLE - y * size - size);
+    let size = POLE2 / (1 << z), //Math.pow(2, z),
+    sw = new LonLat(-POLE + x * size, POLE - y * size - size);
     return new Extent(sw, new LonLat(sw.lon + size, sw.lat + size));
 }
 /**

package/lib/js/quadTree/EPSG4326QuadTreeStrategy.js

@@ -1,4 +1,3 @@
-import * as quadTree from "../quadTree/quadTree";
 import { Extent } from "../Extent";
 import { EPSG4326 } from "../proj/EPSG4326";
 import { Node } from "../quadTree/Node";
@@ -9,9 +8,9 @@ export class EPSG4326QuadTreeStrategy extends QuadTreeStrategy {
         super(planet, "EPSG4326", EPSG4326);
     }
     init() {
-        let earthQuadTreeSouth = new Node(SegmentLonLatWgs84, this.planet, quadTree.NW, null, 0, 0, Extent.createFromArray([-180, -90, 0, 90]));
-        let earthQuadTreeWest = new Node(SegmentLonLatWgs84, this.planet, quadTree.NW, null, 0, 0, Extent.createFromArray([0, -90, 180, 90]));
-        this._quadTreeList.push(earthQuadTreeSouth);
-        this._quadTreeList.push(earthQuadTreeWest);
+        this._quadTreeList = [
+            new Node(SegmentLonLatWgs84, this.planet, 0, null, 0, Extent.createFromArray([-180, -90, 0, 90])),
+            new Node(SegmentLonLatWgs84, this.planet, 0, null, 0, Extent.createFromArray([0, -90, 180, 90]))
+        ];
     }
 }

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

@@ -1,6 +1,9 @@
 import { Planet } from "../scene/Planet";
 import { QuadTreeStrategy } from "./QuadTreeStrategy";
+import { LonLat } from "../LonLat";
 export declare class EarthQuadTreeStrategy extends QuadTreeStrategy {
     constructor(planet: Planet);
     init(): void;
+    getTileXY(lonLat: LonLat, zoom: number): [number, number, number, number];
+    getLonLatTileOffset(lonLat: LonLat, x: number, y: number, z: number, gridSize: number): [number, number];
 }

package/lib/js/quadTree/EarthQuadTreeStrategy.js

@@ -1,9 +1,8 @@
 import * as mercator from "../mercator";
-import * as quadTree from "../quadTree/quadTree";
 import { Extent } from "../Extent";
 import { Node } from "../quadTree/Node";
 import { QuadTreeStrategy } from "./QuadTreeStrategy";
-import { Segment } from "../segment/Segment";
+import { Segment, TILEGROUP_NORTH, TILEGROUP_SOUTH, getTileGroupByLat, getTileCellExtent, getTileCellIndex } from "../segment/Segment";
 import { SegmentLonLat } from "../segment/SegmentLonLat";
 export class EarthQuadTreeStrategy extends QuadTreeStrategy {
     constructor(planet) {
@@ -11,9 +10,45 @@ export class EarthQuadTreeStrategy extends QuadTreeStrategy {
     }
     init() {
         this._quadTreeList = [
-            new Node(Segment, this.planet, quadTree.NW, null, 0, 0, Extent.createFromArray([-20037508.34, -20037508.34, 20037508.34, 20037508.34])),
-            new Node(SegmentLonLat, this.planet, quadTree.NW, null, 0, 0, Extent.createFromArray([-180, mercator.MAX_LAT, 180, 90])),
-            new Node(SegmentLonLat, this.planet, quadTree.NW, null, 0, 0, Extent.createFromArray([-180, -90, 180, mercator.MIN_LAT]))
+            new Node(Segment, this.planet, 0, null, 0, Extent.createFromArray([-20037508.34, -20037508.34, 20037508.34, 20037508.34])),
+            new Node(SegmentLonLat, this.planet, 0, null, 0, Extent.createFromArray([-180, mercator.MAX_LAT, 180, 90])),
+            new Node(SegmentLonLat, this.planet, 0, null, 0, Extent.createFromArray([-180, -90, 180, mercator.MIN_LAT]))
         ];
     }
+    getTileXY(lonLat, zoom) {
+        let tileGroup = getTileGroupByLat(lonLat.lat, mercator.MAX_LAT), z = zoom, x = -1, y = -1, pz = (1 << z) /*Math.pow(2, z)*/;
+        if (tileGroup === TILEGROUP_NORTH) {
+            x = getTileCellIndex(lonLat.lon, 360 / pz, -180);
+            y = getTileCellIndex(lonLat.lat, (90 - mercator.MAX_LAT) / pz, 90);
+        }
+        else if (tileGroup === TILEGROUP_SOUTH) {
+            x = getTileCellIndex(lonLat.lon, 360 / pz, -180);
+            y = getTileCellIndex(lonLat.lat, (90 - mercator.MAX_LAT) / pz, mercator.MIN_LAT);
+        }
+        else {
+            let merc = mercator.forward(lonLat);
+            x = getTileCellIndex(merc.lon, mercator.POLE2 / pz, -mercator.POLE);
+            y = getTileCellIndex(merc.lat, mercator.POLE2 / pz, mercator.POLE);
+        }
+        return [x, y, z, tileGroup];
+    }
+    getLonLatTileOffset(lonLat, x, y, z, gridSize) {
+        let coords = lonLat;
+        let extent = new Extent();
+        if (lonLat.lat > mercator.MAX_LAT) {
+            let worldExtent = Extent.createFromArray([-180, mercator.MAX_LAT, 180, 90]);
+            extent = getTileCellExtent(x, y, z, worldExtent);
+        }
+        else if (lonLat.lat < mercator.MIN_LAT) {
+            let worldExtent = Extent.createFromArray([-180, -90, 180, mercator.MIN_LAT]);
+            extent = getTileCellExtent(x, y, z, worldExtent);
+        }
+        else {
+            coords = mercator.forward(lonLat);
+            extent = mercator.getTileExtent(x, y, z);
+        }
+        let sizeImgW = extent.getWidth() / (gridSize - 1), sizeImgH = extent.getHeight() / (gridSize - 1);
+        let i = gridSize - Math.ceil((coords.lat - extent.southWest.lat) / sizeImgH) - 1, j = Math.floor((coords.lon - extent.southWest.lon) / sizeImgW);
+        return [i, j];
+    }
 }

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

@@ -25,7 +25,7 @@ declare class EntityCollectionNode {
     zoom: number;
     bsphere: Sphere;
     _inTheQueue: boolean;
-    constructor(layer: Vector, partId: number, parent: EntityCollectionNode | null, id: number, extent: Extent, planet: Planet, zoom: number);
+    constructor(layer: Vector, 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;
@@ -43,7 +43,7 @@ declare class EntityCollectionNode {
 }
 declare class EntityCollectionNodeWGS84 extends EntityCollectionNode {
     isNorth: boolean;
-    constructor(layer: Vector, partId: number, parent: EntityCollectionNodeWGS84 | null, id: number, extent: Extent, planet: Planet, zoom: number);
+    constructor(layer: Vector, partId: number, parent: EntityCollectionNodeWGS84 | null, extent: Extent, planet: Planet, zoom: number);
     createChildrenNodes(): void;
     protected _setExtentBounds(): void;
     __setLonLat__(entity: Entity): LonLat;

package/lib/js/quadTree/EntityCollectionNode.js

@@ -9,12 +9,13 @@ import { Vec3 } from '../math/Vec3';
  * @todo: remove planet parameter. It's already available in the layer.
  */
 class EntityCollectionNode {
-    constructor(layer, partId, parent, id, extent, planet, zoom) {
+    constructor(layer, partId, parent, extent, planet, zoom) {
         this.layer = layer;
         this.parentNode = parent;
         this.childrenNodes = [];
         this.partId = partId;
-        this.nodeId = partId + id;
+        //this.nodeId = partId + id;
+        this.nodeId = partId + (parent ? parent.nodeId * 4 + 1 : 0);
         this.state = null;
         this.extent = extent;
         this.count = 0;
@@ -125,15 +126,14 @@ class EntityCollectionNode {
         const size_y = ext.getHeight() * 0.5;
         const ne = ext.northEast;
         const sw = ext.southWest;
-        const id = this.nodeId * 4 + 1;
         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 EntityCollectionNode(l, NW, this, id, 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, id, new Extent(c, new LonLat(ne.lon, ne.lat)), p, z);
-        nd[SW] = new EntityCollectionNode(l, SW, this, id, new Extent(new LonLat(sw.lon, sw.lat), c), p, z);
-        nd[SE] = new EntityCollectionNode(l, SE, this, id, new Extent(new LonLat(sw.lon + size_x, sw.lat), new LonLat(ne.lon, sw.lat + size_y)), p, z);
+        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);
     }
     collectRenderCollectionsPASS1(visibleNodes, outArr) {
         const n = visibleNodes[this.nodeId];
@@ -258,8 +258,8 @@ class EntityCollectionNode {
     }
 }
 class EntityCollectionNodeWGS84 extends EntityCollectionNode {
-    constructor(layer, partId, parent, id, extent, planet, zoom) {
-        super(layer, partId, parent, id, extent, planet, zoom);
+    constructor(layer, partId, parent, extent, planet, zoom) {
+        super(layer, partId, parent, extent, planet, zoom);
         this.isNorth = false;
     }
     createChildrenNodes() {
@@ -269,15 +269,14 @@ class EntityCollectionNodeWGS84 extends EntityCollectionNode {
         const size_y = ext.getHeight() * 0.5;
         const ne = ext.northEast;
         const sw = ext.southWest;
-        const id = this.nodeId * 4 + 1;
         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, id, 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, id, new Extent(c, new LonLat(ne.lon, ne.lat)), p, z);
-        nd[SW] = new EntityCollectionNodeWGS84(l, SW, this, id, new Extent(new LonLat(sw.lon, sw.lat), c), p, z);
-        nd[SE] = new EntityCollectionNodeWGS84(l, SE, this, id, new Extent(new LonLat(sw.lon + size_x, sw.lat), new LonLat(ne.lon, sw.lat + size_y)), p, z);
+        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) {

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

@@ -1,6 +1,11 @@
 import { Planet } from "../scene/Planet";
 import { QuadTreeStrategy } from "./QuadTreeStrategy";
+import { LonLat } from "../LonLat";
 export declare class MarsQuadTreeStrategy extends QuadTreeStrategy {
+    private _westExtent;
+    private _eastExtent;
     constructor(planet: Planet);
     init(): void;
+    getTileXY(lonLat: LonLat, zoom: number): [number, number, number, number];
+    getLonLatTileOffset(lonLat: LonLat, x: number, y: number, z: number, gridSize: number): [number, number];
 }

package/lib/js/quadTree/MarsQuadTreeStrategy.js

@@ -1,17 +1,43 @@
-import * as quadTree from "../quadTree/quadTree";
 import { Extent } from "../Extent";
 import { EPSG4326 } from "../proj/EPSG4326";
 import { Node } from "../quadTree/Node";
 import { SegmentLonLatWgs84 } from "../segment/SegmentLonLatWgs84";
 import { QuadTreeStrategy } from "./QuadTreeStrategy";
+import { getTileCellExtent, getTileCellIndex, TILEGROUP_COMMON } from "../segment/Segment";
 export class MarsQuadTreeStrategy extends QuadTreeStrategy {
     constructor(planet) {
         super(planet, "Mars", EPSG4326);
+        this._westExtent = Extent.createFromArray([-180, -90, 0, 90]);
+        this._eastExtent = Extent.createFromArray([0, -90, 180, 90]);
     }
     init() {
-        let earthQuadTreeSouth = new Node(SegmentLonLatWgs84, this.planet, quadTree.NW, null, 0, 0, Extent.createFromArray([-180, -90, 0, 90]));
-        let earthQuadTreeWest = new Node(SegmentLonLatWgs84, this.planet, quadTree.NW, null, 0, 0, Extent.createFromArray([0, -90, 180, 90]));
-        this._quadTreeList.push(earthQuadTreeSouth);
-        this._quadTreeList.push(earthQuadTreeWest);
+        this._quadTreeList = [
+            new Node(SegmentLonLatWgs84, this.planet, 0, null, 0, this._westExtent),
+            new Node(SegmentLonLatWgs84, this.planet, 0, null, 0, this._eastExtent)
+        ];
+    }
+    getTileXY(lonLat, zoom) {
+        let z = zoom, x = -1, y = -1, pz = (1 << z);
+        if (lonLat.lon > 0) {
+            x = getTileCellIndex(lonLat.lon, 180 / pz, 0) + pz;
+        }
+        else {
+            x = getTileCellIndex(lonLat.lon, 180 / pz, -180);
+        }
+        y = getTileCellIndex(lonLat.lat, 180 / pz, 90);
+        return [x, y, z, TILEGROUP_COMMON];
+    }
+    getLonLatTileOffset(lonLat, x, y, z, gridSize) {
+        let coords = lonLat;
+        let extent = new Extent();
+        if (lonLat.lon > 0) {
+            extent = getTileCellExtent(x - (1 << z), y, z, this._westExtent);
+        }
+        else {
+            extent = getTileCellExtent(x, y, z, this._eastExtent);
+        }
+        let sizeImgW = extent.getWidth() / (gridSize - 1), sizeImgH = extent.getHeight() / (gridSize - 1);
+        let i = gridSize - Math.ceil((coords.lat - extent.southWest.lat) / sizeImgH) - 1, j = Math.floor((coords.lon - extent.southWest.lon) / sizeImgW);
+        return [i, j];
     }
 }

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

@@ -14,6 +14,7 @@ import { PlanetCamera } from "../camera/PlanetCamera";
  * @param {Extent} extent - Planet segment extent.
  */
 declare class Node {
+    __id: number;
     SegmentPrototype: typeof Segment;
     planet: Planet;
     parentNode: Node | null;
@@ -31,7 +32,7 @@ declare class Node {
     _cameraInside: boolean;
     inFrustum: number;
     _fadingNodes: Node[];
-    constructor(SegmentPrototype: typeof Segment, planet: Planet, partId: number, parent: Node | null, id: number, tileZoom: number, extent: Extent);
+    constructor(SegmentPrototype: typeof Segment, planet: Planet, partId: number, parent: Node | null, tileZoom: number, extent: Extent);
     createChildrenNodes(): void;
     createBounds(): void;
     getState(): number | null;