vis-core 0.30.0-beta.20 → 0.30.0-beta.22

package/dist/index.module.js

@@ -63,7 +63,7 @@ import { continentsCountriesIso2 } from "geojson-cn";
 Array.prototype.at || (Array.prototype.at = function(v) {
   return v < 0 && (v = this.length + v), this[v];
 });
-const version = "0.30.0-beta.20", publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEyTG1aVVQzVG9LZEVRRUdrdUU1QQo3dnlYTzRMM1Z6NDA5RFF2a2xzRHZ2SytNM2M2OGl4ZEVhZDZFcnZGS2FKQ1QrNTZNdU1XSXhUTnlDZDVQSkFGCjVYdzI4cW1iVkVCR3FGdXVIZTltSm5GUmRXN1NpK1Z1cTZvRWxwQkRkeEFIQ0dsWVVpU1R3WmhBbjJaVXJLSUYKd1J2c1k1bi9uWWNhZnl5QW9tRjhmNVRsTkpwS1JtbDU3WlRSWjBMdzdQRDFSeHFIbmJ0YWFETkpiSDV5eFd6cQpaVTBwQWhxMFNkNHdlOW1DUTJWWXc5czhtUERLbW4rU083eGovSUsrR1ZEaEJNOUpaZ3VIcGFZUGt3bWd5UkdwCkx6V0tHMkZULzJRalZUT1dRT09mRFVtVitDSVlsN1hVVlh1Q0toYWFNQ0ZVa1JQOHg4aEZucmNFeklHQ1JpM3IKK3dJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t", accessToken = {
+const version = "0.30.0-beta.22", publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEyTG1aVVQzVG9LZEVRRUdrdUU1QQo3dnlYTzRMM1Z6NDA5RFF2a2xzRHZ2SytNM2M2OGl4ZEVhZDZFcnZGS2FKQ1QrNTZNdU1XSXhUTnlDZDVQSkFGCjVYdzI4cW1iVkVCR3FGdXVIZTltSm5GUmRXN1NpK1Z1cTZvRWxwQkRkeEFIQ0dsWVVpU1R3WmhBbjJaVXJLSUYKd1J2c1k1bi9uWWNhZnl5QW9tRjhmNVRsTkpwS1JtbDU3WlRSWjBMdzdQRDFSeHFIbmJ0YWFETkpiSDV5eFd6cQpaVTBwQWhxMFNkNHdlOW1DUTJWWXc5czhtUERLbW4rU083eGovSUsrR1ZEaEJNOUpaZ3VIcGFZUGt3bWd5UkdwCkx6V0tHMkZULzJRalZUT1dRT09mRFVtVitDSVlsN1hVVlh1Q0toYWFNQ0ZVa1JQOHg4aEZucmNFeklHQ1JpM3IKK3dJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t", accessToken = {
   token: void 0,
   getInfo() {
     if (!this.token)
@@ -140348,22 +140348,28 @@ class Editor {
       return this._mListOptionsMaps[o].get(r);
   }
   changeMListOptions() {
-    if (!this.pencil)
-      return [];
+    var r, o, V;
+    if (!((r = this.pencil) != null && r.mList))
+      return console.log({
+        _dispose: this._dispose,
+        //@ts-ignore
+        minDisabledLayer: (o = this.pencil) == null ? void 0 : o.pages.getMinDisabledLayer(),
+        vis: (V = this.viewport) == null ? void 0 : V.vis
+      }), [];
     this._mListOptionsMaps.key.clear(), this._mListOptionsMaps.material = /* @__PURE__ */ new WeakMap(), this._mListOptionsMaps.object = /* @__PURE__ */ new WeakMap();
     const e = Array.from(this.pencil.mList.fixBaseObjects.entries());
     this.mListOptions = new Array(e.length);
-    for (let r = 0; r < e.length; r++) {
-      const [o, V] = e[r], O = this.pencil.mList.get(o), j = V.object3d, le = {
-        key: o,
-        name: O.name,
-        type: O.type,
-        object: j,
-        baseObject: V,
-        material: O,
-        use: this.pencil.mList.getBaseObjectMap(O).size
+    for (let O = 0; O < e.length; O++) {
+      const [j, le] = e[O], fe = this.pencil.mList.get(j), Se = le.object3d, Ce = {
+        key: j,
+        name: fe.name,
+        type: fe.type,
+        object: Se,
+        baseObject: le,
+        material: fe,
+        use: this.pencil.mList.getBaseObjectMap(fe).size
       };
-      this.mListOptions[r] = le, this._mListOptionsMaps.key.set(o, le), this._mListOptionsMaps.material.set(O, le), this._mListOptionsMaps.object.set(j, le);
+      this.mListOptions[O] = Ce, this._mListOptionsMaps.key.set(j, Ce), this._mListOptionsMaps.material.set(fe, Ce), this._mListOptionsMaps.object.set(Se, Ce);
     }
     this.emit("mListGraphChanged");
   }
@@ -140401,7 +140407,10 @@ class Editor {
           const fe = parseTexture(le.v.bg.texture);
           fe.colorSpace = SRGBColorSpace, this.viewport.vis.pencil.scene.background = fe;
         }
-        return this.hooks.dispatch("beforeShow"), (O = this.viewport.vis) == null || O.show(), this.hooks.dispatch("afterShow"), (j = this.pencil.controls) == null || j.saveState(), this.select(null), this.hooks.dispatch("afterFromJSON"), le;
+        return this.hooks.dispatch("beforeShow"), (O = this.viewport.vis) == null || O.show(), this.hooks.dispatch("afterShow"), (j = this.pencil.controls) == null || j.saveState(), this.select(null), window.requestIdleCallback(() => {
+          var fe;
+          (fe = this.viewport.vis) == null || fe.worker.dispose();
+        }), this.hooks.dispatch("afterFromJSON"), le;
       } catch (le) {
         throw this.hooks.dispatch("errorFromJSON"), new Error("fromJSON error:" + le);
       }
@@ -144120,7 +144129,7 @@ const getLabelElement = (v) => {
     v0(this, "pcenter", [104, 37.5]);
     v0(this, "pscale", 5e4 / 1e3);
     v0(this, "meters");
-    v0(this, "cityVis", null);
+    v0(this, "cityVis", []);
     v0(this, "extendsOptions", {
       mapDepth: () => this.getOptionsDepth(this.options.adcode),
       equirectangular: () => this.options.projectionType === "equirectangular",
@@ -144283,7 +144292,7 @@ const getLabelElement = (v) => {
         setWaterMaterial: this.options.setWaterMaterial,
         ssao: this.options.citySSAO,
         pencil2: this.pencil
-      }), yield j.init(), this.cityVis = j, this.settings.mouseLeft = Xi.SCREEN_PAN, yield this.settings.mouseLeft, this.emit("initCityVis", r), j;
+      }), yield j.init(), this.cityVis.push(j), this.settings.mouseLeft = Xi.SCREEN_PAN, yield this.settings.mouseLeft, this.emit("initCityVis", r), j;
     });
   }
   initCityOnMap(r) {
@@ -145142,10 +145151,12 @@ const getLabelElement = (v) => {
     return findAdcodeInfo(r);
   }
   dispose() {
-    var r, o, V;
-    (r = this.cityVis) == null || r.dispose(), (o = this.map) == null || o.dispose(), this.parentBg.forEach((O) => {
-      O.dispose();
-    }), this.parentBg.length = 0, (V = this.continentsBg) == null || V.dispose(), this.continentsBg = void 0, this.mapHistory.length = 0, super.dispose();
+    var r, o;
+    this.cityVis.forEach((V) => {
+      V.dispose();
+    }), this.cityVis.length = 0, (r = this.map) == null || r.dispose(), this.parentBg.forEach((V) => {
+      V.dispose();
+    }), this.parentBg.length = 0, (o = this.continentsBg) == null || o.dispose(), this.continentsBg = void 0, this.mapHistory.length = 0, super.dispose();
   }
 };
 v0(Mn, "VisName", "map"), v0(Mn, "getAdcodeShowLevel", getAdcodeShowLevel);

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.30.0-beta.20";
+declare const _default: "0.30.0-beta.22";
 export default _default;

package/dist/vis/map/index.d.ts

@@ -165,7 +165,7 @@ export default class extends Base {
     pcenter: [number, number];
     pscale: number;
     meters: number;
-    cityVis: City | null;
+    cityVis: City[];
     extendsOptions: Record<string, any>;
     setOptions(options: MapOptions): void;
     initSettingsObj: Record<string, any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.30.0-beta.20",
+  "version": "0.30.0-beta.22",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version && PUBLIC_EXCLUDE=true  bundler",