change the type property

modules/heat/HeatLayer.js

@@ -42,6 +42,10 @@ class HeatLayer extends Layer {
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Layer.getLayerType('heat')
+  }
+
   /**
    *
    * @private

modules/layer/Layer.js

@@ -23,7 +23,6 @@ class Layer {
     this._layerEvent.on(LayerEventType.ADD, this._onAdd, this)
     this._layerEvent.on(LayerEventType.REMOVE, this._onRemove, this)
     this._state = undefined
-    this.type = undefined
   }
 
   get layerId() {

modules/layer/LayerGroup.js

@@ -17,7 +17,6 @@ class LayerGroup {
     this._layerGroupEvent = new LayerGroupEvent()
     this._layerGroupEvent.on(LayerGroupEventType.ADD, this._onAdd, this)
     this._layerGroupEvent.on(LayerGroupEventType.REMOVE, this._onRemove, this)
-    this.type = Layer.getLayerType('layer_group')
     this._state = State.INITIALIZED
   }
 
@@ -25,6 +24,10 @@ class LayerGroup {
     return this._id
   }
 
+  get type() {
+    return Layer.getLayerType('layer_group')
+  }
+
   set show(show) {
     this._show = show
     Object.keys(this._cache).forEach(key => {

modules/layer/type/ClusterLayer.js

@@ -35,10 +35,14 @@ class ClusterLayer extends Layer {
       this
     )
     this._delegate.clustering.pixelRange = this._options.pixelRange
-    this.type = Layer.getLayerType('cluster')
+
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Layer.getLayerType('cluster')
+  }
+
   set enableCluster(enableCluster) {
     this._delegate.clustering.enabled = enableCluster
     return this

modules/layer/type/CzmlLayer.js

@@ -11,10 +11,13 @@ class CzmlLayer extends Layer {
   constructor(id, url = '', options = {}) {
     super(id)
     this._delegate = Cesium.CzmlDataSource.load(url, options)
-    this.type = Layer.getLayerType('czml')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Layer.getLayerType('czml')
+  }
+
   set show(show) {
     this._show = show
     this._delegate &&

modules/layer/type/DynamicLayer.js

@@ -11,10 +11,13 @@ class DynamicLayer extends Layer {
   constructor(id) {
     super(id)
     this._delegate = new Cesium.CustomDataSource(id)
-    this.type = Layer.getLayerType('dynamic')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Layer.getLayerType('dynamic')
+  }
+
   /**
    * Clears all entities
    * @returns {DynamicLayer}

modules/layer/type/FeatureGridLayer.js

@@ -13,7 +13,7 @@ const DEF_OPTS = {
   count: 10,
   maximumLevel: 21,
   dataProperty: '',
-  callback: record => {
+  callback: () => {
     return null
   }
 }
@@ -35,7 +35,6 @@ class FeatureGridLayer extends Layer {
     this._rectangle = this._tilingScheme.rectangle
     this._credit = undefined
     this._token = undefined
-    this.type = Layer.getLayerType('feature_grid')
     for (let i = 0; i < this.maximumLevel; i++) {
       this._levelLayers[String(i)] = new VectorLayer(id + '-grid-' + i)
     }
@@ -47,6 +46,10 @@ class FeatureGridLayer extends Layer {
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Layer.getLayerType('feature_grid')
+  }
+
   get url() {
     return this._url
   }

modules/layer/type/GeoJsonLayer.js

@@ -16,10 +16,13 @@ class GeoJsonLayer extends Layer {
     }
     super(id)
     this._delegate = Cesium.GeoJsonDataSource.load(url, options)
-    this.type = Layer.getLayerType('geojson')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Layer.getLayerType('geojson')
+  }
+
   set show(show) {
     this._show = show
     this._delegate &&

modules/layer/type/HtmlLayer.js

@@ -15,10 +15,13 @@ class HtmlLayer extends Layer {
     this._delegate = DomUtil.create('div', 'html-layer', undefined)
     this._delegate.setAttribute('id', this._id)
     this._renderRemoveCallback = undefined
-    this.type = Layer.getLayerType('html')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Layer.getLayerType('html')
+  }
+
   set show(show) {
     this._show = show
     this._delegate.style.visibility = this._show ? 'visible' : 'hidden'

modules/layer/type/KmlLayer.js

@@ -14,10 +14,13 @@ class KmlLayer extends Layer {
     }
     super(id)
     this._delegate = Cesium.KmlDataSource.load(url, options)
-    this.type = Layer.getLayerType('kml')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Layer.getLayerType('kml')
+  }
+
   set show(show) {
     this._show = show
     this._delegate &&

modules/layer/type/LabelLayer.js

@@ -14,10 +14,13 @@ class LabelLayer extends Layer {
     this._dataSource = Cesium.GeoJsonDataSource.load(url)
     this._delegate = new Cesium.CustomDataSource(id)
     this._initLabel()
-    this.type = Layer.registerType('label')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Layer.getLayerType('label')
+  }
+
   _createLabel(entity) {
     if (entity.position && entity.name) {
       return Label.fromEntity(entity)

modules/layer/type/PrimitiveLayer.js

@@ -7,6 +7,9 @@ import { Cesium } from '@dc-modules/namespace'
 import State from '@dc-modules/state/State'
 import Layer from '../Layer'
 
+/**
+ * PrimitiveLayer is used to add primitve
+ */
 class PrimitiveLayer extends Layer {
   constructor(id) {
     super(id)
@@ -15,10 +18,13 @@ class PrimitiveLayer extends Layer {
     this._labels = this._delegate.add(new Cesium.LabelCollection())
     this._billboards = this._delegate.add(new Cesium.BillboardCollection())
     this._polylines = this._delegate.add(new Cesium.PolylineCollection())
-    this.type = Layer.getLayerType('primitive')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Layer.getLayerType('primitive')
+  }
+
   get points() {
     return this._points
   }

modules/layer/type/TilesetLayer.js

@@ -14,10 +14,13 @@ class TilesetLayer extends Layer {
   constructor(id) {
     super(id)
     this._delegate = new Cesium.PrimitiveCollection()
-    this.type = Layer.getLayerType('tileset')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Layer.getLayerType('tileset')
+  }
+
   /**
    * Clear all tileset
    * @returns {TilesetLayer}

modules/layer/type/TopoJsonLayer.js

@@ -5,6 +5,7 @@
 
 import State from '@dc-modules/state/State'
 import GeoJsonLayer from './GeoJsonLayer'
+import Layer from '../Layer'
 
 class TopoJsonLayer extends GeoJsonLayer {
   constructor(id, url, options = {}) {
@@ -12,9 +13,12 @@ class TopoJsonLayer extends GeoJsonLayer {
       throw new Error('TopoJsonLayer：the url invalid')
     }
     super(id, url, options)
-    this.type = GeoJsonLayer.getLayerType('topojson')
     this._state = State.INITIALIZED
   }
+
+  get type() {
+    return Layer.getLayerType('topojson')
+  }
 }
 
 GeoJsonLayer.registerType('topojson')

modules/layer/type/VectorLayer.js

@@ -15,10 +15,13 @@ class VectorLayer extends Layer {
   constructor(id) {
     super(id)
     this._delegate = new Cesium.CustomDataSource(id)
-    this.type = Layer.getLayerType('vector')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Layer.getLayerType('vector')
+  }
+
   /**
    * Clears all entities
    * @returns {VectorLayer}

modules/mapv/MapvLayer.js

@@ -6,6 +6,7 @@
 import { mapv } from '@dc-modules/namespace'
 import State from '@dc-modules/state/State'
 import { Layer } from '@dc-modules/layer'
+import Overlay from '../overlay/Overlay'
 
 class MapvLayer extends Layer {
   constructor(id, option = {}) {
@@ -16,7 +17,11 @@ class MapvLayer extends Layer {
     this._option = option
     this._dataSet = undefined
     this._delegate = undefined
-    this.type = Layer.getLayerType('mapv')
+    this._state = State.INITIALIZED
+  }
+
+  get type() {
+    return Overlay.getOverlayType('mapv')
   }
 
   set show(show) {

modules/overlay/Overlay.js

@@ -22,7 +22,6 @@ class Overlay {
     this._allowDrillPicking = false
     this._contextMenu = []
     this._overlayEvent = new OverlayEvent()
-    this.type = undefined
     this.on(OverlayEventType.ADD, this._onAdd, this)
     this.on(OverlayEventType.REMOVE, this._onRemove, this)
   }
@@ -132,16 +131,19 @@ class Overlay {
       this._layer.delegate.entities.add(this._delegate)
     } else if (this._layer?.delegate?.add && this._delegate) {
       // for Primitive
-      if (this.type === 'point_primitive' && this._layer.points) {
+      if (this.type && this.type === 'point_primitive' && this._layer.points) {
         this._delegate = this._layer.points.add(this._delegate)
       } else if (
-        this.type === 'billboard_primitive' &&
+        this.type.indexOf('billboard_primitive') >= 0 &&
         this._layer.billboards
       ) {
         this._delegate = this._layer.billboards.add(this._delegate)
       } else if (this.type === 'polyline_primitive' && this._layer.polylines) {
         this._delegate = this._layer.polylines.add(this._delegate)
-      } else if (this.type === 'label_primitive' && this._layer.labels) {
+      } else if (
+        this.type.indexOf('label_primitive') >= 0 &&
+        this._layer.labels
+      ) {
         this._delegate = this._layer.labels.add(this._delegate)
       } else {
         this._layer.delegate.add(this._delegate)
@@ -167,13 +169,16 @@ class Overlay {
       if (this.type === 'point_primitive' && this._layer.points) {
         this._layer.points.remove(this._delegate)
       } else if (
-        this.type === 'billboard_primitive' &&
+        this.type.indexOf('billboard_primitive') >= 0 &&
         this._layer.billboards
       ) {
         this._layer.billboards.remove(this._delegate)
       } else if (this.type === 'polyline_primitive' && this._layer.polylines) {
         this._layer.polylines.remove(this._delegate)
-      } else if (this.type === 'label_primitive' && this._layer.labels) {
+      } else if (
+        this.type.indexOf('label_primitive') >= 0 &&
+        this._layer.labels
+      ) {
         this._layer.labels.remove(this._delegate)
       } else {
         this._layer.delegate.remove(this._delegate)

modules/overlay/custom/CustomBillboard.js

@@ -21,6 +21,10 @@ class CustomBillboard extends Overlay {
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('custom_billboard')
+  }
+
   set position(position) {
     this._position = Parse.parsePosition(position)
     this._delegate.position = Transform.transformWGS84ToCartesian(
@@ -130,7 +134,7 @@ class CustomBillboard extends Overlay {
       ...style,
       semiMajorAxis: radius,
       semiMinorAxis: radius,
-      stRotation: new Cesium.CallbackProperty(time => {
+      stRotation: new Cesium.CallbackProperty(() => {
         stRotation += amount
         if (stRotation >= 360 || stRotation <= -360) {
           stRotation = 0

modules/overlay/custom/CustomLabel.js

@@ -16,10 +16,13 @@ class CustomLabel extends Overlay {
     this._delegate = new Cesium.Entity({ label: {} })
     this._position = Parse.parsePosition(position)
     this._text = text
-    this.type = Overlay.getOverlayType('custom_label')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('custom_label')
+  }
+
   set position(position) {
     this._position = Parse.parsePosition(position)
     this._delegate.position = Transform.transformWGS84ToCartesian(
@@ -101,7 +104,7 @@ class CustomLabel extends Overlay {
       ...style,
       semiMajorAxis: radius,
       semiMinorAxis: radius,
-      stRotation: new Cesium.CallbackProperty(time => {
+      stRotation: new Cesium.CallbackProperty(() => {
         stRotation += amount
         if (stRotation >= 360 || stRotation <= -360) {
           stRotation = 0

modules/overlay/dynamic/DynamicBillboard.js

@@ -17,10 +17,13 @@ class DynamicBillboard extends DynamicOverlay {
     this._posistion = Parse.parsePosition(position)
     this._icon = icon
     this._delegate = new Cesium.Entity({ billboard: {} })
-    this.type = Overlay.getOverlayType('dynamic_billboard')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('dynamic_billboard')
+  }
+
   set icon(icon) {
     this._icon = icon
     this._delegate.billboard.image = this._icon

modules/overlay/dynamic/DynamicModel.js

@@ -17,10 +17,13 @@ class DynamicModel extends DynamicOverlay {
     this._posistion = Parse.parsePosition(position)
     this._modelUrl = modelUrl
     this._delegate = new Cesium.Entity({ model: {} })
-    this.type = Overlay.getOverlayType('dynamic_model')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('dynamic_model')
+  }
+
   set modelUrl(modelUrl) {
     this._modelUrl = modelUrl
     this._delegate.model.uri = this._modelUrl

modules/overlay/html/DivIcon.js

@@ -24,10 +24,13 @@ class DivIcon extends Overlay {
       left: '0'
     })
     this.content = content
-    this.type = Overlay.getOverlayType('div_icon')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('div_icon')
+  }
+
   set show(show) {
     this._show = show
     this._delegate.style.visibility = this._show ? 'visible' : 'hidden'

modules/overlay/model/Model.js

@@ -17,10 +17,13 @@ class Model extends Overlay {
     this._position = Parse.parsePosition(position)
     this._modelUrl = modelUrl
     this._rotateAmount = 0
-    this.type = Overlay.getOverlayType('model')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('model')
+  }
+
   set position(position) {
     this._position = Parse.parsePosition(position)
     this._delegate.position = Transform.transformWGS84ToCartesian(
@@ -55,7 +58,7 @@ class Model extends Overlay {
 
   set rotateAmount(amount) {
     this._rotateAmount = +amount
-    this._delegate.orientation = new Cesium.CallbackProperty(time => {
+    this._delegate.orientation = new Cesium.CallbackProperty(() => {
       this._position.heading += this._rotateAmount
       if (this._position.heading >= 360 || this._position.heading <= -360) {
         this._position.heading = 0

modules/overlay/model/Tileset.js

@@ -18,10 +18,13 @@ class Tileset extends Overlay {
     this._tileVisibleCallback = undefined
     this._properties = undefined
     this._customShader = undefined
-    this.type = Overlay.getOverlayType('tileset')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('tileset')
+  }
+
   get readyPromise() {
     return this._delegate.readyPromise
   }

modules/overlay/plot/AttackArrow.js

@@ -22,10 +22,13 @@ class AttackArrow extends Overlay {
     this.neckHeightFactor = 0.85
     this.neckWidthFactor = 0.15
     this.headTailFactor = 0.8
-    this.type = Overlay.getOverlayType('attack_arrow')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('attack_arrow')
+  }
+
   set positions(positions) {
     this._positions = Parse.parsePositions(positions)
     this._delegate.polygon.hierarchy = this._getHierarchy()

modules/overlay/plot/DoubleArrow.js

@@ -21,10 +21,13 @@ class DoubleArrow extends Overlay {
     this.headWidthFactor = 0.3
     this.neckHeightFactor = 0.85
     this.neckWidthFactor = 0.15
-    this.type = Overlay.getOverlayType('double_arrow')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('double_arrow')
+  }
+
   set positions(positions) {
     this._positions = Parse.parsePositions(positions)
     this._delegate.polygon.hierarchy = this._getHierarchy()

modules/overlay/plot/FineArrow.js

@@ -22,10 +22,13 @@ class FineArrow extends Overlay {
     this.headWidthFactor = 0.25
     this.headAngle = Math.PI / 8.5
     this.neckAngle = Math.PI / 13
-    this.type = Overlay.getOverlayType('fine_arrow')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('fine_arrow')
+  }
+
   set positions(positions) {
     this._positions = Parse.parsePositions(positions)
     this._delegate.polygon.hierarchy = this._getHierarchy()

modules/overlay/plot/GatheringPlace.js

@@ -20,10 +20,13 @@ class GatheringPlace extends Overlay {
     this._positions = Parse.parsePositions(positions)
     this._delegate = new Cesium.Entity({ polygon: {} })
     this.t = 0.4
-    this.type = Overlay.getOverlayType('gathering_place')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('gathering_place')
+  }
+
   set positions(positions) {
     this._positions = Parse.parsePositions(positions)
     this._delegate.polygon.hierarchy = this._getHierarchy()

modules/overlay/plot/TailedAttackArrow.js

@@ -22,10 +22,13 @@ class TailedAttackArrow extends AttackArrow {
     this.tailWidthFactor = 0.1
     this.headTailFactor = 0.8
     this.swallowTailFactor = 1
-    this.type = Overlay.getOverlayType('tailed_attack_arrow')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('tailed_attack_arrow')
+  }
+
   set positions(positions) {
     this._positions = Parse.parsePositions(positions)
     this._delegate.polygon.hierarchy = this._getHierarchy()

modules/overlay/primitive/BillboardPrimitive.js

@@ -21,10 +21,13 @@ class BillboardPrimitive extends Overlay {
       width: 0,
       height: 0
     }
-    this.type = Overlay.getOverlayType('billboard_primitive')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('billboard_primitive')
+  }
+
   set position(position) {
     this._position = Parse.parsePosition(position)
     this._delegate.position = Transform.transformWGS84ToCartesian(

modules/overlay/primitive/BounceBillboardPrimitive.js

@@ -5,7 +5,6 @@
 
 import { Cesium } from '@dc-modules/namespace'
 import State from '@dc-modules/state/State'
-import { Util } from '@dc-modules/utils'
 import Overlay from '../Overlay'
 import BillboardPrimitive from './BillboardPrimitive'
 
@@ -19,39 +18,35 @@ class BounceBillboardPrimitive extends BillboardPrimitive {
     super(position, icon)
     this._currentOffset = new Cesium.Cartesian2(0, 0)
     this._isUp = true
-    this.type = Overlay.getOverlayType('bounce_billboard_primitive')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('bounce_billboard_primitive')
+  }
+
   /**
    *
-   * @param layer
    * @private
    */
-  _onAdd(layer) {
-    if (!layer) {
+  _addedHook() {
+    if (!this._delegate || !this._layer) {
       return
     }
-    this._layer = layer
-    this._mountedHook && this._mountedHook()
-    if (this._layer?.delegate?.add && this._delegate) {
-      this._delegate = this._layer.billboards.add(this._delegate)
-      this._layer.delegate.add(this)
-    }
-    this._addedHook && this._addedHook()
-    this._state = State.ADDED
+    this._delegate.layerId = this._layer?.layerId
+    this._delegate.overlayId = this._id
+    this._layer.delegate.add(this)
   }
 
-  _onRemove() {
-    if (!this._layer || !this._delegate) {
+  /**
+   *
+   * @private
+   */
+  _removedHook() {
+    if (!this._layer) {
       return
     }
-    if (this._layer?.delegate?.remove) {
-      this._layer.billboards.remove(this._delegate)
-      this._layer.delegate.remove(this)
-    }
-    this._removedHook && this._removedHook()
-    this._state = State.REMOVED
+    this._layer.delegate.remove(this)
   }
 
   /**

modules/overlay/primitive/BounceLabelPrimitive.js

@@ -5,7 +5,6 @@
 
 import { Cesium } from '@dc-modules/namespace'
 import State from '@dc-modules/state/State'
-import { Util } from '@dc-modules/utils'
 import Overlay from '../Overlay'
 import LabelPrimitive from './LabelPrimitive'
 
@@ -19,39 +18,35 @@ class BounceLabelPrimitive extends LabelPrimitive {
     super(position, text)
     this._currentOffset = new Cesium.Cartesian2(0, 0)
     this._isUp = true
-    this.type = Overlay.getOverlayType('bounce_label_primitive')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('bounce_label_primitive')
+  }
+
   /**
    *
-   * @param layer
    * @private
    */
-  _onAdd(layer) {
-    if (!layer) {
+  _addedHook() {
+    if (!this._delegate || !this._layer) {
       return
     }
-    this._layer = layer
-    this._mountedHook && this._mountedHook()
-    if (this._layer?.delegate?.add && this._delegate) {
-      this._delegate = this._layer.labels.add(this._delegate)
-      this._layer.delegate.add(this)
-    }
-    this._addedHook && this._addedHook()
-    this._state = State.ADDED
+    this._delegate.layerId = this._layer?.layerId
+    this._delegate.overlayId = this._id
+    this._layer.delegate.add(this)
   }
 
-  _onRemove() {
-    if (!this._layer || !this._delegate) {
+  /**
+   *
+   * @private
+   */
+  _removedHook() {
+    if (!this._layer) {
       return
     }
-    if (this._layer?.delegate?.remove) {
-      this._layer.labels.remove(this._delegate)
-      this._layer.delegate.remove(this)
-    }
-    this._removedHook && this._removedHook()
-    this._state = State.REMOVED
+    this._layer.delegate.remove(this)
   }
 
   /**

modules/overlay/primitive/DiffuseWallPrimitive.js

@@ -28,10 +28,13 @@ class DiffuseWallPrimitive extends Overlay {
     this._currentHeight = height || 0
     this._currentRadius = 10
     this._style = { ...DEF_STYLE }
-    this.type = Overlay.getOverlayType('diffuse_wall_primitive')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('diffuse_wall_primitive')
+  }
+
   set center(position) {
     this._center = Parse.parsePosition(position)
     return this

modules/overlay/primitive/ElecEllipsoidPrimitive.js

@@ -19,10 +19,13 @@ class ElecEllipsoidPrimitive extends Overlay {
         geometry: {}
       })
     })
-    this.type = Overlay.getOverlayType('elec_ellipsoid_primitive')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('elec_ellipsoid_primitive')
+  }
+
   set position(position) {
     this._position = Parse.parsePosition(position)
     this._delegate.geometryInstances.modelMatrix = Cesium.Transforms.eastNorthUpToFixedFrame(

modules/overlay/primitive/FlowLinePrimitive.js

@@ -19,10 +19,13 @@ class FlowLinePrimitive extends Overlay {
         geometry: {}
       })
     })
-    this.type = Overlay.getOverlayType('flow_line_primitive')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('flow_line_primitive')
+  }
+
   set positions(positions) {
     this._positions = Parse.parsePositions(positions)
     this._delegate.geometryInstances.geometry = new Cesium.PolylineGeometry({

modules/overlay/primitive/LabelPrimitive.js

@@ -18,10 +18,13 @@ class LabelPrimitive extends Overlay {
       position: undefined,
       text: undefined
     }
-    this.type = Overlay.getOverlayType('label_primitive')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('label_primitive')
+  }
+
   set position(position) {
     this._position = Parse.parsePosition(position)
     this._delegate.position = Transform.transformWGS84ToCartesian(

modules/overlay/primitive/ModelPrimitive.js

@@ -16,10 +16,13 @@ class ModelPrimitive extends Overlay {
     this._position = Parse.parsePosition(position)
     this._modelUrl = modelUrl
     this._delegate = Cesium.Model.fromGltf({ url: modelUrl })
-    this.type = Overlay.getOverlayType('model_primitive')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('model_primitive')
+  }
+
   get readyPromise() {
     return this._delegate.readyPromise
   }

modules/overlay/primitive/PointPrimitive.js

@@ -20,13 +20,17 @@ class PointPrimitive extends Overlay {
   constructor(position) {
     super()
     this._position = Parse.parsePosition(position)
-    this.type = Overlay.getOverlayType('point_primitive')
+
     this._delegate = {
       position: undefined
     }
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('point_primitive')
+  }
+
   set position(position) {
     this._position = Parse.parsePosition(position)
     this._delegate.position = Transform.transformWGS84ToCartesian(

modules/overlay/primitive/PolylinePrimitive.js

@@ -17,10 +17,13 @@ class PolylinePrimitive extends Overlay {
     this._delegate = {
       positions: []
     }
-    this.type = Overlay.getOverlayType('polyline_primitive')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('polyline_primitive')
+  }
+
   set positions(positions) {
     this._positions = Parse.parsePositions(positions)
     this._delegate.positions = Transform.transformWGS84ArrayToCartesianArray(

modules/overlay/primitive/ScanCirclePrimitive.js

@@ -19,10 +19,13 @@ class ScanCirclePrimitive extends Overlay {
         geometry: {}
       })
     })
-    this.type = Overlay.getOverlayType('scan_circle_primitive')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('scan_circle_primitive')
+  }
+
   set position(position) {
     this._position = Parse.parsePosition(position)
     this._delegate.geometryInstances.geometry = new Cesium.EllipseGeometry({

modules/overlay/primitive/TrailLinePrimitive.js

@@ -19,10 +19,13 @@ class TrailLinePrimitive extends Overlay {
         geometry: {}
       })
     })
-    this.type = Overlay.getOverlayType('trail_line_primitive')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('trail_line_primitive')
+  }
+
   set positions(positions) {
     this._positions = Parse.parsePositions(positions)
     this._delegate.geometryInstances.geometry = new Cesium.PolylineGeometry({

modules/overlay/primitive/VideoPrimitive.js

@@ -19,10 +19,13 @@ class VideoPrimitive extends Overlay {
       })
     })
     this._video = video
-    this.type = Overlay.getOverlayType('video_primitive')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('video_primitive')
+  }
+
   set positions(positions) {
     this._positions = Parse.parsePositions(positions)
     this._delegate.geometryInstances.geometry = Cesium.PolygonGeometry.fromPositions(

modules/overlay/primitive/WaterPrimitive.js

@@ -19,10 +19,13 @@ class WaterPrimitive extends Overlay {
       }),
       asynchronous: true
     })
-    this.type = Overlay.getOverlayType('water_primitive')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('water_primitive')
+  }
+
   set positions(positions) {
     this._positions = Parse.parsePositions(positions)
     this._delegate.geometryInstances.geometry = Cesium.PolygonGeometry.fromPositions(

modules/overlay/vector/Billboard.js

@@ -17,10 +17,13 @@ class Billboard extends Overlay {
     this._position = Parse.parsePosition(position)
     this._icon = icon
     this._size = [32, 32]
-    this.type = Overlay.getOverlayType('billboard')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('billboard')
+  }
+
   set position(position) {
     this._position = Parse.parsePosition(position)
     this._delegate.position = Transform.transformWGS84ToCartesian(

modules/overlay/vector/Box.js

@@ -26,10 +26,13 @@ class Box extends Overlay {
         }
       }
     })
-    this.type = Overlay.getOverlayType('box')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('box')
+  }
+
   /**
    *
    * @param position

modules/overlay/vector/Circle.js

@@ -18,10 +18,13 @@ class Circle extends Overlay {
     this._radius = +radius || 0
     this._rotateAmount = 0
     this._stRotation = 0
-    this.type = Overlay.getOverlayType('circle')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('circle')
+  }
+
   set center(center) {
     this._center = Parse.parsePosition(center)
     this._delegate.polygon.hierarchy = this._computeHierarchy()
@@ -44,7 +47,7 @@ class Circle extends Overlay {
 
   set rotateAmount(amount) {
     this._rotateAmount = +amount
-    this._delegate.polygon.stRotation = new Cesium.CallbackProperty(time => {
+    this._delegate.polygon.stRotation = new Cesium.CallbackProperty(() => {
       this._stRotation += this._rotateAmount
       if (this._stRotation >= 360 || this._stRotation <= -360) {
         this._stRotation = 0

modules/overlay/vector/Corridor.js

@@ -15,10 +15,13 @@ class Corridor extends Overlay {
     super()
     this._positions = Parse.parsePositions(positions)
     this._delegate = new Cesium.Entity({ corridor: {} })
-    this.type = Overlay.getOverlayType('corridor')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('corridor')
+  }
+
   set positions(positions) {
     this._positions = Parse.parsePositions(positions)
     this._delegate.corridor.positions = Transform.transformWGS84ArrayToCartesianArray(

modules/overlay/vector/Cylinder.js

@@ -18,10 +18,13 @@ class Cylinder extends Overlay {
     this._topRadius = +topRadius || 0
     this._bottomRadius = +bottomRadius || 0
     this._delegate = new Cesium.Entity({ cylinder: {} })
-    this.type = Overlay.getOverlayType('cylinder')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('cylinder')
+  }
+
   set position(position) {
     this._position = Parse.parsePosition(position)
     this._delegate.position = Transform.transformWGS84ToCartesian(

modules/overlay/vector/Ellipse.js

@@ -17,10 +17,13 @@ class Ellipse extends Overlay {
     this._semiMajorAxis = +semiMajorAxis || 0
     this._semiMinorAxis = +semiMinorAxis || 0
     this._delegate = new Cesium.Entity({ ellipse: {} })
-    this.type = Overlay.getOverlayType('ellipse')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('ellipse')
+  }
+
   set position(position) {
     this._position = Parse.parsePosition(position)
     this._delegate.position = Transform.transformWGS84ToCartesian(

modules/overlay/vector/Ellipsoid.js

@@ -16,10 +16,13 @@ class Ellipsoid extends Overlay {
     this._position = Parse.parsePosition(position)
     this._radius = radius || { x: 10, y: 10, z: 10 }
     this._delegate = new Cesium.Entity({ ellipsoid: {} })
-    this.type = Overlay.getOverlayType('ellipsoid')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('ellipsoid')
+  }
+
   set position(position) {
     this._position = Parse.parsePosition(position)
     this._delegate.position = Transform.transformWGS84ToCartesian(

modules/overlay/vector/Label.js

@@ -16,10 +16,13 @@ class Label extends Overlay {
     this._delegate = new Cesium.Entity({ label: {} })
     this._position = Parse.parsePosition(position)
     this._text = text
-    this.type = Overlay.getOverlayType('label')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('label')
+  }
+
   set position(position) {
     this._position = Parse.parsePosition(position)
     this._delegate.position = Transform.transformWGS84ToCartesian(

modules/overlay/vector/Plane.js

@@ -38,10 +38,13 @@ class Plane extends Overlay {
         plane: new Cesium.Plane(this._normal, this._distance)
       }
     })
-    this.type = Overlay.getOverlayType('plane')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('plane')
+  }
+
   set position(position) {
     this._position = Parse.parsePosition(position)
     this._delegate.position = Transform.transformWGS84ToCartesian(

modules/overlay/vector/Point.js

@@ -21,10 +21,13 @@ class Point extends Overlay {
     super()
     this._delegate = new Cesium.Entity({ point: {} })
     this._position = Parse.parsePosition(position)
-    this.type = Overlay.getOverlayType('point')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('point')
+  }
+
   set position(position) {
     this._position = Parse.parsePosition(position)
     this._delegate.position = Transform.transformWGS84ToCartesian(

modules/overlay/vector/Polygon.js

@@ -17,10 +17,13 @@ class Polygon extends Overlay {
     this._delegate = new Cesium.Entity({ polygon: {} })
     this._positions = Parse.parsePositions(positions)
     this._holes = []
-    this.type = Overlay.getOverlayType('polygon')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('polygon')
+  }
+
   set positions(positions) {
     this._positions = Parse.parsePositions(positions)
     this._delegate.polygon.hierarchy = this._computeHierarchy()

modules/overlay/vector/Polyline.js

@@ -16,10 +16,13 @@ class Polyline extends Overlay {
     super()
     this._positions = Parse.parsePositions(positions)
     this._delegate = new Cesium.Entity({ polyline: {} })
-    this.type = Overlay.getOverlayType('polyline')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('polyline')
+  }
+
   set positions(positions) {
     this._positions = Parse.parsePositions(positions)
     this._delegate.polyline.positions = Transform.transformWGS84ArrayToCartesianArray(

modules/overlay/vector/PolylineVolume.js

@@ -16,10 +16,13 @@ class PolylineVolume extends Overlay {
     this._positions = Parse.parsePositions(positions)
     this._shape = shape || []
     this._delegate = new Cesium.Entity({ polylineVolume: {} })
-    this.type = Overlay.getOverlayType('polyline_volume')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('polyline_volume')
+  }
+
   set positions(positions) {
     this._positions = Parse.parsePositions(positions)
     this._delegate.polylineVolume.positions = Transform.transformWGS84ArrayToCartesianArray(

modules/overlay/vector/Rectangle.js

@@ -15,10 +15,13 @@ class Rectangle extends Overlay {
     super()
     this._positions = Parse.parsePositions(positions)
     this._delegate = new Cesium.Entity({ rectangle: {} })
-    this.type = Overlay.getOverlayType('rectangle')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('rectangle')
+  }
+
   set positions(positions) {
     this._positions = Parse.parsePositions(positions)
     this._delegate.rectangle.coordinates = Cesium.Rectangle.fromCartesianArray(

modules/overlay/vector/Wall.js

@@ -15,10 +15,13 @@ class Wall extends Overlay {
     super()
     this._positions = Parse.parsePositions(positions)
     this._delegate = new Cesium.Entity({ wall: {} })
-    this.type = Overlay.getOverlayType('wall')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Overlay.getOverlayType('wall')
+  }
+
   set positions(positions) {
     this._positions = Parse.parsePositions(positions)
     this._delegate.wall.positions = Transform.transformWGS84ArrayToCartesianArray(

modules/weather/type/Cloud.js

@@ -16,11 +16,14 @@ class Cloud {
     this._delegate = undefined
     this._rotateAmount = 0
     this._enable = false
-    this.type = 'cloud'
     this._heading = 0
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return 'cloud'
+  }
+
   set enable(enable) {
     if (!this._viewer.scene.mode === Cesium.SceneMode.SCENE3D) {
       return this

modules/weather/type/Fog.js

@@ -17,10 +17,13 @@ class Fog {
     this._enable = false
     this._fogByDistance = { near: 10, nearValue: 0, far: 2000, farValue: 1.0 }
     this._color = new Cesium.Color(0, 0, 0, 1)
-    this.type = 'fog'
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return 'fog'
+  }
+
   set enable(enable) {
     this._enable = enable
     if (enable && this._viewer && !this._delegate) {

modules/weather/type/Rain.js

@@ -16,10 +16,13 @@ class Rain {
     this._delegate = undefined
     this._enable = false
     this._speed = 10.0
-    this.type = 'rain'
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return 'rain'
+  }
+
   set enable(enable) {
     this._enable = enable
     if (enable && this._viewer && !this._delegate) {

modules/weather/type/Snow.js

@@ -16,10 +16,13 @@ class Snow {
     this._delegate = undefined
     this._enable = false
     this._speed = 10.0
-    this.type = 'snow'
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return 'snow'
+  }
+
   set enable(enable) {
     this._enable = enable
     if (enable && this._viewer && !this._delegate) {

modules/widget/Widget.js

@@ -12,7 +12,6 @@ class Widget {
     this._enable = false
     this._wrapper = undefined
     this._ready = false
-    this.type = undefined
   }
 
   set enable(enable) {

modules/widget/type/Compass.js

@@ -27,10 +27,13 @@ class Compass extends Widget {
     this._rotateFrame = undefined
     this._mouseMoveHandle = undefined
     this._mouseUpHandle = undefined
-    this.type = Widget.getWidgetType('compass')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Widget.getWidgetType('compass')
+  }
+
   /**
    *
    * @private
@@ -115,7 +118,7 @@ class Compass extends Widget {
     }
   }
 
-  _handleDoubleClick(event) {
+  _handleDoubleClick() {
     let scene = this._viewer.scene
     let camera = scene.camera
     let sscc = scene.screenSpaceCameraController
@@ -272,7 +275,7 @@ class Compass extends Widget {
     this._updateAngleAndOpacity(vector, this._compassRectangle.width)
   }
 
-  _orbitTickFunction(e) {
+  _orbitTickFunction() {
     let scene = this._viewer.scene
     let camera = this._viewer.camera
     let timestamp = Cesium.getTimestamp()

modules/widget/type/ContextMenu.js

@@ -24,24 +24,27 @@ class ContextMenu extends Widget {
     this._defaultMenu = [
       {
         label: '飞到默认位置',
-        callback: e => {
+        callback: () => {
           this._viewer.camera.flyHome(1.5)
         },
         context: this
       },
       {
         label: '取消飞行',
-        callback: e => {
+        callback: () => {
           this._viewer.camera.cancelFlight()
         },
         context: this
       }
     ]
     this._overlayMenu = []
-    this.type = Widget.getWidgetType('contextmenu')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Widget.getWidgetType('contextmenu')
+  }
+
   set DEFAULT_MENU(menus) {
     this._defaultMenu = menus
     return this

modules/widget/type/DistanceLegend.js

@@ -30,10 +30,13 @@ class DistanceLegend extends Widget {
     this._labelEl = undefined
     this._scaleBarEl = undefined
     this._lastUpdate = Cesium.getTimestamp()
-    this.type = Widget.getWidgetType('distance_legend')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Widget.getWidgetType('distance_legend')
+  }
+
   /**
    *
    * @private

modules/widget/type/HawkeyeMap.js

@@ -32,10 +32,13 @@ class HawkeyeMap extends Widget {
     this._wrapper.setAttribute('id', Util.uuid())
     this._baseLayers = []
     this._map = undefined
-    this.type = Widget.getWidgetType('hawkeye_map')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Widget.getWidgetType('hawkeye_map')
+  }
+
   get baseLayers() {
     return this._baseLayers
   }

modules/widget/type/LoadingMask.js

@@ -11,10 +11,13 @@ class LoadingMask extends Widget {
   constructor() {
     super()
     this._wrapper = DomUtil.create('div', 'dc-loading-mask')
-    this.type = Widget.getWidgetType('loading_mask')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Widget.getWidgetType('loading_mask')
+  }
+
   /**
    *
    * @private

modules/widget/type/LocationBar.js

@@ -15,12 +15,15 @@ class LocationBar extends Widget {
     this._wrapper = DomUtil.create('div', 'dc-location-bar')
     this._mouseEl = undefined
     this._cameraEl = undefined
-    this.type = Widget.getWidgetType('location_bar')
     this._state = State.INITIALIZED
     this._lastMouseUpdate = Cesium.getTimestamp()
     this._lastCameraUpdate = Cesium.getTimestamp()
   }
 
+  get type() {
+    return Widget.getWidgetType('location_bar')
+  }
+
   /**
    *
    * @private

modules/widget/type/MapSplit.js

@@ -15,10 +15,13 @@ class MapSplit extends Widget {
     this._wrapper = DomUtil.create('div', 'dc-slider')
     this._baseLayer = undefined
     this._moveActive = false
-    this.type = Widget.getWidgetType('map_split')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Widget.getWidgetType('map_split')
+  }
+
   /**
    *
    * @private

modules/widget/type/MapSwitch.js

@@ -13,10 +13,13 @@ class MapSwitch extends Widget {
     this._wrapper = DomUtil.create('div', 'dc-map-switch')
     this._config = undefined
     this._cache = []
-    this.type = Widget.getWidgetType('map_switch')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Widget.getWidgetType('map_switch')
+  }
+
   /**
    * Override the superclass function
    * @private

modules/widget/type/Popup.js

@@ -14,10 +14,13 @@ class Popup extends Widget {
     this._wrapper = DomUtil.create('div', 'dc-popup')
     this._config = { customClass: '' }
     this._position = undefined
-    this.type = Widget.getWidgetType('popup')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Widget.getWidgetType('popup')
+  }
+
   set config(config) {
     this._config = config
     config.customClass && this._setCustomClass()

modules/widget/type/Tooltip.js

@@ -13,10 +13,13 @@ class Tooltip extends Widget {
     super()
     this._wrapper = DomUtil.create('div', 'dc-tool-tip')
     this._ready = true
-    this.type = Widget.getWidgetType('tooltip')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Widget.getWidgetType('tooltip')
+  }
+
   /**
    *
    * @private

modules/widget/type/ZoomController.js

@@ -16,10 +16,13 @@ class ZoomController extends Widget {
     this._zoomInEl = undefined
     this._zoomOutEl = undefined
     this._refreshEl = undefined
-    this.type = Widget.getWidgetType('zoom_controller')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Widget.getWidgetType('zoom_controller')
+  }
+
   /**
    *
    * @param scene
@@ -170,13 +173,13 @@ class ZoomController extends Widget {
     this._wrapper.appendChild(this._refreshEl)
     this._wrapper.appendChild(this._zoomOutEl)
     let self = this
-    this._zoomInEl.onclick = e => {
+    this._zoomInEl.onclick = () => {
       self._zoomIn()
     }
-    this._refreshEl.onclick = e => {
+    this._refreshEl.onclick = () => {
       self._refresh()
     }
-    this._zoomOutEl.onclick = e => {
+    this._zoomOutEl.onclick = () => {
       self._zoomOut()
     }
     this._ready = true

modules/wind/WindLayer.js

@@ -30,10 +30,13 @@ class WindLayer extends Layer {
     }
     this._data = undefined
     this._canvas = document.createElement('canvas')
-    this.type = Layer.getLayerType('wind')
     this._state = State.INITIALIZED
   }
 
+  get type() {
+    return Layer.getLayerType('wind')
+  }
+
   set show(show) {
     this._show = show
     this._canvas.style.visibility = show ? 'visible' : 'hidden'