@openglobus/og 0.17.2 → 0.18.0

package/src/{og/entity/Entity.js → entity/Entity.ts}

@@ -1,18 +1,38 @@
-"use strict";
-
-import { Extent } from "../Extent.js";
-import { LonLat } from "../LonLat.js";
-import { Vec3 } from "../math/Vec3.js";
-import * as mercator from "../mercator.js";
-import * as utils from "../utils/shared.js";
-import { Billboard } from "./Billboard.js";
-import { Geometry } from "./Geometry.js";
-import { GeoObject } from "./GeoObject.js";
-import { Label } from "./Label.js";
-import { PointCloud } from "./PointCloud.js";
-import { Polyline } from "./Polyline.js";
-import { Ray } from "./Ray.js";
-import { Strip } from "./Strip.js";
+import * as mercator from "../mercator";
+import * as utils from "../utils/shared";
+import {Billboard, IBillboardParams} from "./Billboard";
+import {EntityCollection, EntityCollectionEvents} from "./EntityCollection";
+import {Extent} from "../Extent";
+import {Geometry, IGeometryParams} from "./Geometry";
+import {GeoObject, IGeoObjectParams} from "./GeoObject";
+import {LonLat} from "../LonLat";
+import {Label, ILabelParams} from "./Label";
+import {NumberArray3, Vec3} from "../math/Vec3";
+import {NumberArray2} from "../math/Vec2";
+import {Planet} from "../scene/Planet";
+import {IPointCloudParams, PointCloud} from "./PointCloud";
+import {IPolylineParams, Polyline} from "./Polyline";
+import {IRayParams, Ray} from "./Ray";
+import {Strip, IStripParams} from "./Strip";
+import {Vector, VectorEventsType} from "../layer/Vector";
+import {EntityCollectionNode} from "../quadTree/EntityCollectionNode";
+
+export interface IEntityParams {
+    name?: string;
+    properties?: any;
+    cartesian?: Vec3 | NumberArray3;
+    lonlat?: LonLat | NumberArray3 | NumberArray2;
+    altitude?: number;
+    visibility?: boolean;
+    billboard?: Billboard | IBillboardParams;
+    label?: Label | ILabelParams;
+    polyline?: Polyline | IPolylineParams;
+    ray?: Ray | IRayParams;
+    pointCloud?: PointCloud | IPointCloudParams;
+    geometry?: Geometry | IGeometryParams;
+    geoObject?: GeoObject | IGeoObjectParams;
+    strip?: Strip;
+}
 
 /**
  * Entity instances aggregate multiple forms of visualization into a single high-level object.
@@ -20,128 +40,214 @@ import { Strip } from "./Strip.js";
  *
  * @class
  * @param {Object} [options] - Entity options:
- * @param {string} [options.name] - A human readable name to display to users. It does not have to be unique.
+ * @param {string} [options.name] - A human-readable name to display to users. It does not have to be unique.
  * @param {Vec3|Array.<number>} [options.cartesian] - Spatial entities like billboard, label etc. cartesian position.
  * @param {LonLat} [options.lonlat] - Geodetic coordinates for an entities like billboard, label etc.
  * @param {boolean} [options.aground] - True for entities that have to be placed on the relief.
  * @param {boolean} [options.visibility] - Entity visibility.
- * @param {*} [options.billboard] - Billboard options(see {@link og.Billboard}).
- * @param {*} [options.label] - Label options(see {@link og.Label}).
- * @param {*} [options.polyline] - Polyline options(see {@link og.Polyline}).
- * @param {*} [options.ray] - Ray options(see {@link og.Ray}).
- * @param {*} [options.pointCloud] - Point cloud options(see {@link og.PointCloud}).
- * @param {*} [options.geometry] - Geometry options (see {@link og.Geometry}), available for vector layer only.
+ * @param {*} [options.billboard] - Billboard options(see {@link Billboard}).
+ * @param {*} [options.label] - Label options(see {@link Label}).
+ * @param {*} [options.polyline] - Polyline options(see {@link Polyline}).
+ * @param {*} [options.ray] - Ray options(see {@link Ray}).
+ * @param {*} [options.pointCloud] - Point cloud options(see {@link PointCloud}).
+ * @param {*} [options.geometry] - Geometry options (see {@link Geometry}), available for vector layer only.
  * @param {*} [options.properties] - Entity custom properties.
  */
 class Entity {
-    constructor(options) {
-        options = options || {};
+
+    static __counter__: number = 0;
+
+    /**
+     * Uniq identifier.
+     * @public
+     * @readonly
+     */
+    protected __id: number;
+
+    /**
+     * Entity user defined properties.
+     * @public
+     * @type {Object}
+     */
+    public properties: any;
+
+
+    /**
+     * Children entities.
+     * @public
+     * @type {Array.<Entity>}
+     */
+    public childrenNodes: Entity[];
+
+    /**
+     * Parent entity.
+     * @public
+     * @type {Entity}
+     */
+    public parent: Entity | null;
+
+    /**
+     * Entity cartesian position.
+     * @protected
+     * @type {Vec3}
+     */
+    public _cartesian: Vec3;
+
+    /**
+     * Geodetic entity coordinates.
+     * @public
+     * @type {LonLat}
+     */
+    public _lonLat: LonLat;
+
+    /**
+     * World Mercator entity coordinates.
+     * @public
+     * @type {LonLat}
+     */
+    public _lonLatMerc: LonLat;
+
+    /**
+     * Entity visible terrain altitude.
+     * @public
+     * @type {number}
+     */
+    public _altitude: number;
+
+    /**
+     * Visibility flag.
+     * @protected
+     * @type {boolean}
+     */
+    protected _visibility: boolean;
+
+    /**
+     * Entity collection that this entity belongs to.
+     * @public
+     * @type {EntityCollection}
+     */
+    public _entityCollection: EntityCollection | null;
+
+    /**
+     * Entity collection array store index.
+     * @public
+     * @type {number}
+     */
+    public _entityCollectionIndex: number;
+
+    /**
+     * Assigned vector layer pointer.
+     * @public
+     * @type {Vector}
+     */
+    public _layer: Vector | null;
+
+    /**
+     * Assigned vector layer entity array index.
+     * @public
+     * @type {number}
+     */
+    public _layerIndex: number;
+
+    /**
+     * Picking color.
+     * @public
+     * @type {Vec3}
+     */
+    public _pickingColor: Vec3;
+
+    protected _featureConstructorArray: Record<string, [any, Function]>;
+
+    /**
+     * Billboard entity.
+     * @public
+     * @type {Billboard | null}
+     */
+    public billboard: Billboard | null;
+
+    /**
+     * Text label entity.
+     * @public
+     * @type {Label | null}
+     */
+    public label: Label | null;
+
+    /**
+     * Polyline entity.
+     * @public
+     * @type {Polyline | null}
+     */
+    public polyline: Polyline | null;
+
+    /**
+     * Ray entity.
+     * @public
+     * @type {Ray | null}
+     */
+    public ray: Ray | null;
+
+    /**
+     * PointCloud entity.
+     * @public
+     * @type {PointCloud | null}
+     */
+    public pointCloud: PointCloud | null;
+
+    /**
+     * Geometry entity(available for vector layer only).
+     * @public
+     * @type {Geometry | null}
+     */
+    public geometry: Geometry | null;
+
+    /**
+     * Geo object entity
+     * @public
+     * @type {Geometry | null}
+     */
+    public geoObject: GeoObject | null;
+
+    /**
+     * Strip entity.
+     * @public
+     * @type {Strip | null}
+     */
+    public strip: Strip | null;
+
+    public _nodePtr?: EntityCollectionNode;
+
+    constructor(options: IEntityParams = {}) {
 
         options.properties = options.properties || {};
 
-        /**
-         * Unic identifier.
-         * @public
-         * @readonly
-         */
-        this.id = Entity._staticCounter++;
-
-        /**
-         * Entity user defined properties.
-         * @public
-         * @type {Object}
-         */
+        this.__id = Entity.__counter__++;
+
         this.properties = options.properties || {};
 
-        /**
-         * Entity name.
-         * @public
-         * @type {string}
-         */
         this.properties.name = this.properties.name != undefined ? this.properties.name : "";
 
-        /**
-         * Children entities.
-         * @public
-         * @type {Array.<Entity>}
-         */
         this.childrenNodes = [];
 
-        /**
-         * Parent entity.
-         * @public
-         * @type {Entity}
-         */
         this.parent = null;
 
-        /**
-         * Entity cartesian position.
-         * @protected
-         * @type {Vec3}
-         */
         this._cartesian = utils.createVector3(options.cartesian);
 
-        /**
-         * Geodetic entity coordinates.
-         * @protected
-         * @type {LonLat}
-         */
         this._lonLat = utils.createLonLat(options.lonlat);
 
-        /**
-         * World Mercator entity coordinates.
-         * @protected
-         * @type {LonLat}
-         */
-        this._lonLatMerc = null;
-
-        /**
-         * Entity visible terrain altitude.
-         * @protected
-         * @type {number}
-         */
+        this._lonLatMerc = new LonLat();
+
         this._altitude = options.altitude || 0.0;
 
-        /**
-         * Visibility flag.
-         * @protected
-         * @type {boolean}
-         */
         this._visibility = options.visibility != undefined ? options.visibility : true;
 
-        /**
-         * Entity collection that this entity belongs to.
-         * @protected
-         * @type {EntityCollection}
-         */
         this._entityCollection = null;
 
-        /**
-         * Entity collection array store index.
-         * @protected
-         * @type {number}
-         */
         this._entityCollectionIndex = -1;
 
-        /**
-         * Assigned vector layer pointer.
-         * @protected
-         * @type {layer.Vector}
-         */
         this._layer = null;
 
-        /**
-         * Assigned vector layer entity array index.
-         * @protected
-         * @type {number}
-         */
         this._layerIndex = -1;
 
-        /**
-         * Picking color.
-         * @protected
-         * @type {Vec3}
-         */
         this._pickingColor = new Vec3(0, 0, 0);
 
         this._featureConstructorArray = {
@@ -155,102 +261,62 @@ class Entity {
             ray: [Ray, this.setRay]
         };
 
-        /**
-         * Billboard entity.
-         * @public
-         * @type {Billboard}
-         */
-        this.billboard = this._createOptionFeature("billboard", options.billboard);
-
-        /**
-         * Text label entity.
-         * @public
-         * @type {Label}
-         */
-        this.label = this._createOptionFeature("label", options.label);
-
-        /**
-         * Polyline entity.
-         * @public
-         * @type {Polyline}
-         */
-        this.polyline = this._createOptionFeature("polyline", options.polyline);
-
-        /**
-         * Ray entity.
-         * @public
-         * @type {ray}
-         */
-        this.ray = this._createOptionFeature("ray", options.ray);
-
-        /**
-         * PointCloud entity.
-         * @public
-         * @type {PointCloud}
-         */
-        this.pointCloud = this._createOptionFeature("pointCloud", options.pointCloud);
-
-        /**
-         * Geometry entity(available for vector layer only).
-         * @public
-         * @type {Geometry}
-         */
-        this.geometry = this._createOptionFeature("geometry", options.geometry);
-
-        /**
-         * Geo object entity
-         * @public
-         * @type {og.Geometry}
-         */
-        this.geoObject = this._createOptionFeature("geoObject", options.geoObject);
-
-        /**
-         * Strip entity.
-         * @public
-         * @type {Strip}
-         */
-        this.strip = this._createOptionFeature("strip", options.strip);
-    }
-
-    static get _staticCounter() {
-        if (!this._counter && this._counter !== 0) {
-            this._counter = 0;
-        }
-        return this._counter;
+        this.billboard = this._createOptionFeature<Billboard, IBillboardParams>("billboard", options.billboard);
+
+        this.label = this._createOptionFeature<Label, ILabelParams>("label", options.label);
+
+        this.polyline = this._createOptionFeature<Polyline, IPolylineParams>("polyline", options.polyline);
+
+        this.ray = this._createOptionFeature<Ray, IRayParams>("ray", options.ray);
+
+        this.pointCloud = this._createOptionFeature<PointCloud, IPolylineParams>("pointCloud", options.pointCloud);
+
+        this.geometry = this._createOptionFeature<Geometry, IGeometryParams>("geometry", options.geometry);
+
+        this.geoObject = this._createOptionFeature<GeoObject, IGeoObjectParams>("geoObject", options.geoObject);
+
+        this.strip = this._createOptionFeature<Strip, IStripParams>("strip", options.strip);
+    }
+
+    public get id(): number {
+        return this.__id;
     }
 
-    static set _staticCounter(n) {
-        this._counter = n;
+    public isEqual(entity: Entity): boolean {
+        return this.__id === entity.__id;
     }
 
-    get layerIndex() {
+    public get layerIndex(): number {
         return this._layerIndex;
     }
 
-    get instanceName() {
+    public get instanceName(): string {
         return "Entity";
     }
 
-    _createOptionFeature(featureName, options) {
+    protected _createOptionFeature<T, K>(
+        featureName: string,
+        options?: T | K
+    ): T | null {
         if (options) {
             let c = this._featureConstructorArray[featureName];
-            return c[1].call(this, new c[0](options));
+            return c[1].call(this, new c[0](options)) as T;
         }
         return null;
     }
 
-    getCollectionIndex() {
+    public getCollectionIndex(): number {
         return this._entityCollectionIndex;
     }
 
     /**
      * Adds current entity into the specified entity collection.
      * @public
-     * @param {EntityCollection|Vector} collection - Specified entity collection or vector layer.
+     * @param {EntityCollection | Vector} collection - Specified entity collection or vector layer.
      * @param {Boolean} [rightNow=false] - Entity insertion option for vector layer.
      * @returns {Entity} - This object.
      */
-    addTo(collection, rightNow = false) {
+    public addTo(collection: EntityCollection | Vector, rightNow: boolean = false) {
         collection.add(this, rightNow);
         return this;
     }
@@ -259,7 +325,7 @@ class Entity {
      * Removes current entity from collection and layer.
      * @public
      */
-    remove() {
+    public remove() {
         this._layer && this._layer.removeEntity(this);
         this._entityCollection && this._entityCollection.removeEntity(this);
     }
@@ -269,7 +335,7 @@ class Entity {
      * @public
      * @param {boolean} visibility - Entity visibility.
      */
-    setVisibility(visibility) {
+    public setVisibility(visibility: boolean) {
         this._visibility = visibility;
 
         // billboards
@@ -300,7 +366,7 @@ class Entity {
      * @public
      * @returns {boolean} -
      */
-    getVisibility() {
+    public getVisibility() {
         return this._visibility;
     }
 
@@ -309,7 +375,7 @@ class Entity {
      * @public
      * @param {Vec3} cartesian - Cartesian position in 3d space.
      */
-    setCartesian3v(cartesian) {
+    public setCartesian3v(cartesian: Vec3) {
         this.setCartesian(cartesian.x, cartesian.y, cartesian.z);
     }
 
@@ -320,7 +386,7 @@ class Entity {
      * @param {number} y - 3d space Y - position.
      * @param {number} z - 3d space Z - position.
      */
-    setCartesian(x, y, z) {
+    public setCartesian(x?: number, y?: number, z?: number) {
         let p = this._cartesian;
 
         p.x = x || 0.0;
@@ -342,13 +408,13 @@ class Entity {
 
         let ec = this._entityCollection;
 
-        if (ec && ec.renderNode && ec.renderNode.ellipsoid) {
-            this._lonLat = ec.renderNode.ellipsoid.cartesianToLonLat(p);
+        if (ec && ec.renderNode && (ec.renderNode as Planet).ellipsoid) {
+            this._lonLat = (ec.renderNode as Planet).ellipsoid.cartesianToLonLat(p);
 
             if (Math.abs(this._lonLat.lat) < mercator.MAX_LAT) {
                 this._lonLatMerc = this._lonLat.forwardMercator();
             } else {
-                this._lonLatMerc = null;
+                this._lonLatMerc.lon = this._lonLatMerc.lat = this._lonLatMerc.height = 0;
             }
         }
 
@@ -357,11 +423,11 @@ class Entity {
 
     /**
      * Sets entity cartesian position without event dispatching.
-     * @protected
+     * @public
      * @param {Vec3} cartesian - Cartesian position in 3d space.
      * @param {boolean} skipLonLat - skip geodetic calculation.
      */
-    _setCartesian3vSilent(cartesian, skipLonLat) {
+    public _setCartesian3vSilent(cartesian: Vec3, skipLonLat: boolean = false) {
         let p = this._cartesian;
 
         p.x = cartesian.x || 0.0;
@@ -383,13 +449,13 @@ class Entity {
 
         let ec = this._entityCollection;
 
-        if (!skipLonLat && ec && ec.renderNode && ec.renderNode.ellipsoid) {
-            this._lonLat = ec.renderNode.ellipsoid.cartesianToLonLat(p);
+        if (!skipLonLat && ec && ec.renderNode && (ec.renderNode as Planet).ellipsoid) {
+            this._lonLat = (ec.renderNode as Planet).ellipsoid.cartesianToLonLat(p);
 
             if (Math.abs(this._lonLat.lat) < mercator.MAX_LAT) {
                 this._lonLatMerc = this._lonLat.forwardMercator();
             } else {
-                this._lonLatMerc = null;
+                //this._lonLatMerc = null;
             }
         }
     }
@@ -399,7 +465,7 @@ class Entity {
      * @public
      * @returns {LonLat} -
      */
-    getLonLat() {
+    public getLonLat(): LonLat {
         return this._lonLat.clone();
     }
 
@@ -408,7 +474,7 @@ class Entity {
      * @public
      * @param {LonLat} lonlat - WGS84 coordinates.
      */
-    setLonLat(lonlat) {
+    public setLonLat(lonlat: LonLat) {
         let l = this._lonLat;
 
         l.lon = lonlat.lon;
@@ -416,14 +482,14 @@ class Entity {
         l.height = lonlat.height;
 
         let ec = this._entityCollection;
-        if (ec && ec.renderNode && ec.renderNode.ellipsoid) {
+        if (ec && ec.renderNode && (ec.renderNode as Planet).ellipsoid) {
             if (Math.abs(l.lat) < mercator.MAX_LAT) {
                 this._lonLatMerc = l.forwardMercator();
             } else {
-                this._lonLatMerc = null;
+                //this._lonLatMerc = null;
             }
 
-            ec.renderNode.ellipsoid.lonLatToCartesianRes(l, this._cartesian);
+            (ec.renderNode as Planet).ellipsoid.lonLatToCartesianRes(l, this._cartesian);
             this.setCartesian3v(this._cartesian);
         }
     }
@@ -435,7 +501,7 @@ class Entity {
      * @param {number} lat - Latitude
      * @param {number} [height] - Height
      */
-    setLonLat2(lon, lat, height) {
+    public setLonLat2(lon: number, lat: number, height?: number) {
         let l = this._lonLat;
 
         l.lon = lon;
@@ -443,14 +509,14 @@ class Entity {
         l.height = height != undefined ? height : l.height;
 
         let ec = this._entityCollection;
-        if (ec && ec.renderNode && ec.renderNode.ellipsoid) {
+        if (ec && ec.renderNode && (ec.renderNode as Planet).ellipsoid) {
             if (Math.abs(l.lat) < mercator.MAX_LAT) {
                 this._lonLatMerc = l.forwardMercator();
             } else {
-                this._lonLatMerc = null;
+                this._lonLatMerc.lon = this._lonLatMerc.lat = this._lonLatMerc.height = 0;
             }
 
-            ec.renderNode.ellipsoid.lonLatToCartesianRes(l, this._cartesian);
+            (ec.renderNode as Planet).ellipsoid.lonLatToCartesianRes(l, this._cartesian);
             this.setCartesian3v(this._cartesian);
         }
     }
@@ -460,7 +526,7 @@ class Entity {
      * @public
      * @param {number} altitude - Altitude.
      */
-    setAltitude(altitude) {
+    public setAltitude(altitude: number) {
         this._altitude = altitude;
     }
 
@@ -469,7 +535,7 @@ class Entity {
      * @public
      * @return {number} Altitude.
      */
-    getAltitude() {
+    public getAltitude(): number {
         return this._altitude;
     }
 
@@ -478,7 +544,7 @@ class Entity {
      * @public
      * @returns {Vec3} -
      */
-    getCartesian() {
+    public getCartesian(): Vec3 {
         return this._cartesian.clone();
     }
 
@@ -488,7 +554,7 @@ class Entity {
      * @param {Billboard} billboard - Billboard object.
      * @returns {Billboard} -
      */
-    setBillboard(billboard) {
+    public setBillboard(billboard: Billboard): Billboard {
         if (this.billboard) {
             this.billboard.remove();
         }
@@ -496,7 +562,7 @@ class Entity {
         this.billboard._entity = this;
         this.billboard.setPosition3v(this._cartesian);
         this.billboard.setVisibility(this._visibility);
-        this._entityCollection && this._entityCollection._billboardHandler.add(billboard);
+        this._entityCollection && this._entityCollection.billboardHandler.add(billboard);
         return billboard;
     }
 
@@ -506,7 +572,7 @@ class Entity {
      * @param {Label} label - Text label.
      * @returns {Label} -
      */
-    setLabel(label) {
+    public setLabel(label: Label): Label {
         if (this.label) {
             this.label.remove();
         }
@@ -514,7 +580,7 @@ class Entity {
         this.label._entity = this;
         this.label.setPosition3v(this._cartesian);
         this.label.setVisibility(this._visibility);
-        this._entityCollection && this._entityCollection._labelHandler.add(label);
+        this._entityCollection && this._entityCollection.labelHandler.add(label);
         return label;
     }
 
@@ -524,7 +590,7 @@ class Entity {
      * @param {Ray} ray - Ray object.
      * @returns {Ray} -
      */
-    setRay(ray) {
+    public setRay(ray: Ray): Ray {
         if (this.ray) {
             this.ray.remove();
         }
@@ -541,7 +607,7 @@ class Entity {
      * @param {Polyline} polyline - Polyline object.
      * @returns {Polyline} -
      */
-    setPolyline(polyline) {
+    public setPolyline(polyline: Polyline): Polyline {
         if (this.polyline) {
             this.polyline.remove();
         }
@@ -558,7 +624,7 @@ class Entity {
      * @param {PointCloud} pointCloud - PointCloud object.
      * @returns {PointCloud} -
      */
-    setPointCloud(pointCloud) {
+    public setPointCloud(pointCloud: PointCloud): PointCloud {
         if (this.pointCloud) {
             this.pointCloud.remove();
         }
@@ -575,7 +641,7 @@ class Entity {
      * @param {Geometry} geometry - Geometry object.
      * @returns {Geometry} -
      */
-    setGeometry(geometry) {
+    public setGeometry(geometry: Geometry): Geometry {
         if (this.geometry) {
             this.geometry.remove();
         }
@@ -592,7 +658,7 @@ class Entity {
      * @param {GeoObject} geoObject - GeoObject.
      * @returns {GeoObject} -
      */
-    setGeoObject(geoObject) {
+    public setGeoObject(geoObject: GeoObject): GeoObject {
         if (this.geoObject) {
             this.geoObject.remove();
         }
@@ -610,7 +676,7 @@ class Entity {
      * @param {Strip} strip - Strip object.
      * @returns {Strip} -
      */
-    setStrip(strip) {
+    public setStrip(strip: Strip): Strip {
         if (this.strip) {
             this.strip.remove();
         }
@@ -621,11 +687,11 @@ class Entity {
         return strip;
     }
 
-    get layer() {
+    public get layer(): Vector | null {
         return this._layer;
     }
 
-    get rendererEvents() {
+    public get rendererEvents(): VectorEventsType | EntityCollectionEvents | null {
         if (this._layer) {
             return this._layer.events;
         } else if (this._entityCollection) {
@@ -639,7 +705,7 @@ class Entity {
      * @public
      * @param {Entity} entity - Child entity.
      */
-    appendChild(entity) {
+    public appendChild(entity: Entity) {
         entity._entityCollection = this._entityCollection;
         entity._pickingColor = this._pickingColor;
         entity.parent = this;
@@ -651,25 +717,19 @@ class Entity {
      * Appends entity items(billboard, label etc.) picking color.
      * @public
      */
-    setPickingColor() {
+    public setPickingColor() {
         let c = this._pickingColor;
 
-        // billboard
         this.billboard && this.billboard.setPickingColor3v(c);
 
-        // label
         this.label && this.label.setPickingColor3v(c);
 
-        // polyline
         this.polyline && this.polyline.setPickingColor3v(c);
 
-        // ray
         this.ray && this.ray.setPickingColor3v(c);
 
-        // strip
         this.strip && this.strip.setPickingColor3v(c);
 
-        // geoObject
         this.geoObject && this.geoObject.setPickingColor3v(c);
 
         for (let i = 0; i < this.childrenNodes.length; i++) {
@@ -678,12 +738,15 @@ class Entity {
     }
 
     /**
-     * Return geodethic extent.
+     * Return geodetic extent.
+     * @public
      * @returns {Extent} -
      */
-    getExtent() {
+    public getExtent(): Extent {
+
         let res;
         let c = this._lonLat;
+
         if (this.billboard || this.label) {
             res = new Extent(new LonLat(c.lon, c.lat), new LonLat(c.lon, c.lat));
         } else {
@@ -719,10 +782,6 @@ class Entity {
 
         return res;
     }
-
-    isEqual(entity) {
-        return this.id === entity.id;
-    }
 }
 
-export { Entity };
+export {Entity};