mars3d-tdt 3.8.4 → 3.8.7

package/README.md

@@ -52,7 +52,7 @@ npm install mars3d-tdt --save
 
 ```js 
 //导入mars3d主库
-import "mars3d/dist/mars3d.css";
+import "mars3d/mars3d.css";
 import * as mars3d from "mars3d";
 
 //导入mars3d插件 [在mars3d引入后]

package/{dist/mars3d-tdt.js → mars3d-tdt.js}

@@ -1,8 +1,8 @@
 /**
  * Mars3D平台插件,支持对天地图三维地名服务和地形服务加载使用  mars3d-tdt
  *
- * 版本信息：v3.8.4
- * 编译日期：2024-10-16 09:34
+ * 版本信息：v3.8.7
+ * 编译日期：2024-11-14 18:16
  * 版权所有：Copyright by 火星科技  http://mars3d.cn
  * 使用单位：免费公开版 ，2024-08-01
  */
@@ -2503,8 +2503,17 @@
         m = (i(88), i(0)),
         b = i.n(m);
       !function (e, r) {
-        var n = i(120);
-        window.dcodeIO = window.dcodeIO || {}, window.dcodeIO.ByteBuffer = n, "function" === typeof define && i(121) ? define(["bytebuffer"], r) : "object" === b()(t) && t && t.exports ? t.exports = r(i(120), !0) : (e.dcodeIO = e.dcodeIO || {}).ProtoBuf = r(e.dcodeIO.ByteBuffer);
+        // var n = i(120)
+        // ;(window.dcodeIO = window.dcodeIO || {}),
+        //   (window.dcodeIO.ByteBuffer = n),
+        //   "function" === typeof define && i(121)
+        //     ? define(["bytebuffer"], r)
+        //     : "object" === b()(t) && t && t.exports
+        //     ? (t.exports = r(i(120), !0))
+        //     : ((e.dcodeIO = e.dcodeIO || {}).ProtoBuf = r(e.dcodeIO.ByteBuffer))
+
+        e.dcodeIO = e.dcodeIO || {};
+        e.dcodeIO.ProtoBuf = r(i(120), true);
       }(window, function (t, r) {
         var o,
           s = {};
@@ -4871,7 +4880,11 @@
     }
     var T;
     !function (e) {
-      ("undefined" === typeof define ? "undefined" : w()(define)) === P("0x8") && define[P("0xd")] ? define(e) : e();
+      if (("undefined" === typeof define ? "undefined" : w()(define)) === P("0x8") && define[P("0xd")]) {
+        define(e);
+      } else {
+        e();
+      }
     }(function () {}), (T = Cesium$2) && (T[P("0x45")] = {
       GeoCamera: !0,
       GeoCameraEventAggregator: !0,
@@ -5141,9 +5154,9 @@
     function (Cesium) {
       var t = Cesium.defaultValue;
       function i(i) {
-        i = t(i, t.EMPTY_OBJECT), this[P("0xe18")] = i.proxy, this[P("0x13b")] = i[P("0x13b")], this.url = i[P("0x6af")], this[P("0xe19")] = i.metadata, this[P("0xe1a")] = i.roadMetadata, this[P("0xe1b")] = i[P("0xe1b")], this[P("0xe1c")] = i.labelGraphics ? i.labelGraphics : {}, this[P("0xe1d")] = i[P("0xe1d")] ? i.billboardGraphics : {}, this[P("0xe1e")] = !!i.aotuCollide, this.collisionPadding = i[P("0xe1f")] ? i[P("0xe1f")] : [3, 5, 3, 5], this[P("0xe20")] = !!i[P("0xe20")], this[P("0xa4e")] = i.subdomains, Array.isArray(this[P("0xa4e")]) ? this[P("0xa4e")] = this[P("0xa4e")].slice() : Cesium["defined"](this[P("0xa4e")]) && 0 < this[P("0xa4e")][P("0x0")] ? this[P("0xa4e")] = this[P("0xa4e")][P("0x7f2")]("") : this[P("0xa4e")] = ["a", "b", "c"], this[P("0xe21")] = [], this[P("0xe22")] = [], this[P("0xe23")] = !1, this[P("0xe24")] = [], this._latelyRefreshStamp = 0, this._latelyCollisionStamp = 0;
+        i = t(i, t.EMPTY_OBJECT), this[P("0xe18")] = i.proxy, this.viewer = i.viewer, this.url = i[P("0x6af")], this[P("0xe19")] = i.metadata, this[P("0xe1a")] = i.roadMetadata, this[P("0xe1b")] = i[P("0xe1b")], this[P("0xe1c")] = i.labelGraphics ? i.labelGraphics : {}, this[P("0xe1d")] = i[P("0xe1d")] ? i.billboardGraphics : {}, this[P("0xe1e")] = !!i.aotuCollide, this.collisionPadding = i[P("0xe1f")] ? i[P("0xe1f")] : [3, 5, 3, 5], this[P("0xe20")] = !!i[P("0xe20")], this[P("0xa4e")] = i.subdomains, Array.isArray(this[P("0xa4e")]) ? this[P("0xa4e")] = this[P("0xa4e")].slice() : Cesium["defined"](this[P("0xa4e")]) && 0 < this[P("0xa4e")][P("0x0")] ? this[P("0xa4e")] = this[P("0xa4e")][P("0x7f2")]("") : this[P("0xa4e")] = ["a", "b", "c"], this[P("0xe21")] = [], this[P("0xe22")] = [], this[P("0xe23")] = !1, this[P("0xe24")] = [], this._latelyRefreshStamp = 0, this._latelyCollisionStamp = 0;
         var r = Cesium[P("0x75c")]();
-        this[P("0xe25")] = P("0xe26") + r, this[P("0xe27")] = "GEO_WTFS_LABEL_ROAD_" + r, this[P("0x13b")]["camera"].percentageChanged = 0.18, this.bindEvent();
+        this[P("0xe25")] = P("0xe26") + r, this[P("0xe27")] = "GEO_WTFS_LABEL_ROAD_" + r, this.viewer.camera.percentageChanged = 0.18, this.bindEvent();
       }
       function r(Cesium, t) {
         return t[P("0xe77")] >= Cesium[P("0xe77")] && t.minX <= Cesium.maxX && t[P("0x4d2")] >= Cesium[P("0x4d2")] && t[P("0x4d2")] <= Cesium.maxY || t[P("0xe78")] >= Cesium[P("0xe77")] && t.maxX <= Cesium[P("0xe78")] && t[P("0xe79")] >= Cesium[P("0x4d2")] && t[P("0xe79")] <= Cesium.maxY || t[P("0xe77")] >= Cesium[P("0xe77")] && t[P("0xe77")] <= Cesium[P("0xe78")] && t[P("0xe79")] >= Cesium[P("0x4d2")] && t.maxY <= Cesium[P("0xe79")] || t[P("0xe78")] >= Cesium[P("0xe77")] && t.maxX <= Cesium.maxX && t[P("0x4d2")] >= Cesium[P("0x4d2")] && t[P("0x4d2")] <= Cesium.maxY;
@@ -5185,22 +5198,22 @@
         return (this[P("0xe18")] ? this.proxy[P("0xe18")] : "") + this.url + P("0xe32");
       }, i.prototype[P("0xe33")] = function () {
         return (this[P("0xe18")] ? this[P("0xe18")][P("0xe18")] : "") + this[P("0xe1b")];
-      }, i.prototype[P("0xaf6")] = function () {
+      }, i.prototype._moveEnd = function () {
         var Cesium = this;
         clearTimeout(this[P("0xe34")]);
-        var t = this[P("0x13b")].scene[P("0xa3")][P("0xa2e")];
+        var t = this.viewer.scene[P("0xa3")][P("0xa2e")];
         if (t[P("0xe35")][P("0x0")] < 2 || 0 < t._tileLoadQueueHigh.length) this[P("0xe34")] = setTimeout(function () {
-          Cesium[P("0xaf6")]();
+          Cesium._moveEnd();
         }, 100);else {
           var i = this[P("0xe36")]();
           if (this[P("0xe37")](i, this._latelyGrid)) return;
           this[P("0xe38")](i), Cesium.delaySynchronous();
         }
-      }, i.prototype[P("0xaf7")] = function () {
+      }, i.prototype._changed = function () {
         var Cesium = new Date().getTime(),
           t = Cesium - this[P("0xe39")],
           i = Cesium - this[P("0xe3a")];
-        300 < t && this[P("0xaf6")](), 150 < i && this[P("0xe3b")]();
+        300 < t && this._moveEnd(), 150 < i && this[P("0xe3b")]();
       }, i.prototype._queueCall = function (Cesium) {
         var t = this;
         t[P("0xe24")] = Cesium, t[P("0xe39")] = new Date()[P("0x68")](), Cesium[P("0x1e4")](function (Cesium, i, n) {
@@ -5281,7 +5294,7 @@
         }, 600);
         return i;
       }, i.prototype[P("0xe36")] = function () {
-        for (var t = this[P("0x13b")][P("0x10f")][P("0xa3")][P("0xa2e")]._tilesToRender.map(function (t, i, r) {
+        for (var t = this.viewer.scene[P("0xa3")][P("0xa2e")]._tilesToRender.map(function (t, i, r) {
             return {
               x: t.x,
               y: t.y,
@@ -5309,9 +5322,9 @@
           Cesium.synchronousLabel();
         }, 100);
       }, i.prototype.synchronousLabel = function () {
-        for (var Cesium = 0; Cesium < this.labelCache[P("0x0")]; Cesium++) this[P("0xe22")][Cesium].timestamp >= this[P("0xe39")] && !this.viewer[P("0x194")].contains(this.labelCache[Cesium]) && (this._isInitial && this[P("0xe1e")] && (this[P("0xe22")][Cesium][P("0x221")] = !1), this[P("0x13b")][P("0x194")][P("0x6d")](this.labelCache[Cesium]));
+        for (var Cesium = 0; Cesium < this.labelCache[P("0x0")]; Cesium++) this[P("0xe22")][Cesium].timestamp >= this[P("0xe39")] && !this.viewer[P("0x194")].contains(this.labelCache[Cesium]) && (this._isInitial && this[P("0xe1e")] && (this[P("0xe22")][Cesium][P("0x221")] = !1), this.viewer[P("0x194")][P("0x6d")](this.labelCache[Cesium]));
         if (!this[P("0xe23")]) {
-          for (Cesium = 0; Cesium < this.viewer.entities[P("0x190")][P("0x0")]; Cesium++) !this[P("0x13b")][P("0x194")][P("0x190")][Cesium][P("0x176")] || this[P("0x13b")][P("0x194")][P("0x190")][Cesium][P("0x176")] !== this[P("0xe25")] && this.viewer[P("0x194")][P("0x190")][Cesium].name !== this[P("0xe27")] || this[P("0x13b")][P("0x194")][P("0x190")][Cesium].timestamp < this._latelyRefreshStamp && (this[P("0x13b")][P("0x194")].remove(this[P("0x13b")][P("0x194")][P("0x190")][Cesium]), Cesium--);
+          for (Cesium = 0; Cesium < this.viewer.entities[P("0x190")][P("0x0")]; Cesium++) !this.viewer[P("0x194")][P("0x190")][Cesium][P("0x176")] || this.viewer[P("0x194")][P("0x190")][Cesium][P("0x176")] !== this[P("0xe25")] && this.viewer[P("0x194")][P("0x190")][Cesium].name !== this[P("0xe27")] || this.viewer[P("0x194")][P("0x190")][Cesium].timestamp < this._latelyRefreshStamp && (this.viewer[P("0x194")].remove(this.viewer[P("0x194")][P("0x190")][Cesium]), Cesium--);
           this[P("0xe1e")] && this[P("0xe3b")]();
         }
       }, i.prototype[P("0xe4b")] = function (t, i) {
@@ -5334,12 +5347,12 @@
       }, i.prototype.getPropertyValue = function (Cesium, t, i, r) {
         return void 0 !== t[Cesium] ? t[Cesium] : void 0 !== i[Cesium] ? i[Cesium] : r;
       }, i.prototype[P("0xe3b")] = function () {
-        if (this[P("0xe66")]) for (var t = document[P("0xe67")](P("0xe66")), i = 0; i < t[P("0x0")]; i++) this[P("0x13b")][P("0x131")][P("0x41b")](t[i]), i--;
+        if (this[P("0xe66")]) for (var t = document[P("0xe67")](P("0xe66")), i = 0; i < t[P("0x0")]; i++) this.viewer[P("0x131")][P("0x41b")](t[i]), i--;
         var r = [],
           o = this.viewer[P("0x194")][P("0x190")];
         for (i = 0; i < o[P("0x0")]; i++) if (o[i][P("0x176")] && (o[i][P("0x176")] === this[P("0xe25")] || o[i][P("0x176")] === this[P("0xe27")])) {
           var a, s;
-          a = Cesium[P("0xe68")].worldToDrawingBufferCoordinates(this[P("0x13b")][P("0x10f")], o[i].position[P("0x512")](0)), o[i][P("0x221")] = !0, s = this[P("0xe69")]({
+          a = Cesium[P("0xe68")].worldToDrawingBufferCoordinates(this.viewer.scene, o[i].position[P("0x512")](0)), o[i][P("0x221")] = !0, s = this[P("0xe69")]({
             point: a,
             entity: o[i]
           }), o[i].collisionBox = s;
@@ -5352,7 +5365,7 @@
             entities: []
           }, r.push(x)), x[P("0x194")][P("0x17c")](o[i]), this[P("0xe66")]) {
             var c = document[P("0x15c")](P("0x15d"));
-            c[P("0x21b")](P("0xe6a"), P("0xe66")), c[P("0x150")][P("0xe6b")] = P("0xe6c") + s.y + P("0xe6d") + s.x + P("0xe6e") + s.width + P("0xe6f") + s[P("0x8b")] + "px; border: solid 1px red; color: rgba(0,0,0,0);", c[P("0x40a")] = o[i][P("0xe51")][P("0x31b")].getValue(0), this[P("0x13b")].container.appendChild(c);
+            c[P("0x21b")](P("0xe6a"), P("0xe66")), c[P("0x150")][P("0xe6b")] = P("0xe6c") + s.y + P("0xe6d") + s.x + P("0xe6e") + s.width + P("0xe6f") + s[P("0x8b")] + "px; border: solid 1px red; color: rgba(0,0,0,0);", c[P("0x40a")] = o[i][P("0xe51")][P("0x31b")].getValue(0), this.viewer.container.appendChild(c);
           }
         }
         for (var u = 0; u < r[P("0x0")]; u++) for (r[u].entities[P("0x3d2")](function (Cesium, t) {
@@ -5364,14 +5377,16 @@
           return Cesium.priority - t[P("0xe64")];
         }), l = i + 1; l < h[P("0x0")]; l++) h[l].show && n(h[i][P("0xe70")], h[l][P("0xe70")]) && (h[l].show = !1);
       }, i.prototype[P("0xe71")] = function () {
-        this[P("0x13b")].scene["camera"][P("0xe72")][P("0x130")](this[P("0xaf6")], this), this.viewer.scene.camera[P("0xe73")][P("0x130")](this[P("0xaf7")], this);
+        this.viewer.scene.camera.moveEnd.addEventListener(this._moveEnd, this);
+        this.viewer.scene.camera.changed.addEventListener(this._changed, this);
       }, i.prototype[P("0xe74")] = function () {
-        this[P("0x13b")][P("0x10f")]["camera"][P("0xe72")][P("0x548")](this[P("0xaf6")], this), this[P("0x13b")][P("0x10f")].camera[P("0xe73")][P("0x548")](this[P("0xaf7")], this);
+        this.viewer.scene.camera.moveEnd.removeEventListener(this._moveEnd, this);
+        this.viewer.scene.camera.changed.removeEventListener(this._changed, this);
       }, i.prototype[P("0x198")] = function () {
-        this[P("0xe24")] = [], this[P("0xaf6")]();
+        this[P("0xe24")] = [], this._moveEnd();
       }, i.prototype["destroy"] = function () {
-        for (var Cesium = 0; Cesium < this[P("0x13b")][P("0x194")][P("0x190")][P("0x0")]; Cesium++) !this.viewer[P("0x194")][P("0x190")][Cesium].name || this.viewer.entities[P("0x190")][Cesium][P("0x176")] !== this._UUID && this.viewer.entities.values[Cesium].name !== this[P("0xe27")] || (this[P("0x13b")][P("0x194")].remove(this[P("0x13b")].entities[P("0x190")][Cesium]), Cesium--);
-        this[P("0x13b")]["camera"].percentageChanged = 0.5, this[P("0xe74")](), this[P("0x16f")] = this[P("0x16f")] && this[P("0x16f")].destroy(), this[P("0xe18")] = void 0, this[P("0x13b")] = void 0, this[P("0x6af")] = void 0, this[P("0xe1c")] = void 0, this[P("0xe1d")] = void 0, this[P("0xe1e")] = void 0, this.collisionPadding = void 0, this.tileCache = void 0, this.labelCache = void 0, this[P("0xe24")] = void 0, this[P("0xe39")] = void 0, this[P("0xe75")] = void 0;
+        for (var Cesium = 0; Cesium < this.viewer[P("0x194")][P("0x190")][P("0x0")]; Cesium++) !this.viewer[P("0x194")][P("0x190")][Cesium].name || this.viewer.entities[P("0x190")][Cesium][P("0x176")] !== this._UUID && this.viewer.entities.values[Cesium].name !== this[P("0xe27")] || (this.viewer[P("0x194")].remove(this.viewer.entities[P("0x190")][Cesium]), Cesium--);
+        this.viewer.camera.percentageChanged = 0.5, this[P("0xe74")](), this[P("0x16f")] = this[P("0x16f")] && this[P("0x16f")].destroy(), this[P("0xe18")] = void 0, this.viewer = void 0, this[P("0x6af")] = void 0, this[P("0xe1c")] = void 0, this[P("0xe1d")] = void 0, this[P("0xe1e")] = void 0, this.collisionPadding = void 0, this.tileCache = void 0, this.labelCache = void 0, this[P("0xe24")] = void 0, this[P("0xe39")] = void 0, this[P("0xe75")] = void 0;
       }, i.prototype[P("0xe37")] = function (Cesium, t) {
         for (var i = !1, r = 0; r < Cesium[P("0x0")]; r++) {
           for (var n = !1, o = 0; o < t.length; o++) if (Cesium[r].x === t[o].x && Cesium[r].y === t[o].y && Cesium[r].level === t[o][P("0x968")]) {
@@ -5410,7 +5425,7 @@
         return "#" + Cesium + t;
       }, i.prototype.getLabelVisibility = function (Cesium) {
         if (!Cesium) return !1;
-        var t = this[P("0x13b")][P("0x48")].getBoundingClientRect();
+        var t = this.viewer[P("0x48")].getBoundingClientRect();
         return !(Cesium.x < -10 || Cesium.x > t[P("0x9b")] + 10 || Cesium.y < -10 || Cesium.y > t[P("0x9aa")] + 10);
       };
       var o = function (Cesium) {
@@ -6372,7 +6387,7 @@
         ...this.options,
         viewer: this._map.viewer,
         subdomains: subdomains,
-        labelGraphics: mars3d__namespace.LabelStyleConver.toCesiumVal(this.options.label, {
+        labelGraphics: mars3d__namespace.LabelStyleConver.toCesiumVal(this.options.label || {}, {
           font: "28px sans-serif",
           fontSize: 28,
           fillColor: Cesium$1.Color.WHITE,
@@ -6388,7 +6403,7 @@
           eyeOffset: Cesium$1.Cartesian3.ZERO,
           pixelOffset: new Cesium$1.Cartesian2(0, -10)
         }),
-        billboardGraphics: mars3d__namespace.BillboardStyleConver.toCesiumVal(this.options.billboard, {
+        billboardGraphics: mars3d__namespace.BillboardStyleConver.toCesiumVal(this.options.billboard || {}, {
           horizontalOrigin: Cesium$1.HorizontalOrigin.CENTER,
           verticalOrigin: Cesium$1.VerticalOrigin.CENTER,
           eyeOffset: Cesium$1.Cartesian3.ZERO,

package/package.json

@@ -1,16 +1,13 @@
 {
 	"name": "mars3d-tdt",
-	"version": "3.8.4",
+	"version": "3.8.7",
 	"description": "Mars3D平台插件,支持对天地图三维地名服务和地形服务加载使用",
-	"main": "dist/mars3d-tdt.js",
-	"files": [
-		"dist"
-	],
+	"main": "./mars3d-tdt.js",
 	"peerDependencies": {
 		"bytebuffer": "^5.0.1"
 	},
 	"devDependencies": {
-		"mars3d": "~3.8.4"
+		"mars3d": "~3.8.7"
 	},
 	"scripts": {
 		"lint": "eslint ./src/**/*.{js,ts} --fix"