@openglobus/og 0.19.4 → 0.20.0

package/lib/js/entity/Geometry.js

@@ -2,6 +2,14 @@ import * as utils from "../utils/shared";
 import { Extent } from "../Extent";
 import { LonLat } from "../LonLat";
 import { Vec4 } from "../math/Vec4";
+export var GeometryTypeEnum;
+(function (GeometryTypeEnum) {
+    GeometryTypeEnum[GeometryTypeEnum["POINT"] = 1] = "POINT";
+    GeometryTypeEnum[GeometryTypeEnum["LINESTRING"] = 2] = "LINESTRING";
+    GeometryTypeEnum[GeometryTypeEnum["POLYGON"] = 3] = "POLYGON";
+    GeometryTypeEnum[GeometryTypeEnum["MULTIPOLYGON"] = 4] = "MULTIPOLYGON";
+    GeometryTypeEnum[GeometryTypeEnum["MULTILINESTRING"] = 5] = "MULTILINESTRING";
+})(GeometryTypeEnum || (GeometryTypeEnum = {}));
 const GeometryType = {
     POINT: 1,
     LINESTRING: 2,
@@ -33,10 +41,10 @@ class Geometry {
         this._lineIndexesHandlerIndex = -1;
         this._lineThicknessHandlerIndex = -1;
         this._lineColorsHandlerIndex = -1;
-        this._type = (options.type && Geometry.getType(options.type)) || GeometryType.POINT;
-        this._coordinates = [];
+        this._type = (options.type && Geometry.getType(options.type)) || GeometryTypeEnum.POINT;
+        this._coordinates = options.coordinates || [];
         this._extent = Geometry.getExtent({
-            type: options.type || "Point",
+            type: options.type || "POINT",
             coordinates: options.coordinates || []
         }, this._coordinates);
         options.style = options.style || {};
@@ -70,7 +78,7 @@ class Geometry {
     static getExtent(geometryObj, outCoordinates) {
         let res = new Extent(new LonLat(180.0, 90.0), new LonLat(-180.0, -90.0));
         let t = Geometry.getType(geometryObj.type);
-        if (t === GeometryType.POINT) {
+        if (t === GeometryTypeEnum.POINT) {
             let lon = geometryObj.coordinates[0], lat = geometryObj.coordinates[1];
             res.southWest.lon = lon;
             res.southWest.lat = lat;
@@ -78,7 +86,7 @@ class Geometry {
             res.northEast.lat = lat;
             outCoordinates && (outCoordinates[0] = lon) && (outCoordinates[1] = lat);
         }
-        else if (t === GeometryType.LINESTRING) {
+        else if (t === GeometryTypeEnum.LINESTRING) {
             let c = geometryObj.coordinates;
             for (let i = 0; i < c.length; i++) {
                 let lon = c[i][0], lat = c[i][1];
@@ -93,7 +101,7 @@ class Geometry {
                 outCoordinates && (outCoordinates[i] = [lon, lat]);
             }
         }
-        else if (t === GeometryType.POLYGON) {
+        else if (t === GeometryTypeEnum.POLYGON) {
             let c = geometryObj.coordinates;
             for (let i = 0; i < c.length; i++) {
                 let ci = c[i];
@@ -113,7 +121,7 @@ class Geometry {
                 }
             }
         }
-        else if (t === GeometryType.MULTIPOLYGON) {
+        else if (t === GeometryTypeEnum.MULTIPOLYGON) {
             let p = geometryObj.coordinates;
             for (let i = 0; i < p.length; i++) {
                 let pi = p[i];
@@ -137,7 +145,7 @@ class Geometry {
                 }
             }
         }
-        else if (t === GeometryType.MULTILINESTRING) {
+        else if (t === GeometryTypeEnum.MULTILINESTRING) {
             let c = geometryObj.coordinates;
             for (let i = 0; i < c.length; i++) {
                 let ci = c[i];
@@ -280,4 +288,4 @@ class Geometry {
     }
 }
 Geometry.__counter__ = 0;
-export { Geometry, GeometryType };
+export { Geometry };

package/lib/js/entity/GeometryHandler.js

@@ -2,7 +2,7 @@ import * as mercator from "../mercator";
 import * as quadTree from "../quadTree/quadTree";
 import { doubleToTwoFloatsV2 } from "../math/coder";
 import { Vec2 } from "../math/Vec2";
-import { GeometryType } from "./Geometry";
+import { GeometryTypeEnum } from "./Geometry";
 import { earcut, flatten } from "../utils/earcut";
 const POLYVERTICES_BUFFER = 0;
 const POLYINDEXES_BUFFER = 1;
@@ -203,7 +203,7 @@ class GeometryHandler {
             geometry._lineVerticesHighMerc = [];
             geometry._lineVerticesLowMerc = [];
             if (geometry._coordinates[0].length) {
-                if (geometry.type === GeometryType.POLYGON) {
+                if (geometry.type === GeometryTypeEnum.POLYGON) {
                     let coordinates = geometry._coordinates;
                     let ci = [];
                     for (let j = 0; j < coordinates.length; j++) {
@@ -249,7 +249,7 @@ class GeometryHandler {
                     geometry._lineColorsLength = this._lineColors.length - geometry._lineColorsHandlerIndex;
                     geometry._lineThicknessLength = this._lineThickness.length - geometry._lineThicknessHandlerIndex;
                 }
-                else if (geometry.type === GeometryType.MULTIPOLYGON) {
+                else if (geometry.type === GeometryTypeEnum.MULTIPOLYGON) {
                     let coordinates = geometry._coordinates;
                     let vertices = [], indexes = [];
                     // Creates polygon stroke data
@@ -303,7 +303,7 @@ class GeometryHandler {
                     geometry._lineColorsLength = this._lineColors.length - geometry._lineColorsHandlerIndex;
                     geometry._lineThicknessLength = this._lineThickness.length - geometry._lineThicknessHandlerIndex;
                 }
-                else if (geometry.type === GeometryType.LINESTRING) {
+                else if (geometry.type === GeometryTypeEnum.LINESTRING) {
                     let coordinates = geometry._coordinates;
                     let ci = new Array(coordinates.length);
                     for (let j = 0; j < coordinates.length; j++) {
@@ -322,7 +322,7 @@ class GeometryHandler {
                     geometry._lineColorsLength = this._lineColors.length - geometry._lineColorsHandlerIndex;
                     geometry._lineThicknessLength = this._lineThickness.length - geometry._lineThicknessHandlerIndex;
                 }
-                else if (geometry.type === GeometryType.MULTILINESTRING) {
+                else if (geometry.type === GeometryTypeEnum.MULTILINESTRING) {
                     let coordinates = geometry._coordinates;
                     let ci = [];
                     for (let j = 0; j < coordinates.length; j++) {

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

@@ -6,6 +6,7 @@ export interface ILabelParams extends IBaseBillboardParams {
     text?: string;
     face?: string;
     size?: number;
+    opacity?: number;
     outline?: number;
     outlineColor?: string | NumberArray4 | Vec4;
     align?: string;
@@ -91,6 +92,12 @@ declare class Label extends BaseBillboard {
      * It can't be bigger than maximum labelHandler _maxLetters value.
      */
     setText(text: string): void;
+    /**
+     * Change text direction.
+     * @public
+     * @param {boolean} isRTL - Text string.
+     */
+    setRtl(isRTL: boolean): void;
     /**
      * Gets current text string.
      * @public

package/lib/js/entity/Label.js

@@ -63,6 +63,17 @@ class Label extends BaseBillboard {
             this._handler.setText(this._handlerIndex, text, this._fontIndex, this._align, this._isRTL);
         }
     }
+    /**
+     * Change text direction.
+     * @public
+     * @param {boolean} isRTL - Text string.
+     */
+    setRtl(isRTL) {
+        this._isRTL = isRTL;
+        if (this._isReady && this._handler) {
+            this._handler.setText(this._handlerIndex, this._text, this._fontIndex, this._align, this._isRTL);
+        }
+    }
     /**
      * Gets current text string.
      * @public

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

@@ -9,12 +9,13 @@ import { RenderNode } from "../scene/RenderNode";
 import { WebGLBufferExt } from "../webgl/Handler";
 import { TypedArray } from "../utils/shared";
 import { Ellipsoid } from "../ellipsoid/Ellipsoid";
-type Geodetic = LonLat | NumberArray2 | NumberArray3;
-type Cartesian = Vec3 | NumberArray3;
-type SegmentPath3vExt = Cartesian[];
-type SegmentPathLonLatExt = Geodetic[];
-type SegmentPathColor = NumberArray4[];
-type SegmentPathLonLat = LonLat[];
+export type Geodetic = LonLat | NumberArray2 | NumberArray3;
+export type Cartesian = Vec3 | NumberArray3;
+export type SegmentPath3vExt = Cartesian[];
+export type SegmentPathLonLatExt = Geodetic[];
+export type SegmentPathColor = NumberArray4[];
+export type SegmentPath3v = Vec3[];
+export type SegmentPathLonLat = LonLat[];
 export interface IPolylineParams {
     altitude?: number;
     thickness?: number;
@@ -138,6 +139,7 @@ declare class Polyline {
      * @static
      */
     static appendPoint3v(path3v: SegmentPath3vExt[], point3v: Vec3, pathColors: SegmentPathColor[], color: NumberArray4, isClosed: boolean, outVerticesHigh: number[], outVerticesLow: number[], outColors: number[], outOrders: number[], outIndexes: number[], ellipsoid: Ellipsoid | null, outTransformedPathLonLat: SegmentPathLonLatExt[], outTransformedPathMerc: LonLat[][], outExtent: Extent): void;
+    static setPathColors(pathLonLat: SegmentPathLonLatExt[], pathColors: SegmentPathColor[], defaultColor: NumberArray4, outColors: number[]): void;
     /**
      * Appends to the line array new geodetic coordinates line data.
      * @static
@@ -224,6 +226,12 @@ declare class Polyline {
      * @param {number} opacity - Opacity.
      */
     setOpacity(opacity: number): void;
+    /**
+     * Sets Polyline thickness in screen pixels.
+     * @public
+     * @param {number} thickness - Thickness.
+     */
+    setAltitude(altitude: number): void;
     /**
      * Sets Polyline thickness in screen pixels.
      * @public
@@ -284,7 +292,7 @@ declare class Polyline {
      * @todo
      * @param {NumberArray4[][]} pathColors
      */
-    setPathColors(pathColors: NumberArray4[][]): void;
+    setPathColors(pathColors: SegmentPathColor[]): void;
     /**
      * Sets polyline color
      * @param {string} htmlColor- HTML color

package/lib/js/entity/Polyline.js

@@ -376,6 +376,44 @@ class Polyline {
         outColors.push(r, g, b, a, r, g, b, a, r, g, b, a, r, g, b, a);
         outOrders.push(1, -1, 2, -2);
     }
+    static setPathColors(pathLonLat, pathColors, defaultColor, outColors) {
+        for (let j = 0, len = pathLonLat.length; j < len; j++) {
+            var path = pathLonLat[j], pathColors_j = pathColors[j];
+            if (path.length === 0) {
+                continue;
+            }
+            let color = defaultColor;
+            if (pathColors_j && pathColors_j[0]) {
+                color = pathColors_j[0];
+            }
+            let r = color[R], g = color[G], b = color[B], a = color[A] != undefined ? color[A] : 1.0;
+            if (j > 0) {
+                outColors.push(r, g, b, a, r, g, b, a, r, g, b, a, r, g, b, a);
+            }
+            for (let i = 0, len = path.length; i < len; i++) {
+                var cur = path[i];
+                if (cur instanceof Array) {
+                    cur = new LonLat(cur[0], cur[1], cur[2]);
+                }
+                if (pathColors_j && pathColors_j[i]) {
+                    color = pathColors_j[i];
+                }
+                r = color[R];
+                g = color[G];
+                b = color[B];
+                a = color[A] != undefined ? color[A] : 1.0;
+                outColors.push(r, g, b, a, r, g, b, a, r, g, b, a, r, g, b, a);
+            }
+            if (pathColors_j && pathColors_j[path.length - 1]) {
+                color = pathColors_j[path.length - 1];
+            }
+            r = color[R];
+            g = color[G];
+            b = color[B];
+            a = color[A] != undefined ? color[A] : 1.0;
+            outColors.push(r, g, b, a, r, g, b, a, r, g, b, a, r, g, b, a);
+        }
+    }
     /**
      * Appends to the line array new geodetic coordinates line data.
      * @static
@@ -389,10 +427,10 @@ class Polyline {
         }
         if (outIndexes.length > 0) {
             index = outIndexes[outIndexes.length - 5] + 9;
-            outIndexes.push(index, index);
+            outIndexes.push(index);
         }
         else {
-            outIndexes.push(0, 0);
+            outIndexes.push(0);
         }
         for (let j = 0, len = pathLonLat.length; j < len; j++) {
             var path = pathLonLat[j], pathColors_j = pathColors[j];
@@ -1150,6 +1188,14 @@ class Polyline {
     setOpacity(opacity) {
         this._opacity = opacity;
     }
+    /**
+     * Sets Polyline thickness in screen pixels.
+     * @public
+     * @param {number} thickness - Thickness.
+     */
+    setAltitude(altitude) {
+        this.altitude = altitude;
+    }
     /**
      * Sets Polyline thickness in screen pixels.
      * @public
@@ -1296,10 +1342,12 @@ class Polyline {
      * @param {NumberArray4[][]} pathColors
      */
     setPathColors(pathColors) {
-        if (this._renderNode) {
-            //
-            // ...
-            //
+        if (pathColors) {
+            this._colors = [];
+            this._pathColors = [].concat(pathColors);
+            Polyline.setPathColors(this._pathLonLat, pathColors, this._defaultColor, this._colors);
+            // Mark the colors buffer as changed
+            this._changedBuffers[COLORS_BUFFER] = true;
         }
     }
     /**

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

@@ -80,6 +80,18 @@ declare class Strip {
      * @public
      */
     clear(): void;
+    /**
+     * Sets RGBA color. Each channel from 0.0 to 1.0.
+     * @public
+     * @param {Vec4} color - RGBA vector.
+     */
+    setColor4v(color: Vec4): void;
+    /**
+     * Sets strip color.
+     * @public
+     * @param {string} color - HTML style color.
+     */
+    setColorHTML(color: string): void;
     setColor(r: number, g: number, b: number, a?: number): void;
     /**
      * Set strip opacity.

package/lib/js/entity/Strip.js

@@ -88,6 +88,22 @@ class Strip {
         this._indexes = [];
         this._deleteBuffers();
     }
+    /**
+     * Sets RGBA color. Each channel from 0.0 to 1.0.
+     * @public
+     * @param {Vec4} color - RGBA vector.
+     */
+    setColor4v(color) {
+        this.setColor(color.x, color.y, color.z, color.w);
+    }
+    /**
+     * Sets strip color.
+     * @public
+     * @param {string} color - HTML style color.
+     */
+    setColorHTML(color) {
+        this.setColor4v(utils.htmlColorToRgba(color));
+    }
     setColor(r, g, b, a) {
         a = a || this.color[3];
         this.color[0] = r;

package/lib/js/entity/StripHandler.js

@@ -37,7 +37,7 @@ class StripHandler {
                             mat4 viewMatrixRTE = viewMatrix;
                             viewMatrixRTE[3] = vec4(0.0, 0.0, 0.0, 1.0);
 
-                            gl_Position = projectionMatrix * viewMatrixRTE * vec4(highDiff + lowDiff, 1.0);
+                            gl_Position = projectionMatrix * viewMatrixRTE * vec4(highDiff * step(1.0, length(highDiff)) + lowDiff, 1.0);
                         }`,
                     fragmentShader: `precision highp float;
                         uniform vec4 uColor;

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';