@skzz/components-gis 0.1.5 → 0.1.6

package/dist/{zz-layer-zzts3d-DqZmLdW3.js → zz-layer-zzts3d-CsIWse3P.js}

@@ -1,7 +1,7 @@
 import { a as e, r as t, u as n } from "./layerStack-CbiVJONn.js";
 import { t as r } from "./pako.esm-D6zcBi67.js";
 import { n as i, t as a } from "./esm-BXiGX6xE.js";
-import { n as o, t as s } from "./zzts3dLayerSignature-Cnu6KIys.js";
+import { n as o, t as s } from "./zzts3dLayerSignature-DzrPeJTd.js";
 import { computed as c, inject as l, onUnmounted as u, ref as d, watch as f } from "vue";
 import { IndexedDBManager as p, httpService as m } from "@skzz/libs-base";
 import h from "axios";

package/dist/{zz-layer-zzts3d-las-hNa-nqxq.js → zz-layer-zzts3d-las-D3w01aGe.js}

@@ -284,7 +284,7 @@ function w(e) {
 }
 var T = class {
 	constructor(e = {}) {
-		this.id = e.layerId, this.pointSize = e.pointSize ?? 2, this.opacity = e.opacity ?? 1, this.colorMode = e.colorMode ?? "auto", this.fixedLevel = e.level ?? null, this.currentPrimitives = [], this.visibleTileKeys = /* @__PURE__ */ new Set(), this.loading = !1, this.pendingRefresh = !1, this.renderGeneration = 0, this.destroyed = !1, this.handlers = null, this.initTimer = null, this.parsedData = null, this.activeColorMode = "single", this.cancelSource = null, this.requestVersion = 0;
+		this.id = e.layerId, this.dataLayerId = e.dataLayerId || e.layerId, this.pointSize = e.pointSize ?? 2, this.opacity = e.opacity ?? 1, this.colorMode = e.colorMode ?? "auto", this.fixedLevel = e.level ?? null, this.currentPrimitives = [], this.visibleTileKeys = /* @__PURE__ */ new Set(), this.loading = !1, this.pendingRefresh = !1, this.renderGeneration = 0, this.destroyed = !1, this.handlers = null, this.initTimer = null, this.parsedData = null, this.activeColorMode = "single", this.cancelSource = null, this.requestVersion = 0;
 	}
 	async init() {
 		this.initTimer = setTimeout(() => {
@@ -385,7 +385,7 @@ var T = class {
 		let t = ++this.requestVersion, n = this.cancelSource;
 		try {
 			let r = viewer.scene.canvas, o = {
-				layerId: this.id,
+				layerId: this.dataLayerId,
 				region: e.join(","),
 				height: String(r.clientHeight),
 				width: String(r.clientWidth)
@@ -412,7 +412,7 @@ var T = class {
 			if (await Promise.all(Array.from({ length: Math.min(g, c.length) }, async () => {
 				for (; d < c.length;) {
 					let e = d++, t = c[e], r = {
-						layerId: this.id,
+						layerId: this.dataLayerId,
 						geosot: t.geosot,
 						level: String(t.level)
 					}, i = Array.isArray(t.shards) ? t.shards.join(",") : t.hcode || "";
@@ -504,7 +504,7 @@ var T = class {
 		if (!t) return console.error("[zzts3d-las] 创建图层失败：缺少 id 参数"), null;
 		if (this.layers.has(t)) {
 			let n = this.layers.get(t);
-			return n.pointSize = e?.pointSize ?? n.pointSize, n.opacity = e?.opacity ?? n.opacity, n.colorMode = e?.colorMode ?? n.colorMode, n;
+			return n.pointSize = e?.pointSize ?? n.pointSize, n.dataLayerId = e?.dataLayerId || t, n.opacity = e?.opacity ?? n.opacity, n.colorMode = e?.colorMode ?? n.colorMode, n;
 		}
 		let n = new T(e);
 		this.layers.set(t, n);
@@ -530,6 +530,7 @@ var T = class {
 	setup(e) {
 		let i = e, a = {
 			layerId: "",
+			dataLayerId: "",
 			colorMode: "auto",
 			pointSize: 2,
 			opacity: 1,
@@ -542,7 +543,7 @@ var T = class {
 			let e = o.value;
 			if (!e.layerId) return;
 			let t = k(e.layerId);
-			t ? (t.pointSize = e.pointSize, t.opacity = e.opacity, t.colorMode = e.colorMode) : await D(e);
+			t ? (t.pointSize = e.pointSize, t.dataLayerId = e.dataLayerId || e.layerId, t.opacity = e.opacity, t.colorMode = e.colorMode) : await D(e);
 		}, l = () => {
 			O(i.config?.layerId || o.value.layerId);
 		};

package/dist/{zz-layer-zzts3d-point-DrB5Uuwa.js → zz-layer-zzts3d-point-BjaTPTqj.js}

@@ -1,6 +1,6 @@
 import { t as e } from "./pako.esm-D6zcBi67.js";
 import { n as t, t as n } from "./esm-BXiGX6xE.js";
-import { n as r, t as i } from "./zzts3dLayerSignature-Cnu6KIys.js";
+import { n as r, t as i } from "./zzts3dLayerSignature-DzrPeJTd.js";
 import { computed as a, inject as o, onUnmounted as s, ref as c, shallowRef as l, watch as u } from "vue";
 import { IndexedDBManager as d, httpService as f, useDataService as p } from "@skzz/libs-base";
 import m from "axios";
@@ -126,7 +126,7 @@ function E(e, t) {
 }
 var D = class {
 	constructor(e, t = !1, n = null, r = "255,255,255", i = 5, a = 1, o = {}) {
-		this.id = e, this.viewer = o.viewer || null, this.isStatic = t, this.loadedTiles = /* @__PURE__ */ new Map(), this.currentTileIds = /* @__PURE__ */ new Set(), this.currentNewLevel = c(n || 15), this.gridDb = null, this.entityNum = 0, this.handlers = null, this.requestController = null, this.pendingRequests = /* @__PURE__ */ new Map(), this.fadeAnimations = /* @__PURE__ */ new Map(), this.lastTime = 0, this.pointSize = i, this.opacity = a, this.fixedLevel = n, this.dictCode = o.dictCode || "", this.serviceName = o.serviceName || "", this.enableServiceColor = o.enableServiceColor === !0, this.modelColorUrl = o.modelColorUrl || "/v1/zzts/style/render/modelColors", this.displayRange = T(o.displayRange), this.modelColorCache = /* @__PURE__ */ new Map(), this.requestVersion = 0, this.destroyed = !1, this.initTimer = null, this.levels_add = window.levels_add_plus || 0, this.tileColor = r, this.tileSleepTime = window.tileSleepTime || 400, this.highlightModelId = null, this.highlightColor = "255,255,0", this.highlightOpacity = 1, this.highlightPointSize = null, this.modelPointIndex = /* @__PURE__ */ new Map(), this.tilePointIndex = /* @__PURE__ */ new Map(), this.modelCollections = /* @__PURE__ */ new Map(), this.renderedPointCount = 0, this.pointBudgetWarned = !1, this.maxRenderPoints = window.zztsPointRenderBudget || 12e5;
+		this.id = e, this.dataLayerId = o.dataLayerId || e, this.viewer = o.viewer || null, this.isStatic = t, this.loadedTiles = /* @__PURE__ */ new Map(), this.currentTileIds = /* @__PURE__ */ new Set(), this.currentNewLevel = c(n || 15), this.gridDb = null, this.entityNum = 0, this.handlers = null, this.requestController = null, this.pendingRequests = /* @__PURE__ */ new Map(), this.fadeAnimations = /* @__PURE__ */ new Map(), this.lastTime = 0, this.pointSize = i, this.opacity = a, this.fixedLevel = n, this.dictCode = o.dictCode || "", this.serviceName = o.serviceName || "", this.enableServiceColor = o.enableServiceColor === !0, this.modelColorUrl = o.modelColorUrl || "/v1/zzts/style/render/modelColors", this.displayRange = T(o.displayRange), this.modelColorCache = /* @__PURE__ */ new Map(), this.requestVersion = 0, this.destroyed = !1, this.initTimer = null, this.levels_add = window.levels_add_plus || 0, this.tileColor = r, this.tileSleepTime = window.tileSleepTime || 400, this.highlightModelId = null, this.highlightColor = "255,255,0", this.highlightOpacity = 1, this.highlightPointSize = null, this.modelPointIndex = /* @__PURE__ */ new Map(), this.tilePointIndex = /* @__PURE__ */ new Map(), this.modelCollections = /* @__PURE__ */ new Map(), this.renderedPointCount = 0, this.pointBudgetWarned = !1, this.maxRenderPoints = window.zztsPointRenderBudget || 12e5;
 	}
 	getBaseStyle() {
 		return {
@@ -435,7 +435,7 @@ var D = class {
 			cacheId: i,
 			data: (await f.request({
 				method: "GET",
-				url: `/v1/zzts/layer/3d/point/getTileNew?layerId=${this.id}&level=${t}&geosot=${e}`,
+				url: `/v1/zzts/layer/3d/point/getTileNew?layerId=${encodeURIComponent(this.dataLayerId)}&level=${t}&geosot=${e}`,
 				headers: { Accept: "application/octet-stream" },
 				responseType: "arraybuffer",
 				timeout: 6e4,
@@ -581,7 +581,7 @@ var D = class {
 		if (this.layers.has(t)) {
 			console.warn(`图层 ${t} 已存在`);
 			let o = this.layers.get(t), s = r(o.renderSignature, e || {});
-			return n && (o.tileColor = n), o.dictCode = e?.dictCode || o.dictCode || "", o.serviceName = e?.serviceName || o.serviceName || "", e?.displayRange !== void 0 && (o.displayRange = T(e.displayRange)), e?.enableServiceColor !== void 0 && (o.enableServiceColor = !!e.enableServiceColor), o.modelColorUrl = e?.modelColorUrl || o.modelColorUrl || "/v1/zzts/style/render/modelColors", a != null && (o.fixedLevel = a, o.currentNewLevel.value = a), s && (o.renderSignature = i(e || {}), o.modelColorCache.clear(), o.clearAllTiles(), o.getViewportInfo()), o;
+			return n && (o.tileColor = n), o.dictCode = e?.dictCode || o.dictCode || "", o.dataLayerId = e?.dataLayerId || t, o.serviceName = e?.serviceName || o.serviceName || "", e?.displayRange !== void 0 && (o.displayRange = T(e.displayRange)), e?.enableServiceColor !== void 0 && (o.enableServiceColor = !!e.enableServiceColor), o.modelColorUrl = e?.modelColorUrl || o.modelColorUrl || "/v1/zzts/style/render/modelColors", a != null && (o.fixedLevel = a, o.currentNewLevel.value = a), s && (o.renderSignature = i(e || {}), o.modelColorCache.clear(), o.clearAllTiles(), o.getViewportInfo()), o;
 		}
 		let l = new D(t, o, a, n, s, c, e);
 		l.renderSignature = i(e || {}), this.layers.set(t, l);
@@ -637,6 +637,7 @@ var M = {
 		p();
 		let i = e, d = t, m = l(null), h = l(null), g = c(null), _ = 0, v = 0, y = null, b = !1, x = {
 			layerId: "",
+			dataLayerId: "",
 			color: "255,255,255",
 			isStatic: !1,
 			level: null,
@@ -676,6 +677,7 @@ var M = {
 			let t = e.level ? !0 : e.isStatic;
 			return {
 				layerId: e.layerId,
+				dataLayerId: e.dataLayerId || e.layerId,
 				color: e.color,
 				isStatic: t,
 				level: e.level,