vis-core 0.21.9 → 0.21.11

package/dist/index.module.js

@@ -37242,6 +37242,11 @@ class MaterialList {
   emitObject3dChange() {
     this.pencil.event.emit("object3dListChange");
   }
+  setObject3dMeta(e, s) {
+    this.objectList.forEach((h, Y) => {
+      h.key === e && this.objectList.set(Y, xi(xi({}, h), s));
+    });
+  }
   setObject3d(e, s, h) {
     if (this.objectList.has(e) && console.warn(`ObjectList: ${e.uuid} already exists`), !(h != null && h.disableCheckHide)) {
       const Y = e.material;
@@ -47192,7 +47197,7 @@ function createAreaLightMaterial(c) {
   const e = new MeshBasicMaterial();
   return e.color.setScalar(c), e;
 }
-const version = "0.21.9";
+const version = "0.21.11";
 class Event {
   constructor() {
     F0(this, "event", new EventEmitter());
@@ -49182,7 +49187,7 @@ class ContinentsBg extends D$1 {
   create() {
     return $0(this, null, function* () {
       const { depth: s } = this.options, h = this.pencil.installPlugins.get("materialList"), Y = this.pencil.getPlugin("draw"), Ge = h.getMaterialObj("continents");
-      this.createGroup(), yield Promise.all(
+      this.createGroup(), this.object3d.name = "大洲组", yield Promise.all(
         continents.features.map((We) => $0(this, null, function* () {
           const Re = We.properties.name;
           Re === "大洋洲" && (We.geometry.coordinates[4] = [], We.geometry.coordinates[21] = []);
@@ -49242,8 +49247,13 @@ class ContinentsBg extends D$1 {
     }), this.mapArr.forEach((h) => {
       s.setObject3d(h.object3d, "continents-" + h.userData.name, {
         baseObject: h,
-        remove: !1
+        remove: !1,
+        parent: this.object3d
       });
+    }), s.setObject3dMeta("continentsArea", {
+      parent: this.object3d
+    }), s.setObject3dMeta("continentsLine", {
+      parent: this.object3d
     });
   }
   dispose() {
@@ -49730,10 +49740,10 @@ const objs$4 = sn(xi({}, objs$5), {
           "continentsArea",
           ["continents#topMat", "continents#sideMat"],
           {
-            name: "大洲"
+            name: "板块材质"
           }
         ), this.mList.setShowMaterialList("continentsLine", "continents#lineMat", {
-          name: "大洲线"
+          name: "线材质"
         });
       }
     });
@@ -49931,7 +49941,13 @@ const objs$4 = sn(xi({}, objs$5), {
   getDepth(s) {
     const h = this.getAdcodeShowLevel(s);
     let Y = this.options.mapDepth;
-    return Array.isArray(Y) || (Y = new Array(3).fill(Y)), h === "country" ? Y[0] : h === "province" ? Y[1] : Y[2];
+    Array.isArray(Y) || (Y = new Array(3).fill(Y));
+    let Ge;
+    if (h === "country" ? Ge = Y[0] : h === "province" ? Ge = Y[1] : Ge = Y[2], this.options.depthReference && this.options.bboxMap[s]) {
+      const We = this.options.depthReference, Re = this.options.bboxMap[s], Le = Math.abs(Re[3] - Re[1]) / Math.abs(We[3] - We[1]), ve = Math.abs(Re[2] - Re[0]) / Math.abs(We[2] - We[0]);
+      Ge = Ge * Math.max(Le, ve);
+    }
+    return Ge;
   }
   getAdcodeShowLevel(s) {
     var h;
@@ -53132,7 +53148,7 @@ function stringToUtf8ByteArray(c) {
 }
 let b = "/";
 b === "/" && (b = "");
-const getMapConfig = (s, ...h) => $0(void 0, [s, ...h], function* (c, e = b) {
+const getMapConfig = (h, ...Y) => $0(void 0, [h, ...Y], function* (c, e = b, s) {
   if (c === 0)
     return {
       mapDepth: 5,
@@ -53142,94 +53158,98 @@ const getMapConfig = (s, ...h) => $0(void 0, [s, ...h], function* (c, e = b) {
       center: [0, 0]
     };
   {
-    const Y = adcodeMap[c];
+    const Ge = adcodeMap[c];
     return extendMapConfig(
       "map",
       {
-        center: [Y.lng, Y.lat],
-        adcode: Y.adcode
+        center: [Ge.lng, Ge.lat],
+        adcode: Ge.adcode
       },
-      e
+      e,
+      s
     );
   }
-}), getMap2Config = (s, ...h) => $0(void 0, [s, ...h], function* (c, e = b) {
-  const Y = adcodeMap[c];
+}), getMap2Config = (h, ...Y) => $0(void 0, [h, ...Y], function* (c, e = b, s) {
+  const Ge = adcodeMap[c];
   return extendMapConfig(
     "map2",
     {
-      center: [Y.lng, Y.lat],
-      adcode: Y.adcode,
-      parentBg: Y.adcode !== 1e5
+      center: [Ge.lng, Ge.lat],
+      adcode: Ge.adcode,
+      parentBg: Ge.adcode !== 1e5
     },
-    e
+    e,
+    s
   );
-}), getMap2WithCityConfig = (s, ...h) => $0(void 0, [s, ...h], function* (c, e = b) {
-  const Y = adcodeMap[c];
+}), getMap2WithCityConfig = (h, ...Y) => $0(void 0, [h, ...Y], function* (c, e = b, s) {
+  const Ge = adcodeMap[c];
   return extendMapConfig(
     "map2",
     {
-      center: [Y.lng, Y.lat],
-      adcode: Y.adcode,
+      center: [Ge.lng, Ge.lat],
+      adcode: Ge.adcode,
       showOneLevel: !0,
-      allCity: Y.level === "province",
+      allCity: Ge.level === "province",
       cityOnMap: !0,
       parentBg: !1,
       mapDepth: 4e-3,
       bottomPlane: !1
     },
-    e
+    e,
+    s
   );
-}), extendMapConfig = (h, Y, ...Ge) => $0(void 0, [h, Y, ...Ge], function* (c, e, s = b) {
-  var We, Re;
+}), extendMapConfig = (Y, Ge, ...We) => $0(void 0, [Y, Ge, ...We], function* (c, e, s = b, h) {
+  var Re, Le;
   if (e.adcode !== 0 && e.adcode !== 1e5) {
-    const Le = (We = e.fixGeojson) == null ? void 0 : We[e.adcode], ve = (Re = e.fixGeojson) == null ? void 0 : Re[e.adcode + "-lite"];
-    let { res: Ie } = yield jsonFetch(
-      s + `/geojson/${Le || "json"}/${e.adcode}.json`
+    const ve = (Re = e.fixGeojson) == null ? void 0 : Re[e.adcode], Ie = (Le = e.fixGeojson) == null ? void 0 : Le[e.adcode + "-lite"];
+    let { res: Te } = yield jsonFetch(
+      s + `/geojson/${ve || "json"}/${e.adcode}.json`
     );
-    const { res: Te } = yield jsonFetch(
-      s + `/geojson/${ve || "json-lite"}/${e.adcode}.json`
-    ), ke = bbox(Te), ze = e.adcode, je = sn(xi({}, e), {
+    const { res: ke } = yield jsonFetch(
+      s + `/geojson/${Ie || "json-lite"}/${e.adcode}.json`
+    ), ze = bbox(ke), je = e.adcode, pt = sn(xi({}, e), {
       geojsonMap: {
-        [ze]: Ie
+        [je]: Te
       },
       extrudeLineGeojsonMap: {
-        [ze]: Te
+        [je]: ke
       },
       bboxMap: {
-        [ze]: ke
+        [je]: ze
       },
       cityBboxMap: {},
-      jsonNameObj: {}
+      jsonNameObj: {},
+      depthReference: void 0
     });
     if (c === "map2") {
-      if (!(adcodeMap[ze].level === "province")) {
-        let nt = adcodeMap[ze].parent;
-        for (; adcodeMap[nt].level !== "province"; )
-          nt = adcodeMap[nt].parent;
-        const { res: Be } = yield jsonFetch(
-          s + `/geojson/${Le || "json"}/${nt}.json`
+      if (!(adcodeMap[je].level === "province")) {
+        let Be = adcodeMap[je].parent;
+        for (; adcodeMap[Be].level !== "province"; )
+          Be = adcodeMap[Be].parent;
+        const { res: at } = yield jsonFetch(
+          s + `/geojson/${ve || "json"}/${Be}.json`
         );
-        Ie = Be;
+        Te = at;
       }
-      Ie.features.forEach((nt) => {
-        je.cityBboxMap[nt.properties.adcode] = bbox(nt), je.jsonNameObj[nt.properties.adcode] = ec(
-          nt.properties.name,
-          `${nt.properties.adcode}`
+      Te.features.forEach((Be) => {
+        pt.cityBboxMap[Be.properties.adcode] = bbox(Be), pt.jsonNameObj[Be.properties.adcode] = ec(
+          Be.properties.name,
+          `${Be.properties.adcode}`
         );
       });
     }
     if (e.parentBg) {
-      const pt = adcodeMap[ze].parent;
-      if (pt !== 1e5) {
-        const { res: nt } = yield jsonFetch(
-          s + `/geojson/json/${pt}.json`
-        ), { res: Be } = yield jsonFetch(
-          s + `/geojson/json-lite/${pt}.json`
+      const nt = adcodeMap[je].parent;
+      if (nt !== 1e5) {
+        const { res: Be } = yield jsonFetch(
+          s + `/geojson/json/${nt}.json`
+        ), { res: at } = yield jsonFetch(
+          s + `/geojson/json-lite/${nt}.json`
         );
-        je.geojsonMap[pt] = nt, je.extrudeLineGeojsonMap[pt] = Be, je.bboxMap[pt] = bbox(Be);
+        pt.geojsonMap[nt] = Be, pt.extrudeLineGeojsonMap[nt] = at, pt.bboxMap[nt] = bbox(at);
       }
     }
-    return je;
+    return h && (pt.depthReference = h.depthReference || h.bboxMap[h.adcode]), pt;
   }
   return xi({}, e);
 }), getCityConfig = (s, ...h) => $0(void 0, [s, ...h], function* (c, e = b) {

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.21.9";
+declare const _default: "0.21.11";
 export default _default;

package/dist/vis/all/MaterialList.d.ts

@@ -32,6 +32,7 @@ export default class MaterialList {
     }): void;
     getValidShowObjectListArr(): Meta[];
     emitObject3dChange(): void;
+    setObject3dMeta(key: string, meta: ObjectMeta): void;
     setObject3d(object3d: THREE.Object3D, key: string, meta?: ObjectMeta & {
         disableCheckHide?: boolean;
     }): void;

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

@@ -20,6 +20,7 @@ export interface MapOptions extends BaseOptions {
     continentsBgDepth?: number;
     clickOusideBack?: boolean;
     mapDepth?: number[];
+    depthReference?: number[];
     mapPadding?: number[];
     geojsonMap?: Record<string, GeoJSON>;
     extrudeLineGeojsonMap?: Record<string, GeoJSON>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.21.9",
+  "version": "0.21.11",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version &&PUBLIC_EXCLUDE=public/city bundler",