vis-core 0.21.57 → 0.21.59

package/dist/index.module.js

@@ -55,9 +55,9 @@ import CryptoJS from "crypto-js";
 import { makePromiseCreator, WorkerPool, generateUUID as generateUUID$1 } from "esus-lite";
 import { EventEmitter } from "events";
 import { throttle } from "lodash-es";
+import { union, centroid, booleanPointInPolygon as booleanPointInPolygon$1, point, polygon, bbox, center, flatten as flatten$3, explode, inside, intersect as intersect$1, booleanContains, lineString, booleanCrosses } from "@turf/turf";
 import json100000 from "geojson-cn/extra/100000-lite-next.json";
 import countries from "geojson-cn/extra/countries-next.json";
-import { union, centroid, booleanPointInPolygon as booleanPointInPolygon$1, point, polygon, center, flatten as flatten$3, explode, inside, intersect as intersect$1, booleanContains, lineString, booleanCrosses, bbox } from "@turf/turf";
 import continents from "geojson-cn/extra/continents.json";
 import { adcodeMap, findLevelJsonItem, allArr } from "geojson-cn";
 import chinaJson from "geojson-cn/extra/100000-next.json";
@@ -89,7 +89,7 @@ const publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRz
     ).toString(CryptoJS.enc.Utf8), Jt = JSON.parse(Tt), $t = Date.now();
     return !Jt.s || Jt.s > $t ? (this.token = void 0, "") : Jt.e && Jt.e < $t ? (this.token = void 0, "") : (Jt.isValid = Yt, Jt);
   }
-}, version = "0.21.57";
+}, version = "0.21.59";
 /**
  * @license
  * Copyright 2010-2024 Three.js Authors
@@ -49478,7 +49478,7 @@ const compareVersion = (c, e) => {
   }), compareVersion(c.c.version, "0.21.24") === -1 && c.h.u[0] && c.h.u[0].visType === "map" && (f = (r = c.v) == null ? void 0 : r.eo) != null && f.parentBgCurvatureResolution && (delete c.v.eo.parentBgCurvatureResolution, c.v.eo.parentBgTopSegments = 400), c;
 }, jsonFetch = (c, e, s = !1) => {
   const r = makePromiseCreator(!0), f = c.endsWith("gzip") || s;
-  return fetch(c).then((st) => {
+  return window.fetch(c).then((st) => {
     let ct = st;
     if (ct.ok)
       return f ? ct.blob().then((Zt) => {
@@ -51836,16 +51836,23 @@ const objs$4 = Ui(hi({}, 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));
   }
-  getDepth(s) {
-    const r = this.getAdcodeShowLevel(s);
-    let f = this.options.mapDepth;
-    Array.isArray(f) || (f = new Array(3).fill(f));
-    let st;
-    if (r === "country" ? st = f[0] : r === "province" ? st = f[1] : st = f[2], this.options.depthReference && this.options.bboxMap[s]) {
-      const ct = this.options.depthReference, Zt = this.options.bboxMap[s], Wt = Math.abs(Zt[3] - Zt[1]) / Math.abs(ct[3] - ct[1]), Yt = Math.abs(Zt[2] - Zt[0]) / Math.abs(ct[2] - ct[0]);
-      st = st * Math.max(Wt, Yt);
+  getDepth(s, r) {
+    const f = this.getAdcodeShowLevel(s);
+    let st = this.options.mapDepth;
+    Array.isArray(st) || (st = new Array(3).fill(st));
+    let ct;
+    if (f === "country" ? ct = st[0] : f === "province" ? ct = st[1] : ct = st[2], this.options.depthReference && this.options.bboxMap[s]) {
+      const Zt = this.options.depthReference, Wt = this.options.bboxMap[s];
+      ct = ct * this.getReferenceScale(Zt, Wt);
+    } else if (this.mapHistory.length && this.options.bboxMap[this.mapHistory[0].mapInfo.adcode]) {
+      const Zt = this.options.bboxMap[this.mapHistory[0].mapInfo.adcode], Wt = bbox(r), Yt = this.getReferenceScale(Zt, Wt);
+      ct = ct * Yt;
     }
-    return st;
+    return ct;
+  }
+  getReferenceScale(s, r) {
+    const f = Math.abs(r[3] - r[1]) / Math.abs(s[3] - s[1]), st = Math.abs(r[2] - r[0]) / Math.abs(s[2] - s[0]);
+    return Math.max(f, st);
   }
   getAdcodeShowLevel(s) {
     var r;
@@ -51986,7 +51993,7 @@ const objs$4 = Ui(hi({}, objs$5), {
           }), this.eraseLabels(), this.map && (this.options.drillDownHideParent && this.parentBg.forEach((r0) => {
             r0.hide();
           }), this.options.showOneLevel ? this.map.hide() : this.map.deactive(), this.options.handleBackKeepCamvasState && this.saveBackCamvasState(-1));
-          const qe = this.mapHistory.length, t0 = qe - 1, e0 = this.getDepth(s), i0 = (Jt = this.mapHistory[t0]) == null ? void 0 : Jt.depth, n0 = qe === 0 ? 0 : this.mapHistory[t0].z + (this.options.showOneLevel ? 0 : i0), s0 = qe === 0 ? 0 : n0 - e0, a0 = center(Je).geometry.coordinates, [h0, m0] = this.projection(a0), V0 = yield this.drawPlaneMap({
+          const qe = this.mapHistory.length, t0 = qe - 1, e0 = this.getDepth(s, de || Je), i0 = (Jt = this.mapHistory[t0]) == null ? void 0 : Jt.depth, n0 = qe === 0 ? 0 : this.mapHistory[t0].z + (this.options.showOneLevel ? 0 : i0), s0 = qe === 0 ? 0 : n0 - e0, a0 = center(Je).geometry.coordinates, [h0, m0] = this.projection(a0), V0 = yield this.drawPlaneMap({
             geojson: Je,
             extrudeLineGeojson: de,
             depth: e0,
@@ -52039,42 +52046,40 @@ const objs$4 = Ui(hi({}, objs$5), {
       azimuthAngle: f,
       enableTransition: st = !0
     } = {}) {
-      var Je, de, Ke;
+      var Qe, Je, de;
       if (!(s != null && s.object3d)) return;
-      const Zt = (de = this.options.lookAtMap) == null ? void 0 : de[(Je = this.mapInfo) == null ? void 0 : Je.adcode];
+      const Zt = (Je = this.options.lookAtMap) == null ? void 0 : Je[(Qe = this.mapInfo) == null ? void 0 : Qe.adcode];
       if (Zt) {
-        const [_e, $e, qe, t0, e0, i0] = Zt;
-        yield (Ke = this.pencil.controls) == null ? void 0 : Ke.setLookAt(
+        const [Ke, _e, $e, qe, t0, e0] = Zt;
+        yield (de = this.pencil.controls) == null ? void 0 : de.setLookAt(
+          Ke,
           _e,
           $e,
           qe,
           t0,
           e0,
-          i0,
           st
         );
         return;
       }
       const Wt = this.options.mapPadding, { height: Yt, width: vt } = this.pencil.getSize();
       Yt < Wt[0] + Wt[2] + 100 && (Wt[0] = 0, Wt[2] = 0), vt < Wt[1] + Wt[3] + 100 && (Wt[1] = 0, Wt[3] = 0);
-      const Tt = r || this.options.polarAngle, Jt = f || this.options.azimuthAngle, $t = this.pencil.controls.azimuthAngle, Xe = this.pencil.controls.polarAngle, Qe = $t !== Jt || Xe !== Tt;
-      yield Promise.all(
-        [
-          this.paddingInCssPixel(
-            s,
-            Wt[0],
-            Wt[1],
-            Wt[2],
-            Wt[3],
-            st
-          ),
-          Qe && this.pencil.controls.rotateTo(
-            $t + this.absoluteAngle(Jt, $t),
-            Xe + this.absoluteAngle(Tt, Xe),
-            st
-          )
-        ].filter(Boolean)
-      );
+      const Tt = r || this.options.polarAngle, Jt = f || this.options.azimuthAngle, $t = this.pencil.controls.azimuthAngle, Xe = this.pencil.controls.polarAngle;
+      yield Promise.all([
+        this.paddingInCssPixel(
+          s,
+          Wt[0],
+          Wt[1],
+          Wt[2],
+          Wt[3],
+          st
+        ),
+        this.pencil.controls.rotateTo(
+          $t + this.absoluteAngle(Jt, $t),
+          Xe + this.absoluteAngle(Tt, Xe),
+          st
+        )
+      ]);
     });
   }
   paddingInCssPixel(s, r, f, st, ct, Zt) {
@@ -55476,9 +55481,7 @@ const getMapConfig = (r, ...f) => ti(void 0, [r, ...f], function* (c, e = b, s)
   }
   return hi({}, e);
 }), getCityConfig = (s, ...r) => ti(void 0, [s, ...r], function* (c, e = b) {
-  const f = adcodeMap[c], st = yield fetch(
-    e + `/geojson/json-lite/${c}.json`
-  ).then((Wt) => Wt.json()), ct = bbox(st), { name: Zt } = adcodeMap[c];
+  const f = adcodeMap[c], st = yield window.fetch(e + `/geojson/json-lite/${c}.json`).then((Wt) => Wt.json()), ct = bbox(st), { name: Zt } = adcodeMap[c];
   return {
     center: [f.lng, f.lat],
     adcode: f.adcode,

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.21.57";
+declare const _default: "0.21.59";
 export default _default;

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

@@ -148,7 +148,8 @@ export default class extends Base {
     planeShadow?: BaseObject;
     shadowMapEnabled(): Promise<void>;
     shadowMapDisabled(): void;
-    getDepth(adcode: number): number;
+    getDepth(adcode: number, geojson: GeoJSON): number;
+    getReferenceScale(bboxa: number[], bboxb: number[]): number;
     getAdcodeShowLevel(adcode: number): string;
     handleClick(e: MouseEvent): void;
     beforeClickArea(adcodes: number[]): boolean;

package/package.json

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