vis-core 0.22.12 → 0.22.13

package/dist/index.module.js

@@ -90,7 +90,7 @@ const publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRz
     ).toString(CryptoJS.enc.Utf8), qe = JSON.parse($e), st = Date.now();
     return !qe.s || qe.s > st ? (this.token = void 0, "") : qe.e && qe.e < st ? (this.token = void 0, "") : (qe.isValid = Qe, qe);
   }
-}, version = "0.22.12";
+}, version = "0.22.13";
 /**
  * @license
  * Copyright 2010-2024 Three.js Authors
@@ -129382,9 +129382,11 @@ let PlaneMap$1 = class extends A$1 {
       !Xe || !Xe.uniforms.lineLightAnimation.value || (Xe.uniforms.time.value = r);
     });
   }
-  findGroup(s) {
+  findGroup(s, r = !1) {
     return this.pencil.getPlugin("draw").getObject("Group", {
-      key: `area-group-${s}`
+      key: `area-group-${r ? this.getPropertiesKey({
+        adcode: s
+      }) : s}`
     });
   }
   setAreaMaterial(s, r) {
@@ -129771,16 +129773,19 @@ const objs$4 = Ki(ai({}, objs$5), {
           name: "顶面",
           map: e.getAsset("/image/map/hp.webp"),
           normalMap: e.getAsset("/image/map/shuchu2.webp")
-        }), T = new MeshBasicMaterial({
+        }), T = this.options.drillDownTopMatTwo ? new MeshBasicMaterial({
+          name: "二级顶面",
+          color: new Color$1("#0d2425")
+        }) : null, de = new MeshBasicMaterial({
           name: "侧面",
           map: e.getAsset("/image/map/jianbian.webp")
-        }), de = new it$1({
+        }), Xe = new it$1({
           color: new Color$1("#73FEDD"),
           sizeAttenuation: 0,
           lineWidth: this.options.lineWidth,
           //@ts-ignore
           depthWrite: !1
-        }), Xe = new it$1({
+        }), Ke = new it$1({
           name: "板块边线",
           color: new Color$1("#00FFED"),
           sizeAttenuation: 0,
@@ -129790,9 +129795,10 @@ const objs$4 = Ki(ai({}, objs$5), {
         });
         return {
           topMat: r,
-          sideMat: T,
-          lineMat: de,
-          extrudeLineMat: Xe
+          topMatTwo: T,
+          sideMat: de,
+          lineMat: Xe,
+          extrudeLineMat: Ke
         };
       })();
       this.mList.setMaterialObj("plane", s), this.mList.setShowMaterialList("area", ["plane#topMat", "plane#sideMat"], {
@@ -129813,16 +129819,19 @@ const objs$4 = Ki(ai({}, objs$5), {
         const r = new MeshBasicMaterial({
           name: "顶面",
           color: new Color$1("#0d2425")
-        }), T = new MeshBasicMaterial({
+        }), T = this.options.drillDownTopMatTwo ? new MeshBasicMaterial({
+          name: "二级顶面",
+          color: new Color$1("#0d2425")
+        }) : null, de = new MeshBasicMaterial({
           name: "侧面",
           map: e.getAsset("/image/map/jianbian.webp")
-        }), de = new it$1({
+        }), Xe = new it$1({
           color: new Color$1("#73FEDD"),
           sizeAttenuation: 0,
           lineWidth: this.options.lineWidth,
           //@ts-ignore
           depthWrite: !1
-        }), Xe = new it$1({
+        }), Ke = new it$1({
           color: new Color$1("#00FFED"),
           sizeAttenuation: 0,
           lineWidth: this.options.extrudeLineWidth,
@@ -129830,10 +129839,11 @@ const objs$4 = Ki(ai({}, objs$5), {
           depthWrite: !1
         });
         return {
+          topMatTwo: T,
           topMat: r,
-          sideMat: T,
-          lineMat: de,
-          extrudeLineMat: Xe
+          sideMat: de,
+          lineMat: Xe,
+          extrudeLineMat: Ke
         };
       })();
       this.mList.setMaterialObj("plane", s), this.mList.setShowMaterialList("area", ["plane#topMat", "plane#sideMat"], {
@@ -129879,7 +129889,7 @@ const objs$4 = Ki(ai({}, objs$5), {
     H0(this, "pscale", 5e4 / 1e3);
     H0(this, "meters");
     H0(this, "extendsOptions", {
-      mapDepth: () => this.mapObj.depth,
+      mapDepth: () => this.getOptionsDepth(this.options.adcode),
       equirectangular: () => this.options.projectionType === "equirectangular",
       // fahey: () => {
       //   return this.options.projectionType === 'fahey';
@@ -129948,6 +129958,8 @@ const objs$4 = Ki(ai({}, objs$5), {
       continentsBgDepth: 0,
       parentBgDepth: 0,
       parentBgTopSegments: 0,
+      clickHandleDrillDown: !1,
+      drillDownTopMatTwo: !1,
       clickOusideBack: !0,
       mapDepth: [1, 0.4, 0.2],
       mapPadding: [100, 100, 100, 100],
@@ -129976,7 +129988,7 @@ const objs$4 = Ki(ai({}, objs$5), {
       geojsonMap: r,
       extrudeLineGeojsonMap: T,
       bboxMap: de
-    })), this.options.equirectangular && (this.options.projectionType = "equirectangular"), this.options.fahey && (this.options.projectionType = "fahey", this.pscale = 100, this.pcenter = [0, 0]), this.pencilConfig = PENCIL_CONFIG$4, (this.getAdcodeShowLevel(this.options.adcode) === "province" || this.getAdcodeShowLevel(this.options.adcode) === "country") && (this.extendsOptions.parentBg = () => this.options.parentBg, this.extendsOptions.parentBgDepth = () => this.options.parentBgDepth, this.extendsOptions.parentBgTopSegments = () => this.options.parentBgTopSegments, this.extendsOptions.continentsBg = () => this.options.continentsBg, this.extendsOptions.continentsBgDepth = () => this.options.continentsBgDepth), this.options.adcode === 0 ? world(this) : this.options.style === "map2" || (this.options.adcode === 1e5 ? china(this) : base$1(this));
+    })), this.options.equirectangular && (this.options.projectionType = "equirectangular"), this.options.fahey && (this.options.projectionType = "fahey", this.pscale = 100, this.pcenter = [0, 0]), this.pencilConfig = PENCIL_CONFIG$4, (this.getAdcodeShowLevel(this.options.adcode) === "province" || this.getAdcodeShowLevel(this.options.adcode) === "country") && (this.options.clickHandleDrillDown && (this.extendsOptions.mapDepth = () => Array.isArray(this.options.mapDepth) ? this.options.mapDepth : new Array(3).fill(this.options.mapDepth)), this.extendsOptions.clickHandleDrillDown = () => this.options.clickHandleDrillDown, this.extendsOptions.drillDownTopMatTwo = () => this.options.drillDownTopMatTwo, this.extendsOptions.drillDownPlateInCenter = () => this.options.drillDownPlateInCenter, this.extendsOptions.parentBg = () => this.options.parentBg, this.extendsOptions.parentBgDepth = () => this.options.parentBgDepth, this.extendsOptions.parentBgTopSegments = () => this.options.parentBgTopSegments, this.extendsOptions.continentsBg = () => this.options.continentsBg, this.extendsOptions.continentsBgDepth = () => this.options.continentsBgDepth), this.options.adcode === 0 ? world(this) : this.options.style === "map2" || (this.options.adcode === 1e5 ? china(this) : base$1(this));
   }
   handleSetting(s, r) {
     return ei(this, null, function* () {
@@ -130022,7 +130034,9 @@ const objs$4 = Ki(ai({}, objs$5), {
         scale: this.pscale,
         projectionType: this.options.projectionType,
         rotate: this.options.worldPacificCentre ? [-160, 0] : void 0
-      }), this.meters = this.projection([1 * 1141e-8 + this.pcenter[0], 0])[0], yield this.initPencil(), console.time(`vis-core:time.${this.visName}-loader`), this.loaderAdd(), console.timeEnd(`vis-core:time.${this.visName}-loader`), yield this.loader.loadAll(), this.group = yield this.drawController.draw("Group"), yield this.initMaterial(), yield this.initVis(s), yield Promise.all(this.drawController.objectsPromise);
+      }), this.meters = this.projection([1 * 1141e-8 + this.pcenter[0], 0])[0], yield this.initPencil(), console.time(`vis-core:time.${this.visName}-loader`), this.loaderAdd(), console.timeEnd(`vis-core:time.${this.visName}-loader`), yield this.loader.loadAll(), this.group = yield this.drawController.draw("Group"), yield this.initMaterial(), yield this.initVis(s), this.options.clickHandleDrillDown && this.addListener(this.container, "click", (r) => {
+        this.handleClick(r);
+      }), yield Promise.all(this.drawController.objectsPromise);
     });
   }
   initVis(s) {
@@ -130361,19 +130375,23 @@ const objs$4 = Ki(ai({}, objs$5), {
   shadowMapDisabled() {
     this.pencil.scene.userData.shadowMapEnabled && (this.pencil.scene.userData.shadowMapEnabled = !1, this.shadowMapLight && (this.shadowMapLight.erase(), this.mList.delObject3d(this.shadowMapLight.object3d), this.shadowMapLight = void 0), this.planeShadow && (this.mList.delObject3d(this.planeShadow.object3d), this.planeShadow.erase(), this.planeShadow = void 0));
   }
+  getOptionsDepth(s) {
+    const r = this.getAdcodeShowLevel(s);
+    let T = this.options.mapDepth;
+    Array.isArray(T) || (T = new Array(3).fill(T));
+    let de;
+    return r === "country" ? de = T[0] : r === "province" ? de = T[1] : de = T[2], de;
+  }
   getDepth(s, r) {
-    const T = this.getAdcodeShowLevel(s);
-    let de = this.options.mapDepth;
-    Array.isArray(de) || (de = new Array(3).fill(de));
-    let Xe;
-    if (T === "country" ? Xe = de[0] : T === "province" ? Xe = de[1] : Xe = de[2], this.options.depthReference && this.options.bboxMap[s]) {
-      const Ke = this.options.depthReference, Je = this.options.bboxMap[s];
-      Xe = Xe * this.getReferenceScale(Ke, Je);
+    let T = this.getOptionsDepth(s);
+    if (this.options.depthReference && this.options.bboxMap[s]) {
+      const de = this.options.depthReference, Xe = this.options.bboxMap[s];
+      T = T * this.getReferenceScale(de, Xe);
     } else if (this.mapHistory.length && this.options.bboxMap[this.mapHistory[0].mapInfo.adcode]) {
-      const Ke = this.options.bboxMap[this.mapHistory[0].mapInfo.adcode], Je = bbox(r), Qe = this.getReferenceScale(Ke, Je);
-      Xe = Xe * Qe;
+      const de = this.options.bboxMap[this.mapHistory[0].mapInfo.adcode], Xe = bbox(r), Ke = this.getReferenceScale(de, Xe);
+      T = T * Ke;
     }
-    return Xe;
+    return T;
   }
   getReferenceScale(s, r) {
     const T = Math.abs(r[3] - r[1]) / Math.abs(s[3] - s[1]), de = Math.abs(r[2] - r[0]) / Math.abs(s[2] - s[0]);
@@ -130491,7 +130509,7 @@ const objs$4 = Ki(ai({}, objs$5), {
     }) {
       var Xe, Ke, Je, Qe, _e, $e, qe, st;
       if (typeof s != "undefined" && !this.isAnimating) {
-        const dt = (Xe = this.map) == null ? void 0 : Xe.findGroup(s), Wt = findLevelJsonItem2(+s);
+        const dt = (Xe = this.map) == null ? void 0 : Xe.findGroup(s, !0), Wt = findLevelJsonItem2(+s);
         if (this.isAnimating || !Wt) return;
         this.isAnimating = !0;
         const { name: Yt } = Wt;
@@ -130641,7 +130659,9 @@ const objs$4 = Ki(ai({}, objs$5), {
       depth: de,
       adcode: Xe
     }) {
-      const Je = this.mList.getMaterialObj("plane"), Qe = ai({}, Je), _e = yield this.drawController.draw(
+      const Je = this.mapHistory.length === 0, Qe = this.mList.getMaterialObj("plane"), _e = ai({}, Qe);
+      !Je && _e.topMatTwo && (_e.topMat = _e.topMatTwo);
+      const $e = yield this.drawController.draw(
         "PlaneMap",
         {
           geojson: s,
@@ -130653,7 +130673,7 @@ const objs$4 = Ki(ai({}, objs$5), {
             rotate: this.options.worldPacificCentre ? [-160, 0] : void 0,
             projectionType: this.options.projectionType
           },
-          materialOptions: Qe,
+          materialOptions: _e,
           bbox: T,
           topSegments: this.options.topSegments,
           lineOffset: this.options.lineOffset,
@@ -130661,19 +130681,19 @@ const objs$4 = Ki(ai({}, objs$5), {
         },
         this.group
       );
-      return _e.extrudelineArr && _e.extrudelineArr.forEach(($e) => {
-        $e.object3d.name = "板块边线", this.mList.setObject3d($e.object3d, "extrudeLine", {
-          baseObject: $e,
+      return $e.extrudelineArr && $e.extrudelineArr.forEach((qe) => {
+        qe.object3d.name = "板块边线", this.mList.setObject3d(qe.object3d, "extrudeLine", {
+          baseObject: qe,
           replace: !0
-        }), this.initBaseObjectUserData($e);
+        }), this.initBaseObjectUserData(qe);
       }), this.mList.setObject3d(
-        _e.object3d,
+        $e.object3d,
         Xe === 1e5 ? "chinaGroup" : "planeMapGroup",
         {
-          baseObject: _e,
+          baseObject: $e,
           replace: !0
         }
-      ), _e;
+      ), $e;
     });
   }
   handleBack() {
@@ -130700,7 +130720,7 @@ const objs$4 = Ki(ai({}, objs$5), {
         this.drawController.eraseWithoutMaterial(de.map), this.eraseLabels();
       }
       if (this.mapObj) {
-        const { map: Xe } = this.mapObj, Ke = Xe == null ? void 0 : Xe.findGroup(de == null ? void 0 : de.mapInfo.adcode);
+        const { map: Xe } = this.mapObj, Ke = Xe == null ? void 0 : Xe.findGroup(de == null ? void 0 : de.mapInfo.adcode, !0);
         Ke && Ke.show(), Xe && r && (this.options.showOneLevel ? Xe.show() : Xe.active(), this.options.drillDownHideParent && this.parentBg.forEach((Je) => {
           Je.show();
         }), yield this.handleLookBack(s), this.drawLabels());
@@ -133081,9 +133101,7 @@ const R1 = class R1 extends Map$1 {
           clip: !!this.options.cityOnMap,
           grey: !1
         });
-      })), this.options.clickHandleDrillDown && this.addListener(this.container, "click", (r) => {
-        this.showGroup === "map" && this.handleClick(r);
-      }), this.options.cityOnMap)
+      })), this.options.cityOnMap)
         if (this.options.allCity) {
           const r = adcodeMap[this.mapInfo.adcode], T = r.level === "province" ? r.adcode : adcodeMap[this.mapInfo.adcode].parent, de = (s = allArr.find((Xe) => Xe.adcode === T)) == null ? void 0 : s.subAreas;
           de && (yield Promise.all(
@@ -133095,6 +133113,9 @@ const R1 = class R1 extends Map$1 {
           yield this.initCityOnMap(this.mapInfo.adcode);
     });
   }
+  handleClick(s) {
+    this.showGroup === "map" && super.handleClick(s);
+  }
   preInitCityVis() {
     return ei(this, null, function* () {
       const s = Object.keys(this.options.jsonNameObj);

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.22.12";
+declare const _default: "0.22.13";
 export default _default;

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

@@ -28,9 +28,11 @@ export interface MapOptions extends BaseOptions {
     lookAtMap?: Record<string, [number, number, number, number, number, number]>;
     fixGeojson?: Record<string, string>;
     plateInCenter?: boolean;
+    clickHandleDrillDown?: boolean;
     drillDownPlateInCenter?: boolean;
     drillDownHideParent?: boolean;
     drillDownRestrictions?: 'city' | 'district';
+    drillDownTopMatTwo?: boolean;
     showDistrict?: boolean;
     showLabel?: boolean | 'lite';
     lineWidth?: number;
@@ -146,6 +148,7 @@ export default class extends Base {
     planeShadow?: BaseObject;
     shadowMapEnabled(): Promise<void>;
     shadowMapDisabled(): void;
+    getOptionsDepth(adcode: number): number;
     getDepth(adcode: number, geojson: GeoJSON): number;
     getReferenceScale(bboxa: number[], bboxb: number[]): number;
     getAdcodeShowLevel(adcode: number): string | undefined;

package/dist/vis/map/objects/PlaneMap.d.ts

@@ -72,7 +72,7 @@ export default class PlaneMap extends BaseObject {
     }[];
     pickArea(e: MouseEvent): import("gl-draw/dist/core/BaseObject").IBaseObject | undefined;
     update(delta: number, elapsed: number): void;
-    findGroup(adcode: string | number): Group | undefined;
+    findGroup(adcode: string | number, fix?: boolean): Group | undefined;
     setAreaMaterial(key: string, material: THREE.Material[] | THREE.Material): void;
     useAreaMaterial(key: string): void;
     setLineMaterial(key: string, material: THREE.Material): void;

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

@@ -38,6 +38,7 @@ export default class extends Map {
     options: Required<MapCityOptions>;
     setOptions(options: MapCityOptions): void;
     init(): Promise<void>;
+    handleClick(e: MouseEvent): void;
     preInitCityVis(): Promise<void>;
     initCityVis(adcode: number, options?: {
         clip?: boolean;

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

@@ -5,7 +5,6 @@ type GeoJSON = FeatureCollection<Polygon | MultiPolygon>;
 export interface Map2Options extends MapOptions {
     bottomPlane?: boolean;
     bottomPlaneWater?: boolean;
-    clickHandleDrillDown?: boolean;
     cityOnMap?: boolean;
 }
 export default class extends Map {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.22.12",
+  "version": "0.22.13",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version && bundler",