@openglobus/openglobus-react 0.4.6 → 0.4.7

package/dist/index.js

@@ -4302,7 +4302,7 @@ const eo = class to {
     return e.add(this), this;
   }
   remove() {
-    this._layer && this._layer.removeEntity(this), this._entityCollection && this._entityCollection.removeEntity(this);
+    return this._layer && this._layer.removeEntity(this), this._entityCollection && this._entityCollection.removeEntity(this), this;
   }
   setVisibility(e) {
     this._visibility = e, this.billboard && this.billboard.setVisibility(e), this.geoObject && this.geoObject.setVisibility(e), this.label && this.label.setVisibility(e), this.polyline && this.polyline.setVisibility(e), this.ray && this.ray.setVisibility(e), this.geometry && this.geometry.setVisibility(e);
@@ -5361,7 +5361,15 @@ precision highp float;uniform float frustumPickingColor;layout(location=0)out ve
     let t = e._tagData, i = e.tag;
     t.numInstances--;
     let r = !1;
-    t.numInstances === 0 && (t.clear(), this._instanceDataMap.delete(i), this._instanceDataMapValues = [], this._clearDataTagQueue(), r = !0), this._geoObjects.splice(e._handlerIndex, 1);
+    if (t.numInstances === 0) {
+      t.clear(), this._instanceDataMap.delete(i);
+      for (let n = 0; this._instanceDataMapValues.length; n++) if (this._instanceDataMapValues[n].numInstances === 0) {
+        this._instanceDataMapValues.splice(n, 1);
+        break;
+      }
+      this._clearDataTagQueue(), r = !0;
+    }
+    this._geoObjects.splice(e._handlerIndex, 1);
     for (let n = e._handlerIndex, a = this._geoObjects.length; n < a; n++) {
       let l = this._geoObjects[n];
       l._handlerIndex = l._handlerIndex - 1;
@@ -5933,7 +5941,7 @@ const Ro = class Mo {
   _addRecursively(e) {
     let t = this.renderNode;
     t && t.ellipsoid && e._cartesian.isZero() && !e.relativePosition && e.setCartesian3v(t.ellipsoid.lonLatToCartesian(e._lonLat)), this._setPickingColor(e), e._updateAbsolutePosition(), e.setScale3v(e.getScale()), e.billboard && this.billboardHandler.add(e.billboard), e.label && this.labelHandler.add(e.label), e.polyline && this.polylineHandler.add(e.polyline), e.ray && this.rayHandler.add(e.ray), e.pointCloud && this.pointCloudHandler.add(e.pointCloud), e.strip && this.stripHandler.add(e.strip), e.geoObject && this.geoObjectHandler.add(e.geoObject), this.events.dispatch(this.events.entityadd, e);
-    for (let i = 0; i < e.childEntities.length; i++) e.childEntities[i]._entityCollection = this, e.childEntities[i]._entityCollectionIndex = e._entityCollectionIndex, this._addRecursively(e.childEntities[i]);
+    for (let i = 0; i < e.childEntities.length; i++) e.childEntities[i]._entityCollection = this, this._addRecursively(e.childEntities[i]);
   }
   add(e) {
     return e._entityCollection || (e._entityCollection = this, e._entityCollectionIndex = this._entities.length, this._entities.push(e), this._addRecursively(e)), this;
@@ -5949,11 +5957,22 @@ const Ro = class Mo {
     e._entityCollection = null, e._entityCollectionIndex = -1, e.billboard && this.billboardHandler.remove(e.billboard), e.label && this.labelHandler.remove(e.label), e.polyline && this.polylineHandler.remove(e.polyline), e.ray && this.rayHandler.remove(e.ray), e.pointCloud && this.pointCloudHandler.remove(e.pointCloud), e.strip && this.stripHandler.remove(e.strip), e.geoObject && this.geoObjectHandler.remove(e.geoObject);
     for (let t = 0; t < e.childEntities.length; t++) this._removeRecursively(e.childEntities[t]);
   }
+  _removeEntity(e) {
+    if (e.parent) {
+      let t = e.parent.childEntities;
+      for (let i = 0, r = t.length; i < r; i++) if (t[i].isEqual(e)) {
+        t.splice(i, 1);
+        break;
+      }
+      e.parent = null;
+    } else this._entities.splice(e._entityCollectionIndex, 1), this.reindexEntitiesArray(e._entityCollectionIndex);
+    this.renderNode && this.renderNode.renderer && (this.renderNode.renderer.clearPickingColor(e), e._pickingColor.clear()), this._removeRecursively(e);
+  }
   removeEntity(e) {
-    this._entities.splice(e._entityCollectionIndex, 1), this.reindexEntitiesArray(e._entityCollectionIndex), this.renderNode && this.renderNode.renderer && (this.renderNode.renderer.clearPickingColor(e), e._pickingColor.clear()), this.belongs(e) && this._removeRecursively(e), this.events.dispatch(this.events.entityremove, e);
+    this.belongs(e) && (this._removeEntity(e), this.events.dispatch(this.events.entityremove, e));
   }
   _removeEntitySilent(e) {
-    this._entities.splice(e._entityCollectionIndex, 1), this.reindexEntitiesArray(e._entityCollectionIndex), this.renderNode && this.renderNode.renderer && (this.renderNode.renderer.clearPickingColor(e), e._pickingColor.clear()), this.belongs(e) && this._removeRecursively(e);
+    this.belongs(e) && this._removeEntity(e);
   }
   createPickingColors(e = this._entities) {
     if (this.renderNode && this.renderNode.renderer) for (let t = 0; t < e.length; t++) {
@@ -6572,7 +6591,7 @@ class ge extends We {
   }
   removeEntity(e) {
     if (e._layer && this.isEqual(e._layer)) {
-      if (this._entities.splice(e._layerIndex, 1), this._reindexEntitiesArray(e._layerIndex), e._layer = null, e._layerIndex = -1, e._entityCollection) {
+      if (e.parent || (this._entities.splice(e._layerIndex, 1), this._reindexEntitiesArray(e._layerIndex)), e._layer = null, e._layerIndex = -1, e._entityCollection) {
         e._entityCollection._removeEntitySilent(e);
         let t = e._nodePtr;
         for (; t; ) t.count--, t = t.parentNode;