vis-core 0.21.51 → 0.21.53

package/dist/index.module.js

@@ -89,7 +89,7 @@ const publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRz
     ).toString(CryptoJS.enc.Utf8), de = JSON.parse($t), Xe = Date.now();
     return !de.s || de.s > Xe ? (this.token = void 0, "") : de.e && de.e < Xe ? (this.token = void 0, "") : (de.isValid = Tt, de);
   }
-}, version = "0.21.51";
+}, version = "0.21.53";
 /**
  * @license
  * Copyright 2010-2024 Three.js Authors
@@ -30167,7 +30167,7 @@ var ce$1 = Object.defineProperty, fe$1 = Object.defineProperties, he$1 = Object.
       me.call(e, s) && Q$1(st, s, e[s]);
   return st;
 }, Y$1 = (st, e) => fe$1(st, he$1(e));
-const j$2 = new Vector4(), te = new Vector3(), ie = new Vector3(), y = new Vector4(), x$3 = new Vector4(), I$2 = new Vector4(), $$1 = new Vector3(), k$2 = new Matrix4(), M$3 = new Line3(), ne = new Vector3(), E$1 = new Box3(), G$1 = new Sphere$1(), B$1 = new Vector4();
+const j$2 = new Vector4(), te = new Vector3(), ie = new Vector3(), y = new Vector4(), x$3 = new Vector4(), I$2 = new Vector4(), $$2 = new Vector3(), k$2 = new Matrix4(), M$3 = new Line3(), ne = new Vector3(), E$1 = new Box3(), G$1 = new Sphere$1(), B$1 = new Vector4();
 let V$1, L$2;
 function re(st, e, s) {
   return B$1.set(0, 0, -e, 1).applyMatrix4(st.projectionMatrix), B$1.multiplyScalar(1 / B$1.w), B$1.x = L$2 / s.width, B$1.y = L$2 / s.height, B$1.applyMatrix4(st.projectionMatrixInverse), B$1.multiplyScalar(1 / B$1.w), Math.abs(Math.max(B$1.x, B$1.y));
@@ -30191,7 +30191,7 @@ function Te$2(st, e) {
 }
 function De$1(st, e, s) {
   const c = e.projectionMatrix, ct = st.material.resolution, Zt = st.matrixWorld, Wt = st.geometry, Yt = Wt.attributes.instanceStart, vt = Wt.attributes.instanceEnd, Tt = Math.min(Wt.instanceCount, Yt.count), Jt = -e.near;
-  V$1.at(1, I$2), I$2.w = 1, I$2.applyMatrix4(e.matrixWorldInverse), I$2.applyMatrix4(c), I$2.multiplyScalar(1 / I$2.w), I$2.x *= ct.x / 2, I$2.y *= ct.y / 2, I$2.z = 0, $$1.copy(I$2), k$2.multiplyMatrices(e.matrixWorldInverse, Zt);
+  V$1.at(1, I$2), I$2.w = 1, I$2.applyMatrix4(e.matrixWorldInverse), I$2.applyMatrix4(c), I$2.multiplyScalar(1 / I$2.w), I$2.x *= ct.x / 2, I$2.y *= ct.y / 2, I$2.z = 0, $$2.copy(I$2), k$2.multiplyMatrices(e.matrixWorldInverse, Zt);
   for (let $t = 0, de = Tt; $t < de; $t++) {
     if (y.fromBufferAttribute(Yt, $t), x$3.fromBufferAttribute(vt, $t), y.w = 1, x$3.w = 1, y.applyMatrix4(k$2), x$3.applyMatrix4(k$2), y.z > Jt && x$3.z > Jt)
       continue;
@@ -30203,9 +30203,9 @@ function De$1(st, e, s) {
       x$3.lerp(y, Qe);
     }
     y.applyMatrix4(c), x$3.applyMatrix4(c), y.multiplyScalar(1 / y.w), x$3.multiplyScalar(1 / x$3.w), y.x *= ct.x / 2, y.y *= ct.y / 2, x$3.x *= ct.x / 2, x$3.y *= ct.y / 2, M$3.start.copy(y), M$3.start.z = 0, M$3.end.copy(x$3), M$3.end.z = 0;
-    const Xe = M$3.closestPointToPointParameter($$1, !0);
+    const Xe = M$3.closestPointToPointParameter($$2, !0);
     M$3.at(Xe, ne);
-    const Ke = MathUtils.lerp(y.z, x$3.z, Xe), $e = Ke >= -1 && Ke <= 1, _e = $$1.distanceTo(ne) < L$2 * 0.5;
+    const Ke = MathUtils.lerp(y.z, x$3.z, Xe), $e = Ke >= -1 && Ke <= 1, _e = $$2.distanceTo(ne) < L$2 * 0.5;
     if ($e && _e) {
       M$3.start.fromBufferAttribute(Yt, $t), M$3.end.fromBufferAttribute(vt, $t), M$3.start.applyMatrix4(Zt), M$3.end.applyMatrix4(Zt);
       const Je = new Vector3(), Qe = new Vector3();
@@ -33852,7 +33852,7 @@ function wt(st, e) {
 function Q(st) {
   return isFinite(st) ? st : st < 0 ? -Number.MAX_VALUE : Number.MAX_VALUE;
 }
-function $(st) {
+function $$1(st) {
   return Math.abs(st) < Number.MAX_VALUE ? st : st * (1 / 0);
 }
 function rt(st, e, s, c, ct = 1 / 0, Zt) {
@@ -35306,7 +35306,7 @@ class Y extends fe {
    */
   fromJSON(e, s = !1) {
     const c = JSON.parse(e);
-    this.enabled = c.enabled, this.minDistance = c.minDistance, this.maxDistance = $(c.maxDistance), this.minZoom = c.minZoom, this.maxZoom = $(c.maxZoom), this.minPolarAngle = c.minPolarAngle, this.maxPolarAngle = $(c.maxPolarAngle), this.minAzimuthAngle = $(c.minAzimuthAngle), this.maxAzimuthAngle = $(c.maxAzimuthAngle), this.smoothTime = c.smoothTime, this.draggingSmoothTime = c.draggingSmoothTime, this.dollySpeed = c.dollySpeed, this.truckSpeed = c.truckSpeed, this.dollyToCursor = c.dollyToCursor, this.verticalDragToForward = c.verticalDragToForward, this._target0.fromArray(c.target0), this._position0.fromArray(c.position0), this._zoom0 = c.zoom0, this._focalOffset0.fromArray(c.focalOffset0), this.moveTo(c.target[0], c.target[1], c.target[2], s), z.setFromVector3(
+    this.enabled = c.enabled, this.minDistance = c.minDistance, this.maxDistance = $$1(c.maxDistance), this.minZoom = c.minZoom, this.maxZoom = $$1(c.maxZoom), this.minPolarAngle = c.minPolarAngle, this.maxPolarAngle = $$1(c.maxPolarAngle), this.minAzimuthAngle = $$1(c.minAzimuthAngle), this.maxAzimuthAngle = $$1(c.maxAzimuthAngle), this.smoothTime = c.smoothTime, this.draggingSmoothTime = c.draggingSmoothTime, this.dollySpeed = c.dollySpeed, this.truckSpeed = c.truckSpeed, this.dollyToCursor = c.dollyToCursor, this.verticalDragToForward = c.verticalDragToForward, this._target0.fromArray(c.target0), this._position0.fromArray(c.position0), this._zoom0 = c.zoom0, this._focalOffset0.fromArray(c.focalOffset0), this.moveTo(c.target[0], c.target[1], c.target[2], s), z.setFromVector3(
       P$1.fromArray(c.position).sub(this._targetEnd).applyQuaternion(this._yAxisUpSpace)
     ), this.rotateTo(z.theta, z.phi, s), this.dollyTo(z.radius, s), this.zoomTo(c.zoom, s), this.setFocalOffset(
       c.focalOffset[0],
@@ -47761,7 +47761,7 @@ function o(st) {
     }));
   };
 }
-class YZ {
+class ul {
   constructor(e) {
     this.pluginName = "draw", this.objMap = /* @__PURE__ */ new Map(), this.targetNullMap = /* @__PURE__ */ new Map(), this.objects = /* @__PURE__ */ new Map(), this.objectNamesToFactories = /* @__PURE__ */ new Map(), this.pickFunctionsMapIndex = -1, this.pickFunctionsMap = {}, this.pickListener = {
       move: !1,
@@ -48052,7 +48052,7 @@ const k = (st) => {
     );
   }), e;
 };
-class LZ {
+class sl {
   constructor(e) {
     this.pluginName = "worker", this.bufferGeometryLoader = new BufferGeometryLoader(), this.cacheObj = {}, this._dispose = !1, this.options = L({
       dbName: "base",
@@ -48143,15 +48143,37 @@ class n extends Loader {
     ), Zt;
   }
 }
-const q = {
+class q extends Loader {
+  constructor(e) {
+    super(e);
+  }
+  load(e, s, c, ct) {
+    const Zt = new FileLoader(this.manager);
+    Zt.setResponseType("blob"), Zt.setRequestHeader(this.requestHeader), Zt.setPath(this.path), Zt.setWithCredentials(this.withCredentials), Zt.load(
+      e,
+      (Wt) => {
+        const Yt = Wt, vt = new DecompressionStream("gzip"), Tt = Yt.stream().pipeThrough(vt);
+        new Response(Tt).json().then((Jt) => {
+          s == null || s(Jt);
+        }).catch((Jt) => {
+          ct == null || ct(Jt);
+        });
+      },
+      c,
+      ct
+    );
+  }
+}
+const $ = {
   images: ["png", "jpg", "jpeg", "ico", "webp", "avif"],
   media: ["mp4", "webm", "ogg"],
   gltf: ["gltf", "glb"],
   json: ["json", "geojson"],
+  gzipJson: ["json.gzip"],
   exr: ["exr"],
   lottie: ["lottie.json"]
 };
-class sZ {
+class al {
   constructor(e = {}) {
     this.pluginName = "loader", this.loadObj = [], this.delLoadArr = [], this.assets = /* @__PURE__ */ new Map(), this.event = new P$2.EventEmitter(), this.options = {}, this.options = L({
       simpleTexture4deleted: !1,
@@ -48191,8 +48213,10 @@ class sZ {
     if (c) {
       if (e.endsWith("lottie.json"))
         return "lottie";
+      if (e.endsWith("json.gzip"))
+        return "gzipJson";
     } else return;
-    for (const [ct, Zt] of Object.entries(q))
+    for (const [ct, Zt] of Object.entries($))
       if (Zt.includes(c))
         return ct;
   }
@@ -48210,6 +48234,8 @@ class sZ {
       return this.gltfLoader || (this.gltfLoader = new GLTFLoader(this.loadingManager), this.options.prefix && this.gltfLoader.setPath(this.options.prefix)), this.gltfLoader;
     if (e === "lottie")
       return this.lottieLoader || (this.lottieLoader = new LottieLoader(this.loadingManager), this.options.prefix && this.lottieLoader.setPath(this.options.prefix)), this.lottieLoader;
+    if (e === "gzipJson")
+      return this.gzipJsonLoader || (this.gzipJsonLoader = new q(this.loadingManager), this.options.prefix && this.gzipJsonLoader.setPath(this.options.prefix)), this.gzipJsonLoader;
     if (e === "json")
       return this.jsonLoader || (this.jsonLoader = new FileLoader(this.loadingManager), this.jsonLoader.setResponseType("json"), this.options.prefix && this.jsonLoader.setPath(this.options.prefix)), this.jsonLoader;
     if (e === "exr")
@@ -49398,18 +49424,21 @@ const compareVersion = (st, e) => {
       Zt.attributeName = Zt.attributeName.replace(Wt, `caId.${Wt}`);
     }
   }), compareVersion(st.c.version, "0.21.24") === -1 && st.h.u[0] && st.h.u[0].visType === "map" && (ct = (c = st.v) == null ? void 0 : c.eo) != null && ct.parentBgCurvatureResolution && (delete st.v.eo.parentBgCurvatureResolution, st.v.eo.parentBgTopSegments = 400), st;
-}, jsonFetch = (st, e) => {
-  const s = makePromiseCreator(!0);
-  return fetch(st).then((c) => {
-    let ct = c;
-    if (ct.ok)
-      return ct.json();
+}, jsonFetch = (st, e, s = !1) => {
+  const c = makePromiseCreator(!0), ct = st.endsWith("gzip") || s;
+  return fetch(st).then((Zt) => {
+    let Wt = Zt;
+    if (Wt.ok)
+      return ct ? Wt.blob().then((Yt) => {
+        const vt = new DecompressionStream("gzip"), Tt = Yt.stream().pipeThrough(vt);
+        return new Response(Tt);
+      }) : Wt;
     throw new Error("Network response was not ok.");
-  }).then((c) => {
-    s.resolve(c);
-  }).catch((c) => {
-    s.reject(c);
-  }), s.promise;
+  }).then((Zt) => Zt.json()).then((Zt) => {
+    c.resolve(Zt);
+  }).catch((Zt) => {
+    c.reject(Zt);
+  }), c.promise;
 };
 class Editor {
   constructor(e) {
@@ -50050,7 +50079,7 @@ class Base extends Event {
     J0(this, "delLoadArr");
     J0(this, "extendsOptions", {});
     J0(this, "pencil");
-    J0(this, "drawController", new YZ(objs$5));
+    J0(this, "drawController", new ul(objs$5));
     J0(this, "mList");
     J0(this, "loader");
     J0(this, "worker");
@@ -50202,12 +50231,12 @@ class Base extends Event {
     }));
   }
   initPencilPlugin() {
-    this.mList = new MaterialList(), this.loader = new sZ(mi({
+    this.mList = new MaterialList(), this.loader = new al(mi({
       prefix: this.options.assetsPrefix,
       simpleTexture4deleted: !0
     }, this.tier0 ? {
       anisotropy: 1
-    } : {})), this.worker = new LZ({
+    } : {})), this.worker = new sl({
       dbName: this.visName,
       cacheVersion: version
     }), this.delLoadArr && (this.loader.delLoadArr = this.delLoadArr), this.loader.on("progress", (...s) => {
@@ -51208,7 +51237,7 @@ const objs$4 = Bi(mi({}, objs$5), {
   constructor() {
     super(...arguments);
     //@ts-ignore
-    J0(this, "drawController", new YZ(objs$4));
+    J0(this, "drawController", new ul(objs$4));
     J0(this, "mapHistory", []);
     J0(this, "activePlaneMap", null);
     J0(this, "isAnimating", !1);
@@ -53475,7 +53504,7 @@ class Map$1 extends Map$2 {
   constructor() {
     super(...arguments);
     //@ts-ignore
-    J0(this, "drawController", new YZ(objs$3));
+    J0(this, "drawController", new ul(objs$3));
     J0(this, "initSettingsObj", {
       label: !1,
       labelLite: !1,
@@ -53878,7 +53907,7 @@ class City$1 extends Base {
   constructor() {
     super(...arguments);
     //@ts-ignore
-    J0(this, "drawController", new YZ(objs$2));
+    J0(this, "drawController", new ul(objs$2));
     J0(this, "adcode", 0);
     J0(this, "pcenter", [104, 37.5]);
     J0(this, "pscale", 5e4);
@@ -53924,10 +53953,10 @@ class City$1 extends Base {
   loaderAddJson(s) {
     this.loader.add(
       [
-        this.options.showBuilding && `/city/Building${s}.json`,
-        this.options.showRoad && `/city/Road${s}.json`,
-        this.options.showRiver && `/city/River${s}.json`,
-        this.options.showGrassland && `/city/Grassland${s}.json`
+        this.options.showBuilding && `/cityGzip/Building${s}.json.gzip`,
+        this.options.showRoad && `/cityGzip/Road${s}.json.gzip`,
+        this.options.showRiver && `/cityGzip/River${s}.json.gzip`,
+        this.options.showGrassland && `/cityGzip/Grassland${s}.json.gzip`
       ].filter(Boolean),
       {
         // cacheVersion: '1',
@@ -54072,7 +54101,11 @@ class City$1 extends Base {
   }
   initVis() {
     return ii(this, null, function* () {
-      const { fitTo: s, jsonName: c, bbox: ct, planeOut: Zt } = this.options, Wt = this.adcode, Yt = this.loader, vt = Yt.getAsset(`/city/Building${c}.json`), Tt = Yt.getAsset(`/city/Road${c}.json`), Jt = Yt.getAsset(`/city/River${c}.json`), $t = Yt.getAsset(`/city/Grassland${c}.json`), de = {};
+      const { fitTo: s, jsonName: c, bbox: ct, planeOut: Zt } = this.options, Wt = this.adcode, Yt = this.loader, vt = Yt.getAsset(
+        `/cityGzip/Building${c}.json.gzip`
+      ), Tt = Yt.getAsset(`/cityGzip/Road${c}.json.gzip`), Jt = Yt.getAsset(`/cityGzip/River${c}.json.gzip`), $t = Yt.getAsset(
+        `/cityGzip/Grassland${c}.json.gzip`
+      ), de = {};
       [
         ...(Jt == null ? void 0 : Jt.features) || [],
         ...($t == null ? void 0 : $t.features) || []
@@ -54862,7 +54895,7 @@ const objs$1 = Bi(mi({}, objs$5), {
   constructor() {
     super(...arguments);
     //@ts-ignore
-    J0(this, "drawController", new YZ(objs$1));
+    J0(this, "drawController", new ul(objs$1));
     J0(this, "leftTruck", !1);
     J0(this, "extendsOptions", {
       mapDepth: () => this.options.mapDepth
@@ -55109,7 +55142,7 @@ const objs = Bi(mi({}, objs$5), {
     super(...arguments);
     J0(this, "leftTruck", !1);
     //@ts-ignore
-    J0(this, "drawController", new YZ(objs));
+    J0(this, "drawController", new ul(objs));
     J0(this, "autoRotateSpeed", 0);
     J0(this, "initSettingsObj", {
       autoRotate: !1

package/dist/utils/jsonFetch.d.ts

@@ -3,5 +3,5 @@ type DownloadProgress = {
     transferredBytes: number;
     totalBytes: number;
 };
-declare const _default: (url: string, onDownloadProgress?: (progress: DownloadProgress) => void) => Promise<any>;
+declare const _default: (url: string, onDownloadProgress?: (progress: DownloadProgress) => void, gizp?: boolean) => Promise<any>;
 export default _default;

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.21.51";
+declare const _default: "0.21.53";
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.21.51",
+  "version": "0.21.53",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version &&PUBLIC_EXCLUDE=public/city bundler",
@@ -8,6 +8,7 @@
     "build:type": "BUILD_LIBRARY=src/sdk/index.ts bundler-type",
     "preview": "bundler-preview",
     "version": "node ./scripts/generate-version",
+    "gzip": "node ./scripts/gzip",
     "getPublic": "node ./scripts/getPublic",
     "start:3dSite": "npm run version &&  VITE_SITE_3D=true  bundler-dev",
     "build:3dSite": "npm run version && VITE_SITE_3D=true bundler",
@@ -43,7 +44,7 @@
     "archiver": "^7.0.1",
     "dayjs": "^1.11.12",
     "eslint-config-bundler": "^0.4.2",
-    "esus": "^0.4.35",
+    "esus": "^0.4.40",
     "fs-extra": "^11.1.1",
     "idb-keyval": "^6.2.1",
     "pinia": "^2.2.4",
@@ -66,7 +67,7 @@
     "esus-lite": "^0.2.8",
     "events": "^3.3.0",
     "geojson-cn": "^0.1.29",
-    "gl-draw": "0.11.34",
+    "gl-draw": "0.11.35",
     "jsrsasign": "^11.1.0",
     "lodash-es": "^4.17.21"
   },