bbl-mapbox-react 0.0.21 → 0.0.22

package/dist/index.mjs

@@ -1781,8 +1781,8 @@ var CanvasImageRenderer = class extends BaseCanvasRenderer {
 		if (d === 0) return Math.sqrt((r - a) * (r - a) + (i - o) * (i - o));
 		let f = ((r - a) * l + (i - o) * u) / d;
 		f = Math.max(0, Math.min(1, f));
-		let p = a + f * l, ve = o + f * u;
-		return Math.sqrt((r - p) * (r - p) + (i - ve) * (i - ve));
+		let p = a + f * l, m = o + f * u;
+		return Math.sqrt((r - p) * (r - p) + (i - m) * (i - m));
 	}
 	update(t) {
 		let n = this.entity;
@@ -3932,8 +3932,8 @@ var RectangleRenderer = class e {
 	}
 };
 const EntityPopup = ({ popupState: e, onClose: r, portalContainer: i, popupRef: s }) => {
-	let c = useRef(null), [l, u] = useState("entering"), [d, p] = useState(!1), m = useRef(e.position), h = useRef(!1), g = s || c;
-	h.current || (m.current = e.position), useEffect(() => {
+	let c = useRef(null), [l, u] = useState("entering"), [d, p] = useState(!1), h = useRef(e.position), g = useRef(!1), _ = s || c;
+	g.current || (h.current = e.position), useEffect(() => {
 		let e = setTimeout(() => {
 			p(!0);
 		}, 60);
@@ -3944,19 +3944,19 @@ const EntityPopup = ({ popupState: e, onClose: r, portalContainer: i, popupRef:
 			return () => clearTimeout(e);
 		}
 	}, [l, d]);
-	let _ = useCallback(() => {
-		e.config.animation === "none" ? r() : (h.current = !0, u("exiting"), setTimeout(() => r(), 200));
+	let v = useCallback(() => {
+		e.config.animation === "none" ? r() : (g.current = !0, u("exiting"), setTimeout(() => r(), 200));
 	}, [e.config.animation, r]);
 	useEffect(() => {
 		if (!e.config.closeOnEscape) return;
 		let t = (e) => {
-			e.key === "Escape" && _();
+			e.key === "Escape" && v();
 		};
 		return document.addEventListener("keydown", t), () => document.removeEventListener("keydown", t);
-	}, [e.config.closeOnEscape, _]), useEffect(() => {
+	}, [e.config.closeOnEscape, v]), useEffect(() => {
 		if (!e.config.closeOnClickOutside) return;
 		let t = (e) => {
-			g.current && !g.current.contains(e.target) && _();
+			_.current && !_.current.contains(e.target) && v();
 		}, n = setTimeout(() => {
 			document.addEventListener("click", t, !0);
 		}, 0);
@@ -3965,10 +3965,10 @@ const EntityPopup = ({ popupState: e, onClose: r, portalContainer: i, popupRef:
 		};
 	}, [
 		e.config.closeOnClickOutside,
-		_,
-		g
+		v,
+		_
 	]);
-	let v = () => {
+	let y = () => {
 		switch (e.actualPosition) {
 			case "top": return "center bottom";
 			case "bottom": return "center top";
@@ -3977,25 +3977,25 @@ const EntityPopup = ({ popupState: e, onClose: r, portalContainer: i, popupRef:
 			case "center":
 			default: return "center center";
 		}
-	}, y = m.current, b = /* @__PURE__ */ jsxs("div", {
-		ref: g,
+	}, b = h.current, x = /* @__PURE__ */ jsxs("div", {
+		ref: _,
 		className: `entity-popup ${d ? `entity-popup--${l} animation-${e.config.animation}` : ""} ${e.config.className || ""}`,
 		style: {
 			position: "fixed",
-			left: `${y.x}px`,
-			top: `${y.y}px`,
+			left: `${b.x}px`,
+			top: `${b.y}px`,
 			maxWidth: e.config.maxWidth,
 			zIndex: e.config.zIndex,
 			pointerEvents: "all",
 			opacity: d ? void 0 : 0,
-			transformOrigin: v(),
+			transformOrigin: y(),
 			...e.config.style
 		},
 		role: "dialog",
 		"aria-modal": "true",
 		children: [e.config.showCloseButton && /* @__PURE__ */ jsx("button", {
 			className: "entity-popup__close",
-			onClick: _,
+			onClick: v,
 			"aria-label": "Close popup",
 			children: "×"
 		}), /* @__PURE__ */ jsx("div", {
@@ -4003,24 +4003,24 @@ const EntityPopup = ({ popupState: e, onClose: r, portalContainer: i, popupRef:
 			children: e.config.content
 		})]
 	});
-	return createPortal(b, i);
+	return createPortal(x, i);
 };
 var location_default = "data:image/svg+xml,%3csvg%20xmlns='http://www.w3.org/2000/svg'%20xmlns:xlink='http://www.w3.org/1999/xlink'%20t='1768373933818'%20class='icon'%20viewBox='0%200%201024%201024'%20version='1.1'%20p-id='30344'%20width='200'%20height='200'%3e%3cpath%20d='M400.440142%201024h-0.073136a48.781895%2048.781895%200%200%201-45.490763-31.448598L3.383306%2066.061072a48.781895%2048.781895%200%200%201%2062.897196-62.897197l926.563466%20351.419801a48.928168%2048.928168%200%200%201%200.219409%2091.127799L597.761811%20597.688654l-151.904042%20395.082157a48.781895%2048.781895%200%200%201-45.490763%2031.229189zM133.053921%20132.907627l267.678766%20705.691916%20113.87318-296.201913a48.855032%2048.855032%200%200%201%2028.011193-27.938057l296.201913-113.87318-705.765052-267.678766z'%20p-id='30345'%20fill='%23ffffff'%20/%3e%3cscript%20xmlns=''%20/%3e%3c/svg%3e";
 function CoordinateDisplay({ map: e, precision: r = 6, className: i = "", style: s }) {
-	let [c, l] = useState(null), [u, d] = useState(!1), f = useRef(void 0), m = useCallback((e) => {
+	let [c, l] = useState(null), [u, d] = useState(!1), f = useRef(void 0), h = useCallback((e) => {
 		l({
 			lng: Number(e.lngLat.lng.toFixed(r)),
 			lat: Number(e.lngLat.lat.toFixed(r))
 		});
 	}, [r]);
 	useEffect(() => {
-		if (e) return e.on("mousemove", m), () => {
-			e.off("mousemove", m);
+		if (e) return e.on("mousemove", h), () => {
+			e.off("mousemove", h);
 		};
-	}, [e, m]), useEffect(() => () => {
+	}, [e, h]), useEffect(() => () => {
 		f.current && clearTimeout(f.current);
 	}, []);
-	let h = useCallback(() => {
+	let g = useCallback(() => {
 		if (!c) return;
 		let e = `${c.lng},${c.lat}`;
 		navigator.clipboard.writeText(e).then(() => {
@@ -4030,7 +4030,7 @@ function CoordinateDisplay({ map: e, precision: r = 6, className: i = "", style:
 	return c ? /* @__PURE__ */ jsxs("div", {
 		className: `mapbox-coordinate-display ${u ? "mapbox-coordinate-display--copied" : ""} ${i}`,
 		style: s,
-		onClick: h,
+		onClick: g,
 		title: "点击复制坐标",
 		children: [/* @__PURE__ */ jsx("img", {
 			src: location_default,
@@ -4058,46 +4058,46 @@ function ScaleControl({ map: e, maxWidth: r = 100, unit: i = "metric", className
 		label: "100 m"
 	}), u = useCallback(() => {
 		if (!e) return;
-		let t = e.getZoom(), n = e.getCenter().lat, a = 40075016.686 / (256 * 2 ** t), o = n * Math.PI / 180, s = a * Math.cos(o) * r, c, u;
+		let t = e.getCanvas().clientHeight / 2, n = e.unproject([0, t]), a = e.unproject([r, t]), o = n.lat * Math.PI / 180, s = a.lat * Math.PI / 180, c = s - o, u = (a.lng - n.lng) * Math.PI / 180, d = Math.sin(c / 2) * Math.sin(c / 2) + Math.cos(o) * Math.cos(s) * Math.sin(u / 2) * Math.sin(u / 2), f = 6371008.8 * (2 * Math.atan2(Math.sqrt(d), Math.sqrt(1 - d))), p, m;
 		if (i === "imperial") {
-			let e = 3.2808 * s;
+			let e = 3.2808 * f;
 			if (e > 5280) {
 				let t = e / 5280;
-				c = getRoundNum(t), u = `${c} mi`;
-				let n = c / t;
+				p = getRoundNum(t), m = `${p} mi`;
+				let n = p / t;
 				l({
 					width: r * n,
-					label: u
+					label: m
 				});
 			} else {
-				c = getRoundNum(e), u = `${c} ft`;
-				let t = c / e;
+				p = getRoundNum(e), m = `${p} ft`;
+				let t = p / e;
 				l({
 					width: r * t,
-					label: u
+					label: m
 				});
 			}
 		} else if (i === "nautical") {
-			let e = s / 1852;
-			c = getRoundNum(e), u = `${c} nm`;
-			let t = c / e;
+			let e = f / 1852;
+			p = getRoundNum(e), m = `${p} nm`;
+			let t = p / e;
 			l({
 				width: r * t,
-				label: u
+				label: m
 			});
-		} else if (s >= 1e3) {
-			c = getRoundNum(s / 1e3), u = `${c} km`;
-			let e = c / (s / 1e3);
+		} else if (f >= 1e3) {
+			p = getRoundNum(f / 1e3), m = `${p} km`;
+			let e = p / (f / 1e3);
 			l({
 				width: r * e,
-				label: u
+				label: m
 			});
 		} else {
-			c = getRoundNum(s), u = `${c} m`;
-			let e = c / s;
+			p = getRoundNum(f), m = `${p} m`;
+			let e = p / f;
 			l({
 				width: r * e,
-				label: u
+				label: m
 			});
 		}
 	}, [
@@ -4183,7 +4183,7 @@ function detectVectorSource(e) {
 	return null;
 }
 function RoadHighlightControl({ map: e, highlightWidth: r = 3, defaultRoadTypes: i = [], defaultMinWidth: c = 0, source: l, sourceLayer: u, classField: d = "class", className: f = "", style: p }) {
-	let [h, g] = useState(!1), [_, v] = useState(i), [y, b] = useState(!1), x = useRef(!1), be = useRef(null), S = useRef(null), C = useRef(null), w = useCallback((e, t, n) => {
+	let [g, _] = useState(!1), [v, y] = useState(i), [b, x] = useState(!1), S = useRef(!1), ye = useRef(null), C = useRef(null), w = useRef(null), T = useCallback((e, t, n) => {
 		if (!e.isStyleLoaded() || !e.getSource(t)) return !1;
 		let i = !0;
 		return ROAD_TYPE_OPTIONS.forEach((a) => {
@@ -4219,13 +4219,13 @@ function RoadHighlightControl({ map: e, highlightWidth: r = 3, defaultRoadTypes:
 				let r = detectVectorSource(e);
 				r && (console.log("Auto-detected vector source:", r), t ||= r.source, n ||= r.sourceLayer);
 			}
-			t && n ? w(e, t, n) && (x.current = !0, b(!0)) : console.warn("No vector source found for road highlighting");
+			t && n ? T(e, t, n) && (S.current = !0, x(!0)) : console.warn("No vector source found for road highlighting");
 		};
 		e.isStyleLoaded() ? t() : e.once("load", t);
 		let n = () => {
 			e.isStyleLoaded() && t();
 		}, r = () => {
-			x.current || t();
+			S.current || t();
 		};
 		return e.on("styledata", n), e.on("sourcedata", r), () => {
 			e.off("styledata", n), e.off("sourcedata", r);
@@ -4234,12 +4234,12 @@ function RoadHighlightControl({ map: e, highlightWidth: r = 3, defaultRoadTypes:
 		e,
 		l,
 		u,
-		w
+		T
 	]), useEffect(() => {
-		!e || !y || ROAD_TYPE_OPTIONS.forEach((t) => {
+		!e || !b || ROAD_TYPE_OPTIONS.forEach((t) => {
 			let n = `${LAYER_ID_PREFIX}${t.class}`;
 			if (e.getLayer(n)) try {
-				let r = _.includes(t.class);
+				let r = v.includes(t.class);
 				e.setLayoutProperty(n, "visibility", r ? "visible" : "none");
 			} catch (e) {
 				console.error(`Failed to update layer ${n}:`, e);
@@ -4247,128 +4247,128 @@ function RoadHighlightControl({ map: e, highlightWidth: r = 3, defaultRoadTypes:
 		});
 	}, [
 		e,
-		y,
-		_
+		b,
+		v
 	]), useEffect(() => {
-		if (!h) return;
+		if (!g) return;
 		let e = (e) => {
-			be.current && !be.current.contains(e.target) && S.current && !S.current.contains(e.target) && g(!1);
+			ye.current && !ye.current.contains(e.target) && C.current && !C.current.contains(e.target) && _(!1);
 		}, t = setTimeout(() => {
 			document.addEventListener("mousedown", e);
 		}, 0);
 		return () => {
 			clearTimeout(t), document.removeEventListener("mousedown", e);
 		};
-	}, [h]), useEffect(() => () => {
+	}, [g]), useEffect(() => () => {
 		e && e.getStyle() && ROAD_TYPE_OPTIONS.forEach((t) => {
 			let n = `${LAYER_ID_PREFIX}${t.class}`;
 			if (e.getLayer(n)) try {
 				e.removeLayer(n);
 			} catch {}
-		}), C.current &&= (C.current.remove(), null);
+		}), w.current &&= (w.current.remove(), null);
 	}, [e]);
-	let T = useCallback((e) => ROAD_TYPE_OPTIONS.find((t) => t.class === e)?.label || e, []), xe = useCallback((t) => {
-		if (!e || _.length === 0) {
-			C.current && C.current.remove(), e?.getCanvas().style.cursor && (e.getCanvas().style.cursor = "");
+	let E = useCallback((e) => ROAD_TYPE_OPTIONS.find((t) => t.class === e)?.label || e, []), be = useCallback((t) => {
+		if (!e || v.length === 0) {
+			w.current && w.current.remove(), e?.getCanvas().style.cursor && (e.getCanvas().style.cursor = "");
 			return;
 		}
-		let n = _.map((e) => `${LAYER_ID_PREFIX}${e}`), r = [[t.point.x - 10, t.point.y - 10], [t.point.x + 10, t.point.y + 10]], i = e.queryRenderedFeatures(r, { layers: n.filter((t) => e.getLayer(t)) });
+		let n = v.map((e) => `${LAYER_ID_PREFIX}${e}`), r = [[t.point.x - 10, t.point.y - 10], [t.point.x + 10, t.point.y + 10]], i = e.queryRenderedFeatures(r, { layers: n.filter((t) => e.getLayer(t)) });
 		if (i.length > 0) {
-			let n = i[0].properties || {}, r = t.lngLat, a = n.name || n.name_en || n.name_local || "", o = n[d] || "", c = n.type || "", l = n.structure || "", u = n.oneway, f = n.layer, p = n.iso_3166_1 || "", ve = n.iso_3166_2 || "", ye = (e) => !(e == null || e === "" || typeof e == "string" && e.toLowerCase() === "none"), m = [];
-			ye(o) && m.push(`
+			let n = i[0].properties || {}, r = t.lngLat, a = n.name || n.name_en || n.name_local || "", o = n[d] || "", c = n.type || "", l = n.structure || "", u = n.oneway, f = n.layer, p = n.iso_3166_1 || "", m = n.iso_3166_2 || "", ve = (e) => !(e == null || e === "" || typeof e == "string" && e.toLowerCase() === "none"), h = [];
+			ve(o) && h.push(`
 						<div class="road-highlight-popup__row">
 							<span>道路类型:</span>
-							<span class="road-highlight-popup__value">${T(o)}</span>
+							<span class="road-highlight-popup__value">${E(o)}</span>
 						</div>
-					`), m.push(`
+					`), h.push(`
 					<div class="road-highlight-popup__row">
 						<span>经度:</span>
 						<span class="road-highlight-popup__value">${r.lng.toFixed(6)}</span>
 					</div>
-				`), m.push(`
+				`), h.push(`
 					<div class="road-highlight-popup__row">
 						<span>纬度:</span>
 						<span class="road-highlight-popup__value">${r.lat.toFixed(6)}</span>
 					</div>
-				`), ye(c) && m.push(`
+				`), ve(c) && h.push(`
 						<div class="road-highlight-popup__row">
 							<span>类别:</span>
 							<span class="road-highlight-popup__value">${c}</span>
 						</div>
-					`), ye(l) && m.push(`
+					`), ve(l) && h.push(`
 						<div class="road-highlight-popup__row">
 							<span>结构:</span>
 							<span class="road-highlight-popup__value">${l}</span>
 						</div>
-					`), u != null && u !== "" && m.push(`
+					`), u != null && u !== "" && h.push(`
 						<div class="road-highlight-popup__row">
 							<span>单行道:</span>
 							<span class="road-highlight-popup__value">${u ? "是" : "否"}</span>
 						</div>
-					`), ye(f) && m.push(`
+					`), ve(f) && h.push(`
 						<div class="road-highlight-popup__row">
 							<span>层级:</span>
 							<span class="road-highlight-popup__value">${f}</span>
 						</div>
-					`), ye(p) && m.push(`
+					`), ve(p) && h.push(`
 						<div class="road-highlight-popup__row">
 							<span>国家代码:</span>
 							<span class="road-highlight-popup__value">${p}</span>
 						</div>
-					`), ye(ve) && m.push(`
+					`), ve(m) && h.push(`
 						<div class="road-highlight-popup__row">
 							<span>地区代码:</span>
-							<span class="road-highlight-popup__value">${ve}</span>
+							<span class="road-highlight-popup__value">${m}</span>
 						</div>
 					`);
-			let h = `
+			let g = `
 					<div class="road-highlight-popup__content">
 						${a ? `<div class="road-highlight-popup__title">${a}</div>` : ""}
-						<div class="road-highlight-popup__info">${m.join("")}</div>
+						<div class="road-highlight-popup__info">${h.join("")}</div>
 					</div>
 				`;
-			C.current ||= new mapboxgl.Popup({
+			w.current ||= new mapboxgl.Popup({
 				closeButton: !1,
 				closeOnClick: !1,
 				offset: 15,
 				className: "road-highlight-popup"
-			}), C.current.setLngLat(r).setHTML(h).addTo(e), e.getCanvas().style.cursor = "pointer";
-		} else C.current && C.current.remove(), e.getCanvas().style.cursor = "";
+			}), w.current.setLngLat(r).setHTML(g).addTo(e), e.getCanvas().style.cursor = "pointer";
+		} else w.current && w.current.remove(), e.getCanvas().style.cursor = "";
 	}, [
 		e,
-		_,
-		T,
+		v,
+		E,
 		d
 	]);
 	useEffect(() => {
-		if (!(!e || !y)) return e.on("mousemove", xe), () => {
-			e.off("mousemove", xe), C.current && C.current.remove(), e.getCanvas().style.cursor = "";
+		if (!(!e || !b)) return e.on("mousemove", be), () => {
+			e.off("mousemove", be), w.current && w.current.remove(), e.getCanvas().style.cursor = "";
 		};
 	}, [
 		e,
-		y,
-		xe
+		b,
+		be
 	]);
-	let Se = (e, t) => {
-		v((n) => t ? [...n, e] : n.filter((t) => t !== e));
-	}, D = (e) => {
-		v(e ? ROAD_TYPE_OPTIONS.map((e) => e.class) : []);
-	}, Ce = _.length > 0;
+	let xe = (e, t) => {
+		y((n) => t ? [...n, e] : n.filter((t) => t !== e));
+	}, O = (e) => {
+		y(e ? ROAD_TYPE_OPTIONS.map((e) => e.class) : []);
+	}, Se = v.length > 0;
 	return /* @__PURE__ */ jsxs("div", {
 		className: `mapbox-road-highlight-control ${f}`,
 		style: p,
 		children: [/* @__PURE__ */ jsxs("button", {
-			ref: S,
-			className: `mapbox-control-btn mapbox-road-highlight-control__btn ${Ce ? "mapbox-road-highlight-control__btn--active" : ""}`,
-			onClick: () => g(!h),
-			title: `路网高亮${_.length > 0 ? ` (已选 ${_.length})` : ""}`,
+			ref: C,
+			className: `mapbox-control-btn mapbox-road-highlight-control__btn ${Se ? "mapbox-road-highlight-control__btn--active" : ""}`,
+			onClick: () => _(!g),
+			title: `路网高亮${v.length > 0 ? ` (已选 ${v.length})` : ""}`,
 			children: [/* @__PURE__ */ jsx("img", {
 				src: road_default,
 				alt: "road",
 				className: "mapbox-road-highlight-control__btn-icon"
-			}), /* @__PURE__ */ jsxs("span", { children: ["路网", _.length > 0 ? ` (${_.length})` : ""] })]
-		}), h && /* @__PURE__ */ jsxs("div", {
-			ref: be,
+			}), /* @__PURE__ */ jsxs("span", { children: ["路网", v.length > 0 ? ` (${v.length})` : ""] })]
+		}), g && /* @__PURE__ */ jsxs("div", {
+			ref: ye,
 			className: "mapbox-road-highlight-control__panel",
 			children: [
 				/* @__PURE__ */ jsxs("div", {
@@ -4377,9 +4377,9 @@ function RoadHighlightControl({ map: e, highlightWidth: r = 3, defaultRoadTypes:
 						className: "mapbox-road-highlight-control__panel-title",
 						children: "道路类型"
 					}), /* @__PURE__ */ jsx(Checkbox, {
-						checked: _.length === ROAD_TYPE_OPTIONS.length,
-						indeterminate: _.length > 0 && _.length < ROAD_TYPE_OPTIONS.length,
-						onChange: D,
+						checked: v.length === ROAD_TYPE_OPTIONS.length,
+						indeterminate: v.length > 0 && v.length < ROAD_TYPE_OPTIONS.length,
+						onChange: O,
 						style: {
 							"--color-text-1": "#fff",
 							"--color-border-2": "rgba(255, 255, 255, 0.3)"
@@ -4396,11 +4396,11 @@ function RoadHighlightControl({ map: e, highlightWidth: r = 3, defaultRoadTypes:
 						className: "mapbox-road-highlight-control__type-list",
 						children: ROAD_TYPE_OPTIONS.map((e) => /* @__PURE__ */ jsxs("div", {
 							className: "mapbox-road-highlight-control__type-item",
-							onClick: () => Se(e.class, !_.includes(e.class)),
+							onClick: () => xe(e.class, !v.includes(e.class)),
 							children: [
 								/* @__PURE__ */ jsx(Checkbox, {
-									checked: _.includes(e.class),
-									onChange: (t) => Se(e.class, t),
+									checked: v.includes(e.class),
+									onChange: (t) => xe(e.class, t),
 									onClick: (e) => e.stopPropagation(),
 									style: {
 										"--color-text-1": "#fff",
@@ -4425,7 +4425,7 @@ function RoadHighlightControl({ map: e, highlightWidth: r = 3, defaultRoadTypes:
 					className: "mapbox-road-highlight-control__tip",
 					children: "💡 选中道路类型后立即显示高亮"
 				}),
-				!y && /* @__PURE__ */ jsx("div", {
+				!b && /* @__PURE__ */ jsx("div", {
 					className: "mapbox-road-highlight-control__warning",
 					children: "⚠️ 正在初始化图层..."
 				})
@@ -4674,64 +4674,64 @@ function clearAllPreviewSources(e) {
 	]) clearPreviewSource(e, `${PREVIEW_PREFIX}${t}`);
 }
 function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDrawModeChange: s, className: c = "", style: l }) {
-	let [u, d] = useState(!1), [f, p] = useState(null), [h, g] = useState({
+	let [u, d] = useState(!1), [f, p] = useState(null), [g, _] = useState({
 		showArea: !0,
 		showLength: !0,
 		showRadius: !0
-	}), _ = r !== void 0, v = _ ? {
+	}), v = r !== void 0, y = v ? {
 		showArea: r.showArea ?? !0,
 		showLength: r.showLength ?? !0,
 		showRadius: r.showRadius ?? !0
-	} : h, [y, b] = useState([]), x = useRef(/* @__PURE__ */ new Map()), be = useRef(0), C = useRef(null), w = useRef(null), T = useRef(null), E = useRef(null), D = useRef(null), O = useRef([]), k = useRef([]), A = useRef(v);
-	A.current = v;
-	let Ee = useRef(f);
-	Ee.current = f;
-	let j = useCallback(() => `measure-${++be.current}`, []);
+	} : g, [b, x] = useState([]), S = useRef(/* @__PURE__ */ new Map()), ye = useRef(0), w = useRef(null), T = useRef(null), E = useRef(null), D = useRef(null), O = useRef(null), k = useRef([]), A = useRef([]), j = useRef(y);
+	j.current = y;
+	let Te = useRef(f);
+	Te.current = f;
+	let M = useCallback(() => `measure-${++ye.current}`, []);
 	useEffect(() => {
 		s?.(f !== null);
 	}, [f, s]);
-	let De = useRef(!1), Oe = useCallback(() => {
-		!e || !e.isStyleLoaded() || (initAllPreviewLayers(e), De.current = !0);
+	let Ee = useRef(!1), De = useCallback(() => {
+		!e || !e.isStyleLoaded() || (initAllPreviewLayers(e), Ee.current = !0);
 	}, [e]);
 	useEffect(() => {
 		if (!e) return;
 		let t = () => {
-			initAllPreviewLayers(e), De.current = !0;
+			initAllPreviewLayers(e), Ee.current = !0;
 		};
 		e.isStyleLoaded() ? t() : e.once("load", t);
 		let n = () => {
-			De.current = !1;
+			Ee.current = !1;
 		};
 		return e.on("style.load", n), () => {
 			e.off("style.load", n);
 		};
 	}, [e]), useEffect(() => {
 		let e = (e) => {
-			C.current && !C.current.contains(e.target) && w.current && !w.current.contains(e.target) && d(!1);
+			w.current && !w.current.contains(e.target) && T.current && !T.current.contains(e.target) && d(!1);
 		};
 		return document.addEventListener("mousedown", e), () => document.removeEventListener("mousedown", e);
 	}, []);
-	let M = useCallback((t) => {
+	let N = useCallback((t) => {
 		if (!e) return;
-		let n = applyEntityConfig(t, A.current), r = null;
+		let n = applyEntityConfig(t, j.current), r = null;
 		if (n.type === "circle" ? r = new CircleRenderer(e, n) : n.type === "square" ? r = new SquareRenderer(e, n) : n.type === "rectangle" ? r = new RectangleRenderer(e, n) : n.type === "polygon" ? r = new PolygonRenderer(e, n) : n.type === "polyline" && (r = new PolylineRenderer(e, n)), r) {
-			x.current.set(n.id, r);
+			S.current.set(n.id, r);
 			let e = {
 				entity: n,
 				shapeLabel: SHAPE_LABELS[n.type] || n.type,
 				area: computeEntityArea(n),
 				lengthOrRadius: computeEntityLengthOrRadius(n)
 			};
-			b((t) => [...t, e]);
-		}
-	}, [e]), ke = useCallback((e) => {
-		let t = x.current.get(e);
-		t && (t.destroy(), x.current.delete(e)), b((t) => t.filter((t) => t.entity.id !== e));
-	}, []), Ae = useCallback(() => {
-		x.current.forEach((e) => e.destroy()), x.current.clear(), b([]);
-	}, []), je = useCallback((t) => {
+			x((t) => [...t, e]);
+		}
+	}, [e]), Oe = useCallback((e) => {
+		let t = S.current.get(e);
+		t && (t.destroy(), S.current.delete(e)), x((t) => t.filter((t) => t.entity.id !== e));
+	}, []), ke = useCallback(() => {
+		S.current.forEach((e) => e.destroy()), S.current.clear(), x([]);
+	}, []), Ae = useCallback((t) => {
 		if (!e) return;
-		let n = x.current.get(t);
+		let n = S.current.get(t);
 		if (!n) return;
 		let r = n.getBounds();
 		e.fitBounds(r, {
@@ -4739,21 +4739,21 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 			maxZoom: 18,
 			duration: 1e3
 		});
-	}, [e]), Me = useCallback((e, t) => {
+	}, [e]), je = useCallback((e, t) => {
 		let n = {
-			...A.current,
+			...j.current,
 			[e]: t
 		};
-		_ ? i?.({ ...n }) : g(n), b((t) => t.map((t) => {
+		v ? i?.({ ...n }) : _(n), x((t) => t.map((t) => {
 			let r = { ...t.entity };
 			r[e] = void 0;
-			let i = applyEntityConfig(r, n), a = x.current.get(t.entity.id);
+			let i = applyEntityConfig(r, n), a = S.current.get(t.entity.id);
 			return a && a.update(i), {
 				...t,
 				entity: i
 			};
 		}));
-	}, [_, i]), Ne = useCallback((t, n) => {
+	}, [v, i]), Me = useCallback((t, n) => {
 		if (!e) return;
 		let [r, i] = t, [a, o] = n, s = [
 			[Math.min(r, a), Math.max(i, o)],
@@ -4772,7 +4772,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 		});
 		let l = e.getSource(`${PREVIEW_PREFIX}rect-preview-measure-source`);
 		if (l) {
-			let e = A.current, t = [], n = s[0], r = s[1], i = s[2];
+			let e = j.current, t = [], n = s[0], r = s[1], i = s[2];
 			if (e?.showArea) {
 				let e = distance(n, r), a = distance(r, i);
 				t.push({
@@ -4803,7 +4803,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 				features: t
 			});
 		}
-	}, [e]), Pe = useCallback((t, n) => {
+	}, [e]), Ne = useCallback((t, n) => {
 		if (!e) return;
 		let r = calculateDistance(t, n), i = createCirclePolygon(t, r), a = e.getSource(`${PREVIEW_PREFIX}circle-preview-source`);
 		a && a.setData({
@@ -4814,7 +4814,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 			},
 			properties: {}
 		});
-		let o = A.current, s = [], c = [];
+		let o = j.current, s = [], c = [];
 		if (o?.showArea && s.push({
 			type: "Feature",
 			geometry: {
@@ -4850,7 +4850,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 			type: "FeatureCollection",
 			features: c
 		});
-	}, [e]), Fe = useCallback((t, n) => {
+	}, [e]), Pe = useCallback((t, n) => {
 		if (!e) return;
 		let r = calculateDistance(t, n) * 2, i = createSquareCoords(t, r), a = e.getSource(`${PREVIEW_PREFIX}square-preview-source`);
 		a && a.setData({
@@ -4863,7 +4863,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 		});
 		let o = e.getSource(`${PREVIEW_PREFIX}square-preview-measure-source`);
 		if (o) {
-			let e = A.current, n = [];
+			let e = j.current, n = [];
 			if (e?.showArea && n.push({
 				type: "Feature",
 				geometry: {
@@ -4887,7 +4887,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 				features: n
 			});
 		}
-	}, [e]), N = useCallback((t, n) => {
+	}, [e]), P = useCallback((t, n) => {
 		if (!e) return;
 		let r = [...t, n], i = e.getSource(`${PREVIEW_PREFIX}polygon-preview-source`);
 		i && (r.length >= 3 ? i.setData({
@@ -4922,7 +4922,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 		});
 		let o = e.getSource(`${PREVIEW_PREFIX}polygon-preview-measure-source`);
 		if (o) {
-			let e = A.current, t = [];
+			let e = j.current, t = [];
 			if (e?.showArea && r.length >= 3) {
 				let e = polygonArea([...r, r[0]]), n = 0, i = 0;
 				for (let e of r) n += e[0], i += e[1];
@@ -4964,7 +4964,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 				features: t
 			});
 		}
-	}, [e]), Ie = useCallback((t, n) => {
+	}, [e]), Fe = useCallback((t, n) => {
 		if (!e) return;
 		let r = [...t, n], i = e.getSource(`${PREVIEW_PREFIX}polyline-preview-source`);
 		i && (r.length >= 2 ? i.setData({
@@ -4992,7 +4992,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 		});
 		let o = e.getSource(`${PREVIEW_PREFIX}polyline-preview-measure-source`);
 		if (o) {
-			let e = A.current, t = [];
+			let e = j.current, t = [];
 			if (e?.showLength && r.length >= 2) for (let e = 0; e < r.length - 1; e++) {
 				let n = r[e], i = r[e + 1];
 				t.push({
@@ -5012,117 +5012,117 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 	}, [e]);
 	useEffect(() => {
 		if (!e || !f) return;
-		Oe(), e.getCanvas().style.cursor = "crosshair";
+		De(), e.getCanvas().style.cursor = "crosshair";
 		let t = (t) => {
-			let n = [t.lngLat.lng, t.lngLat.lat], r = Ee.current;
+			let n = [t.lngLat.lng, t.lngLat.lat], r = Te.current;
 			if (r === "rectangle") {
-				let t = T.current;
-				if (!t) T.current = n;
+				let t = E.current;
+				if (!t) E.current = n;
 				else {
 					let r = {
-						id: j(),
+						id: M(),
 						type: "rectangle",
 						bounds: [t, n]
 					};
-					M(r), T.current = null, clearAllPreviewSources(e), p(null);
+					N(r), E.current = null, clearAllPreviewSources(e), p(null);
 				}
 			} else if (r === "circle") {
-				let t = E.current;
-				if (!t) E.current = { center: n };
+				let t = D.current;
+				if (!t) D.current = { center: n };
 				else {
 					let r = calculateDistance(t.center, n), i = {
-						id: j(),
+						id: M(),
 						type: "circle",
 						center: t.center,
 						radius: r
 					};
-					M(i), E.current = null, clearAllPreviewSources(e), p(null);
+					N(i), D.current = null, clearAllPreviewSources(e), p(null);
 				}
 			} else if (r === "square") {
-				let t = D.current;
-				if (!t) D.current = { center: n };
+				let t = O.current;
+				if (!t) O.current = { center: n };
 				else {
 					let r = calculateDistance(t.center, n) * 2, i = {
-						id: j(),
+						id: M(),
 						type: "square",
 						center: t.center,
 						length: r
 					};
-					M(i), D.current = null, clearAllPreviewSources(e), p(null);
+					N(i), O.current = null, clearAllPreviewSources(e), p(null);
 				}
 			} else if (r === "polygon") {
-				let t = O.current;
+				let t = k.current;
 				if (t.length >= 3 && calculateDistance(t[0], n) < 20) {
 					let n = {
-						id: j(),
+						id: M(),
 						type: "polygon",
 						coordinates: [...t]
 					};
-					M(n), O.current = [], clearAllPreviewSources(e), p(null);
+					N(n), k.current = [], clearAllPreviewSources(e), p(null);
 					return;
 				}
-				O.current = [...t, n];
-			} else r === "polyline" && (k.current = [...k.current, n]);
+				k.current = [...t, n];
+			} else r === "polyline" && (A.current = [...A.current, n]);
 		}, n = (e) => {
-			let t = [e.lngLat.lng, e.lngLat.lat], n = Ee.current;
-			if (n === "rectangle" && T.current) Ne(T.current, t);
-			else if (n === "circle" && E.current) Pe(E.current.center, t);
-			else if (n === "square" && D.current) Fe(D.current.center, t);
+			let t = [e.lngLat.lng, e.lngLat.lat], n = Te.current;
+			if (n === "rectangle" && E.current) Me(E.current, t);
+			else if (n === "circle" && D.current) Ne(D.current.center, t);
+			else if (n === "square" && O.current) Pe(O.current.center, t);
 			else if (n === "polygon") {
-				let e = O.current;
-				e.length > 0 && N(e, t);
-			} else if (n === "polyline") {
 				let e = k.current;
-				e.length > 0 && Ie(e, t);
+				e.length > 0 && P(e, t);
+			} else if (n === "polyline") {
+				let e = A.current;
+				e.length > 0 && Fe(e, t);
 			}
 		}, r = (t) => {
 			t.preventDefault();
-			let n = Ee.current;
+			let n = Te.current;
 			if (n === "polygon") {
-				let t = O.current;
+				let t = k.current;
 				if (t.length >= 3) {
 					let n = {
-						id: j(),
+						id: M(),
 						type: "polygon",
 						coordinates: [...t]
 					};
-					M(n), O.current = [], clearAllPreviewSources(e), p(null);
-				} else O.current = [], clearAllPreviewSources(e);
+					N(n), k.current = [], clearAllPreviewSources(e), p(null);
+				} else k.current = [], clearAllPreviewSources(e);
 			} else if (n === "polyline") {
-				let t = k.current;
+				let t = A.current;
 				if (t.length >= 2) {
 					let n = {
-						id: j(),
+						id: M(),
 						type: "polyline",
 						coordinates: [...t]
 					};
-					M(n), k.current = [], clearAllPreviewSources(e), p(null);
-				} else k.current = [], clearAllPreviewSources(e);
+					N(n), A.current = [], clearAllPreviewSources(e), p(null);
+				} else A.current = [], clearAllPreviewSources(e);
 			}
 		}, i = (t) => {
-			t.key === "Escape" && (T.current = null, E.current = null, D.current = null, O.current = [], k.current = [], clearAllPreviewSources(e), p(null));
+			t.key === "Escape" && (E.current = null, D.current = null, O.current = null, k.current = [], A.current = [], clearAllPreviewSources(e), p(null));
 		}, a = (t) => {
 			t.preventDefault();
-			let n = Ee.current;
+			let n = Te.current;
 			if (n === "polygon") {
-				let t = O.current;
+				let t = k.current;
 				if (t.length >= 3) {
 					let n = {
-						id: j(),
+						id: M(),
 						type: "polygon",
 						coordinates: [...t]
 					};
-					M(n), O.current = [], clearAllPreviewSources(e), p(null);
+					N(n), k.current = [], clearAllPreviewSources(e), p(null);
 				}
 			} else if (n === "polyline") {
-				let t = k.current;
+				let t = A.current;
 				if (t.length >= 2) {
 					let n = {
-						id: j(),
+						id: M(),
 						type: "polyline",
 						coordinates: [...t]
 					};
-					M(n), k.current = [], clearAllPreviewSources(e), p(null);
+					N(n), A.current = [], clearAllPreviewSources(e), p(null);
 				}
 			}
 		};
@@ -5132,25 +5132,25 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 	}, [
 		e,
 		f,
-		j,
 		M,
-		Oe,
+		N,
+		De,
+		Me,
 		Ne,
 		Pe,
-		Fe,
-		N,
-		Ie
+		P,
+		Fe
 	]), useEffect(() => () => {
-		x.current.forEach((e) => e.destroy()), x.current.clear();
+		S.current.forEach((e) => e.destroy()), S.current.clear();
 	}, []);
-	let Le = useCallback((t) => {
-		p((e) => e === t ? null : t), T.current = null, E.current = null, D.current = null, O.current = [], k.current = [], e && clearAllPreviewSources(e);
+	let Ie = useCallback((t) => {
+		p((e) => e === t ? null : t), E.current = null, D.current = null, O.current = null, k.current = [], A.current = [], e && clearAllPreviewSources(e);
 	}, [e]);
 	return e ? /* @__PURE__ */ jsxs("div", {
 		className: `mapbox-measure-control ${c}`,
 		style: l,
 		children: [/* @__PURE__ */ jsxs("button", {
-			ref: w,
+			ref: T,
 			className: `mapbox-control-btn mapbox-measure-control__btn ${u ? "mapbox-measure-control__btn--active" : ""}`,
 			onClick: () => d(!u),
 			title: "测量",
@@ -5161,14 +5161,14 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 					className: "mapbox-measure-control__btn-icon"
 				}),
 				/* @__PURE__ */ jsx("span", { children: "测量" }),
-				y.length > 0 && /* @__PURE__ */ jsxs("span", { children: [
+				b.length > 0 && /* @__PURE__ */ jsxs("span", { children: [
 					"(",
-					y.length,
+					b.length,
 					")"
 				] })
 			]
 		}), u && /* @__PURE__ */ jsxs("div", {
-			ref: C,
+			ref: w,
 			className: "mapbox-measure-control__panel",
 			children: [
 				/* @__PURE__ */ jsx("div", {
@@ -5179,18 +5179,18 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 					className: "mapbox-measure-control__settings",
 					children: [
 						/* @__PURE__ */ jsx(Checkbox, {
-							checked: v.showArea,
-							onChange: (e) => Me("showArea", e),
+							checked: y.showArea,
+							onChange: (e) => je("showArea", e),
 							children: "面积"
 						}),
 						/* @__PURE__ */ jsx(Checkbox, {
-							checked: v.showLength,
-							onChange: (e) => Me("showLength", e),
+							checked: y.showLength,
+							onChange: (e) => je("showLength", e),
 							children: "长度"
 						}),
 						/* @__PURE__ */ jsx(Checkbox, {
-							checked: v.showRadius,
-							onChange: (e) => Me("showRadius", e),
+							checked: y.showRadius,
+							onChange: (e) => je("showRadius", e),
 							children: "半径"
 						})
 					]
@@ -5203,15 +5203,15 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 					className: "mapbox-measure-control__tools",
 					children: [DRAW_TOOLS.map((e) => /* @__PURE__ */ jsx("button", {
 						className: `mapbox-measure-control__tool-btn ${f === e.mode ? "mapbox-measure-control__tool-btn--active" : ""}`,
-						onClick: () => Le(e.mode),
+						onClick: () => Ie(e.mode),
 						title: e.label,
 						children: /* @__PURE__ */ jsx("img", {
 							src: e.icon,
 							alt: e.label
 						})
-					}, e.mode)), y.length > 0 && /* @__PURE__ */ jsx("button", {
+					}, e.mode)), b.length > 0 && /* @__PURE__ */ jsx("button", {
 						className: "mapbox-measure-control__tool-btn mapbox-measure-control__tool-btn--danger",
-						onClick: Ae,
+						onClick: ke,
 						title: "清除全部",
 						children: /* @__PURE__ */ jsx("img", {
 							src: "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3c!DOCTYPE%20svg%20PUBLIC%20'-//W3C//DTD%20SVG%201.1//EN'%20'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'%3e%3csvg%20t='1769394652565'%20class='icon'%20viewBox='0%200%201024%201024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20p-id='6483'%20xmlns:xlink='http://www.w3.org/1999/xlink'%20width='128'%20height='128'%3e%3cpath%20d='M841.385637%20288.639098a36.479886%2036.479886%200%200%201%2072.74644%207.679976l6.613312%20629.544699A109.866323%20109.866323%200%200%201%20810.665733%201023.9968H222.507571a109.652991%20109.652991%200%200%201-109.012992-98.133027l-3.626656-629.544699a36.479886%2036.479886%200%200%201%2072.74644-7.679976L186.241018%20917.330467a36.479886%2036.479886%200%200%200%2036.266553%2032.639898H810.665733A36.479886%2036.479886%200%200%200%20847.99895%20917.330467z%20m-219.732646%20113.706311a36.479886%2036.479886%200%200%201%2036.693218%2036.479886v255.9992a36.693219%2036.693219%200%201%201-73.173104%200v-255.9992a36.479886%2036.479886%200%200%201%2036.479886-36.479886z%20m-219.305982%200a36.479886%2036.479886%200%200%201%2036.479886%2036.479886v255.9992a36.693219%2036.693219%200%201%201-73.173104%200v-255.9992a36.479886%2036.479886%200%200%201%2036.693218-36.479886z%20m-36.693218-255.9992h292.692418V91.519714a18.346609%2018.346609%200%200%200-18.346609-18.346609H384.0004a18.346609%2018.346609%200%200%200-18.346609%2018.346609z%20m-73.173105%200V73.173105A73.173105%2073.173105%200%200%201%20365.653791%200h292.692418a73.386437%2073.386437%200%200%201%2073.173105%2073.173105v73.173104h255.9992a36.693219%2036.693219%200%200%201%200%2073.173105H36.481486a36.693219%2036.693219%200%200%201%200-73.173105z'%20fill='%23EB6865'%20p-id='6484'%3e%3c/path%3e%3c/svg%3e",
@@ -5219,7 +5219,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 						})
 					})]
 				}),
-				y.length > 0 ? /* @__PURE__ */ jsx("div", {
+				b.length > 0 ? /* @__PURE__ */ jsx("div", {
 					className: "mapbox-measure-control__list",
 					children: /* @__PURE__ */ jsxs("table", {
 						className: "mapbox-measure-control__table",
@@ -5229,9 +5229,9 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 							/* @__PURE__ */ jsx("th", { children: "面积" }),
 							/* @__PURE__ */ jsx("th", { children: "长度/半径" }),
 							/* @__PURE__ */ jsx("th", {})
-						] }) }), /* @__PURE__ */ jsx("tbody", { children: y.map((e) => /* @__PURE__ */ jsxs("tr", {
+						] }) }), /* @__PURE__ */ jsx("tbody", { children: b.map((e) => /* @__PURE__ */ jsxs("tr", {
 							className: "mapbox-measure-control__table-row",
-							onClick: () => je(e.entity.id),
+							onClick: () => Ae(e.entity.id),
 							children: [
 								/* @__PURE__ */ jsx("td", { children: e.shapeLabel }),
 								/* @__PURE__ */ jsx("td", { children: String(e.entity.id) }),
@@ -5240,7 +5240,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 								/* @__PURE__ */ jsx("td", { children: /* @__PURE__ */ jsx("button", {
 									className: "mapbox-measure-control__delete-btn",
 									onClick: (t) => {
-										t.stopPropagation(), ke(e.entity.id);
+										t.stopPropagation(), Oe(e.entity.id);
 									},
 									title: "删除",
 									children: /* @__PURE__ */ jsx("img", {
@@ -5295,31 +5295,31 @@ var raster_paint_default = "data:image/svg+xml,%3c?xml%20version='1.0'%20standal
 	}
 ];
 function RasterPaintControl({ map: e, value: r, onChange: s, rasterPaintLayerIds: c = [], className: l, style: u }) {
-	let [d, f] = useState(!1), [p, m] = useState({ ...DEFAULT_CONFIG }), g = useRef(null), _ = useRef(null), v = r !== void 0;
+	let [d, f] = useState(!1), [p, h] = useState({ ...DEFAULT_CONFIG }), _ = useRef(null), v = useRef(null), y = r !== void 0;
 	useEffect(() => {
 		let e = (e) => {
-			g.current && !g.current.contains(e.target) && _.current && !_.current.contains(e.target) && f(!1);
+			_.current && !_.current.contains(e.target) && v.current && !v.current.contains(e.target) && f(!1);
 		};
 		return document.addEventListener("mousedown", e), () => document.removeEventListener("mousedown", e);
 	}, []);
-	let y = useMemo(() => v ? {
+	let b = useMemo(() => y ? {
 		brightness: r.brightness ?? DEFAULT_CONFIG.brightness,
 		saturation: r.saturation ?? DEFAULT_CONFIG.saturation,
 		contrast: r.contrast ?? DEFAULT_CONFIG.contrast,
 		hueRotate: r.hueRotate ?? DEFAULT_CONFIG.hueRotate
 	} : p, [
-		v,
+		y,
 		r,
 		p
-	]), b = useRef(v);
+	]), x = useRef(y);
 	useEffect(() => {
-		v && !b.current && m({ ...y }), b.current = v;
-	}, [v, y]);
-	let x = useCallback((t) => {
+		y && !x.current && h({ ...b }), x.current = y;
+	}, [y, b]);
+	let S = useCallback((t) => {
 		if (!(!e || c.length === 0)) for (let n of c) e.getLayer(n) && (e.setPaintProperty(n, "raster-brightness-min", 0), e.setPaintProperty(n, "raster-brightness-max", t.brightness), e.setPaintProperty(n, "raster-saturation", t.saturation), e.setPaintProperty(n, "raster-contrast", t.contrast), e.setPaintProperty(n, "raster-hue-rotate", t.hueRotate));
-	}, [e, c]), be = useCallback((e, t) => {
-		if (v) s?.({
-			...y,
+	}, [e, c]), ye = useCallback((e, t) => {
+		if (y) s?.({
+			...b,
 			[e]: t
 		});
 		else {
@@ -5327,35 +5327,35 @@ function RasterPaintControl({ map: e, value: r, onChange: s, rasterPaintLayerIds
 				...p,
 				[e]: t
 			};
-			m(n), x(n);
+			h(n), S(n);
 		}
 	}, [
-		v,
-		s,
 		y,
+		s,
+		b,
 		p,
-		x
-	]), S = useCallback(() => {
-		v ? s?.({ ...DEFAULT_CONFIG }) : (m({ ...DEFAULT_CONFIG }), x({ ...DEFAULT_CONFIG }));
+		S
+	]), C = useCallback(() => {
+		y ? s?.({ ...DEFAULT_CONFIG }) : (h({ ...DEFAULT_CONFIG }), S({ ...DEFAULT_CONFIG }));
 	}, [
-		v,
+		y,
 		s,
-		x
+		S
 	]);
 	useEffect(() => {
-		!v && c.length > 0 && x(p);
+		!y && c.length > 0 && S(p);
 	}, [
 		c,
-		v,
-		x,
+		y,
+		S,
 		p
 	]);
-	let C = (e, t) => e === "hueRotate" ? `${Math.round(t)}°` : t.toFixed(2);
+	let w = (e, t) => e === "hueRotate" ? `${Math.round(t)}°` : t.toFixed(2);
 	return /* @__PURE__ */ jsxs("div", {
 		className: `mapbox-raster-paint-control${l ? ` ${l}` : ""}`,
 		style: u,
 		children: [/* @__PURE__ */ jsxs("button", {
-			ref: _,
+			ref: v,
 			className: `mapbox-control-btn mapbox-raster-paint-control__btn${d ? " mapbox-raster-paint-control__btn--active" : ""}`,
 			onClick: () => f(!d),
 			title: "栅格渲染调节",
@@ -5365,7 +5365,7 @@ function RasterPaintControl({ map: e, value: r, onChange: s, rasterPaintLayerIds
 				alt: "raster paint"
 			}), /* @__PURE__ */ jsx("span", { children: "渲染" })]
 		}), d && /* @__PURE__ */ jsxs("div", {
-			ref: g,
+			ref: _,
 			className: "mapbox-raster-paint-control__panel",
 			children: [SLIDER_CONFIG.map(({ key: e, label: t, min: n, max: r, step: i }) => /* @__PURE__ */ jsxs("div", {
 				className: "mapbox-raster-paint-control__slider-row",
@@ -5379,18 +5379,18 @@ function RasterPaintControl({ map: e, value: r, onChange: s, rasterPaintLayerIds
 						min: n,
 						max: r,
 						step: i,
-						value: y[e],
-						onChange: (t) => be(e, t),
+						value: b[e],
+						onChange: (t) => ye(e, t),
 						tooltipVisible: !1
 					}),
 					/* @__PURE__ */ jsx("span", {
 						className: "mapbox-raster-paint-control__value",
-						children: C(e, y[e])
+						children: w(e, b[e])
 					})
 				]
 			}, e)), /* @__PURE__ */ jsx("button", {
 				className: "mapbox-raster-paint-control__reset",
-				onClick: S,
+				onClick: C,
 				children: "重置"
 			})]
 		})]
@@ -5398,43 +5398,43 @@ function RasterPaintControl({ map: e, value: r, onChange: s, rasterPaintLayerIds
 }
 var marker_default = "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3c!DOCTYPE%20svg%20PUBLIC%20'-//W3C//DTD%20SVG%201.1//EN'%20'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'%3e%3csvg%20t='1769397418113'%20class='icon'%20viewBox='0%200%201024%201024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20p-id='10253'%20xmlns:xlink='http://www.w3.org/1999/xlink'%20width='128'%20height='128'%3e%3cpath%20d='M755.4048%20217.2928A348.3648%20348.3648%200%200%200%20512%20119.3472a348.3136%20348.3136%200%200%200-243.3536%2097.8944%20328.4992%20328.4992%200%200%200-100.864%20236.3392c0%2049.408%2011.7248%2095.744%2032%20137.728a378.0096%20378.0096%200%200%200%2091.136%20118.4256l203.5712%20179.456%2017.5104%2015.4624%2017.5104-15.4624%20203.4176-179.3536a378.6752%20378.6752%200%200%200%2091.2384-118.4768c20.2752-41.984%2032.0512-88.32%2032.0512-137.7792a328.448%20328.448%200%200%200-100.8128-236.288z%20m24.1152%20353.3824a329.216%20329.216%200%200%201-79.872%20103.0656l-188.0064%20164.6592-187.1872-164.7616a329.0624%20329.0624%200%200%201-79.7696-103.0144%20267.0592%20267.0592%200%200%201-27.136-117.0944c0-78.7968%2032.9728-150.1184%2086.272-201.728a298.3936%20298.3936%200%200%201%20208.2816-83.5584c81.3056%200%20154.9824%2031.9488%20208.2304%2083.6096a279.9104%20279.9104%200%200%201%2086.272%20201.728%20266.496%20266.496%200%200%201-27.0848%20117.0944z%20m-164.1472-212.1728l0.0512-0.0512a146.9952%20146.9952%200%200%200-104.2432-43.2128c-40.6528%200-77.568%2016.5376-104.2432%2043.2128l0.0512%200.0512a147.3536%20147.3536%200%200%200-0.0512%20208.6912%20147.0464%20147.0464%200%200%200%20208.4864%200%20147.5072%20147.5072%200%200%200-0.0512-208.6912z%20m-34.1504%20174.2336a97.536%2097.536%200%200%201-69.2736%2028.7232%2097.6384%2097.6384%200%200%201-69.3248-28.7232%2097.792%2097.792%200%200%201-0.1536-138.4448h0.1024a97.9456%2097.9456%200%200%201%20138.5984%200h0.1536c17.664%2017.6128%2028.5696%2042.1376%2028.5696%2069.2224a97.1776%2097.1776%200%200%201-28.672%2069.2224z'%20fill='%23ffffff'%20p-id='10254'%3e%3c/path%3e%3c/svg%3e";
 const EditControl = ({ markerTemplates: e, selectedTemplate: t, onTemplateSelect: r, drawMode: i, onDrawModeChange: s, showRectangleTool: c = !1, showCircleTool: l = !1, showPolygonTool: u = !1, showSquareTool: d = !1, showPolylineTool: f = !1 }) => {
-	let [p, m] = useState(!1), h = useRef(null);
+	let [p, h] = useState(!1), g = useRef(null);
 	useEffect(() => {
 		let e = (e) => {
-			h.current && !h.current.contains(e.target) && m(!1);
+			g.current && !g.current.contains(e.target) && h(!1);
 		};
 		if (p) return document.addEventListener("mousedown", e), () => document.removeEventListener("mousedown", e);
 	}, [p]);
-	let g = (e) => {
-		t?.id === e.id ? (r(null), s(null)) : (r(e), s("marker")), m(!1);
-	}, _ = () => {
-		i === "rectangle" ? s(null) : (r(null), s("rectangle"));
+	let _ = (e) => {
+		t?.id === e.id ? (r(null), s(null)) : (r(e), s("marker")), h(!1);
 	}, v = () => {
-		i === "circle" ? s(null) : (r(null), s("circle"));
+		i === "rectangle" ? s(null) : (r(null), s("rectangle"));
 	}, y = () => {
-		i === "polygon" ? s(null) : (r(null), s("polygon"));
+		i === "circle" ? s(null) : (r(null), s("circle"));
 	}, b = () => {
-		i === "square" ? s(null) : (r(null), s("square"));
+		i === "polygon" ? s(null) : (r(null), s("polygon"));
 	}, x = () => {
+		i === "square" ? s(null) : (r(null), s("square"));
+	}, S = () => {
 		i === "polyline" ? s(null) : (r(null), s("polyline"));
-	}, be = () => {
-		(i === "rectangle" || i === "circle" || i === "polygon" || i === "square" || i === "polyline") && s(null), m(!p);
-	}, S = (e) => e.size ? {
+	}, ye = () => {
+		(i === "rectangle" || i === "circle" || i === "polygon" || i === "square" || i === "polyline") && s(null), h(!p);
+	}, C = (e) => e.size ? {
 		width: e.size,
 		height: e.size
 	} : {
 		width: e.width || 32,
 		height: e.height || 32
-	}, C = p || t, w = i === "rectangle", T = i === "circle", E = i === "polygon", xe = i === "square", Se = i === "polyline";
+	}, w = p || t, T = i === "rectangle", E = i === "circle", D = i === "polygon", be = i === "square", xe = i === "polyline";
 	return /* @__PURE__ */ jsxs("div", {
-		ref: h,
+		ref: g,
 		className: "mapbox-edit-control",
 		children: [/* @__PURE__ */ jsxs("div", {
 			className: "mapbox-edit-control__btn-group",
 			children: [
 				/* @__PURE__ */ jsxs("button", {
-					className: `mapbox-control-btn ${C ? "mapbox-control-btn--active" : ""}`,
-					onClick: be,
+					className: `mapbox-control-btn ${w ? "mapbox-control-btn--active" : ""}`,
+					onClick: ye,
 					title: "Marker",
 					children: [t ? /* @__PURE__ */ jsx("img", {
 						src: t.icon,
@@ -5447,8 +5447,8 @@ const EditControl = ({ markerTemplates: e, selectedTemplate: t, onTemplateSelect
 					}), /* @__PURE__ */ jsx("span", { children: t ? t.name : "Marker" })]
 				}),
 				d && /* @__PURE__ */ jsxs("button", {
-					className: `mapbox-control-btn ${xe ? "mapbox-control-btn--active" : ""}`,
-					onClick: b,
+					className: `mapbox-control-btn ${be ? "mapbox-control-btn--active" : ""}`,
+					onClick: x,
 					title: "绘制正方形",
 					children: [/* @__PURE__ */ jsx("img", {
 						src: "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3csvg%20viewBox='0%200%201024%201024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20width='128'%20height='128'%3e%3crect%20x='192'%20y='192'%20width='640'%20height='640'%20rx='32'%20ry='32'%20fill='none'%20stroke='%23ffffff'%20stroke-width='64'/%3e%3c/svg%3e",
@@ -5457,8 +5457,8 @@ const EditControl = ({ markerTemplates: e, selectedTemplate: t, onTemplateSelect
 					}), /* @__PURE__ */ jsx("span", { children: "正方形" })]
 				}),
 				c && /* @__PURE__ */ jsxs("button", {
-					className: `mapbox-control-btn ${w ? "mapbox-control-btn--active" : ""}`,
-					onClick: _,
+					className: `mapbox-control-btn ${T ? "mapbox-control-btn--active" : ""}`,
+					onClick: v,
 					title: "绘制矩形",
 					children: [/* @__PURE__ */ jsx("img", {
 						src: "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3csvg%20viewBox='0%200%201024%201024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20width='128'%20height='128'%3e%3crect%20x='160'%20y='240'%20width='704'%20height='544'%20rx='32'%20ry='32'%20fill='none'%20stroke='%23ffffff'%20stroke-width='64'/%3e%3c/svg%3e",
@@ -5467,8 +5467,8 @@ const EditControl = ({ markerTemplates: e, selectedTemplate: t, onTemplateSelect
 					}), /* @__PURE__ */ jsx("span", { children: "矩形" })]
 				}),
 				l && /* @__PURE__ */ jsxs("button", {
-					className: `mapbox-control-btn ${T ? "mapbox-control-btn--active" : ""}`,
-					onClick: v,
+					className: `mapbox-control-btn ${E ? "mapbox-control-btn--active" : ""}`,
+					onClick: y,
 					title: "绘制圆形",
 					children: [/* @__PURE__ */ jsx("img", {
 						src: "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3csvg%20viewBox='0%200%201024%201024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20width='128'%20height='128'%3e%3ccircle%20cx='512'%20cy='512'%20r='384'%20fill='none'%20stroke='%23ffffff'%20stroke-width='64'/%3e%3c/svg%3e",
@@ -5477,8 +5477,8 @@ const EditControl = ({ markerTemplates: e, selectedTemplate: t, onTemplateSelect
 					}), /* @__PURE__ */ jsx("span", { children: "圆形" })]
 				}),
 				u && /* @__PURE__ */ jsxs("button", {
-					className: `mapbox-control-btn ${E ? "mapbox-control-btn--active" : ""}`,
-					onClick: y,
+					className: `mapbox-control-btn ${D ? "mapbox-control-btn--active" : ""}`,
+					onClick: b,
 					title: "绘制多边形",
 					children: [/* @__PURE__ */ jsx("img", {
 						src: "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3csvg%20viewBox='0%200%201024%201024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20width='128'%20height='128'%3e%3cpolygon%20points='512,128%20864,384%20736,800%20288,800%20160,384'%20fill='none'%20stroke='%23ffffff'%20stroke-width='64'%20stroke-linejoin='round'/%3e%3c/svg%3e",
@@ -5487,8 +5487,8 @@ const EditControl = ({ markerTemplates: e, selectedTemplate: t, onTemplateSelect
 					}), /* @__PURE__ */ jsx("span", { children: "多边形" })]
 				}),
 				f && /* @__PURE__ */ jsxs("button", {
-					className: `mapbox-control-btn ${Se ? "mapbox-control-btn--active" : ""}`,
-					onClick: x,
+					className: `mapbox-control-btn ${xe ? "mapbox-control-btn--active" : ""}`,
+					onClick: S,
 					title: "绘制折线",
 					children: [/* @__PURE__ */ jsx("img", {
 						src: "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3csvg%20viewBox='0%200%201024%201024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20width='128'%20height='128'%3e%3cpolyline%20points='160,768%20384,256%20640,576%20864,192'%20fill='none'%20stroke='%23ffffff'%20stroke-width='64'%20stroke-linejoin='round'%20stroke-linecap='round'/%3e%3c/svg%3e",
@@ -5505,10 +5505,10 @@ const EditControl = ({ markerTemplates: e, selectedTemplate: t, onTemplateSelect
 			}), /* @__PURE__ */ jsx("div", {
 				className: "mapbox-edit-control__template-list",
 				children: e.map((e) => {
-					let n = S(e), r = t?.id === e.id;
+					let n = C(e), r = t?.id === e.id;
 					return /* @__PURE__ */ jsxs("div", {
 						className: `mapbox-edit-control__template-item ${r ? "mapbox-edit-control__template-item--selected" : ""}`,
-						onClick: () => g(e),
+						onClick: () => _(e),
 						title: e.name,
 						children: [/* @__PURE__ */ jsx("img", {
 							src: e.icon,
@@ -5577,28 +5577,28 @@ const EditControl = ({ markerTemplates: e, selectedTemplate: t, onTemplateSelect
 };
 var route_planning_default = "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3c!DOCTYPE%20svg%20PUBLIC%20'-//W3C//DTD%20SVG%201.1//EN'%20'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'%3e%3csvg%20t='1775031767174'%20class='icon'%20viewBox='0%200%201024%201024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20p-id='30653'%20data-spm-anchor-id='a313x.search_index.0.i6.78953a81FCkAe0'%20xmlns:xlink='http://www.w3.org/1999/xlink'%20width='64'%20height='64'%3e%3cpath%20d='M322.24%20479.210667l-42.453333-42.432%20198.826666-198.826667c53.397333-53.376%20139.306667-53.568%20191.914667-0.981333%2052.608%2052.608%2052.416%20138.517333-0.981333%20191.914666L455.722667%20642.709333l-42.432-42.453333%20213.824-213.802667a74.773333%2074.773333%200%200%200-0.341334-105.728%2074.773333%2074.773333%200%200%200-105.728-0.341333l-198.826666%20198.826667z'%20fill='%23ffffff'%20p-id='30654'%3e%3c/path%3e%3cpath%20d='M699.093333%20613.333333l42.453334%2042.432-169.429334%20169.408c-48.341333%2048.341333-129.28%2042.282667-181.248-9.664-51.968-51.968-58.026667-132.906667-9.664-181.248l234.346667-234.346666%2042.432%2042.410666L423.616%20676.693333c-22.250667%2022.250667-19.050667%2065.024%2011.008%2095.061334%2030.037333%2030.058667%2072.810667%2033.258667%2095.061333%2010.986666l169.429334-169.408zM187.989333%20571.029333c-38.933333-38.933333-38.805333-102.613333%200.853334-142.293333%2039.68-39.68%20103.381333-39.808%20142.293333-0.853333%2038.954667%2038.912%2038.826667%20102.613333-0.853333%20142.293333-39.68%2039.658667-103.381333%2039.786667-142.293334%200.853333z%20m43.733334-43.733333c15.744%2015.744%2040.874667%2015.68%2056.128%200.426667%2015.253333-15.232%2015.296-40.362667-0.426667-56.106667-15.765333-15.744-40.896-15.701333-56.149333-0.448-15.232%2015.232-15.296%2040.384%200.448%2056.106667z'%20fill='%23ffffff'%20p-id='30655'%3e%3c/path%3e%3cpath%20d='M846.144%20489.728l-31.466667%20198.784-56.96-101.461333-104.042666-38.506667z'%20fill='%23ffffff'%20p-id='30656'%3e%3c/path%3e%3c/svg%3e", SOURCE_ID = "route-planning-temp-line", LINE_LAYER_ID = "route-planning-temp-line-layer", POINT_LAYER_ID = "route-planning-temp-point-layer";
 const RoutePlanningControl = forwardRef(({ map: e, pointCount: i = 2, showPointCountInput: c = !1, visualType: l = "marker", onSelectFinished: u, showButton: d = !0 }, f) => {
-	let [p, m] = useState("idle"), [h, g] = useState(0), [_, v] = useState(i), [y, b] = useState(!1), x = useRef(null), be = useRef(null), S = useRef([]), C = useRef([]), w = useRef("idle"), T = useRef(null), E = useRef("");
+	let [p, h] = useState("idle"), [g, _] = useState(0), [v, y] = useState(i), [b, x] = useState(!1), S = useRef(null), ye = useRef(null), C = useRef([]), w = useRef([]), T = useRef("idle"), E = useRef(null), D = useRef("");
 	useEffect(() => {
-		w.current = p;
+		T.current = p;
 	}, [p]), useEffect(() => {
-		v(i);
+		y(i);
 	}, [i]), useEffect(() => {
-		if (!y) return;
+		if (!b) return;
 		let e = (e) => {
-			be.current && !be.current.contains(e.target) && x.current && !x.current.contains(e.target) && b(!1);
+			ye.current && !ye.current.contains(e.target) && S.current && !S.current.contains(e.target) && x(!1);
 		}, t = setTimeout(() => {
 			document.addEventListener("mousedown", e);
 		}, 0);
 		return () => {
 			clearTimeout(t), document.removeEventListener("mousedown", e);
 		};
-	}, [y]);
-	let xe = useCallback(() => {
-		for (let e of C.current) e.remove();
-		C.current = [], e && (e.getLayer(LINE_LAYER_ID) && e.removeLayer(LINE_LAYER_ID), e.getLayer(POINT_LAYER_ID) && e.removeLayer(POINT_LAYER_ID), e.getSource(SOURCE_ID) && e.removeSource(SOURCE_ID));
-	}, [e]), Se = useCallback(() => {
+	}, [b]);
+	let be = useCallback(() => {
+		for (let e of w.current) e.remove();
+		w.current = [], e && (e.getLayer(LINE_LAYER_ID) && e.removeLayer(LINE_LAYER_ID), e.getLayer(POINT_LAYER_ID) && e.removeLayer(POINT_LAYER_ID), e.getSource(SOURCE_ID) && e.removeSource(SOURCE_ID));
+	}, [e]), xe = useCallback(() => {
 		if (!e) return;
-		let t = S.current, n = {
+		let t = C.current, n = {
 			type: "FeatureCollection",
 			features: [{
 				type: "Feature",
@@ -5649,104 +5649,104 @@ const RoutePlanningControl = forwardRef(({ map: e, pointCount: i = 2, showPointC
 				"circle-stroke-color": "#fff"
 			}
 		}));
-	}, [e]), D = useCallback((t) => {
-		if (!e || !T.current) return;
-		let { visualType: n } = T.current;
+	}, [e]), O = useCallback((t) => {
+		if (!e || !E.current) return;
+		let { visualType: n } = E.current;
 		if (n === "marker") {
 			let n = document.createElement("div");
-			n.className = "route-planning-temp-marker", n.textContent = String(S.current.length);
+			n.className = "route-planning-temp-marker", n.textContent = String(C.current.length);
 			let r = new mapboxgl.Marker({ element: n }).setLngLat(t).addTo(e);
-			C.current.push(r);
-		} else Se();
-	}, [e, Se]), Ce = useCallback(() => {
-		xe(), S.current = [], T.current = null, g(0), m("idle"), e && (e.getCanvas().style.cursor = E.current);
-	}, [xe, e]), we = useCallback(async () => {
-		let e = T.current, t = [...S.current];
+			w.current.push(r);
+		} else xe();
+	}, [e, xe]), Se = useCallback(() => {
+		be(), C.current = [], E.current = null, _(0), h("idle"), e && (e.getCanvas().style.cursor = D.current);
+	}, [be, e]), Ce = useCallback(async () => {
+		let e = E.current, t = [...C.current];
 		if (!e || t.length < 2) {
-			Ce();
+			Se();
 			return;
 		}
-		m("planning");
+		h("planning");
 		try {
 			await e.onSelectFinished(t);
 		} catch (e) {
 			console.error("Route planning onSelectFinished failed:", e);
 		} finally {
-			Ce();
+			Se();
 		}
-	}, [Ce]), Te = useCallback((e) => {
-		if (w.current !== "selecting" || !T.current) return;
+	}, [Se]), we = useCallback((e) => {
+		if (T.current !== "selecting" || !E.current) return;
 		let t = [e.lngLat.lng, e.lngLat.lat];
-		S.current.push(t);
-		let n = S.current.length;
-		g(n), D(t), n >= T.current.pointCount && we();
-	}, [D, we]), O = useCallback((e) => {
-		w.current === "selecting" && (e.preventDefault(), Ce());
-	}, [Ce]);
+		C.current.push(t);
+		let n = C.current.length;
+		_(n), O(t), n >= E.current.pointCount && Ce();
+	}, [O, Ce]), k = useCallback((e) => {
+		T.current === "selecting" && (e.preventDefault(), Se());
+	}, [Se]);
 	useEffect(() => {
-		if (e && p === "selecting") return e.on("click", Te), e.on("contextmenu", O), () => {
-			e.off("click", Te), e.off("contextmenu", O);
+		if (e && p === "selecting") return e.on("click", we), e.on("contextmenu", k), () => {
+			e.off("click", we), e.off("contextmenu", k);
 		};
 	}, [
 		e,
 		p,
-		Te,
-		O
+		we,
+		k
 	]);
-	let k = useCallback((t) => {
+	let A = useCallback((t) => {
 		if (!e) return;
-		w.current !== "idle" && Ce();
+		T.current !== "idle" && Se();
 		let n = Math.max(2, t.pointCount ?? i), r = t.visualType ?? l;
-		T.current = {
+		E.current = {
 			pointCount: n,
 			visualType: r,
 			onSelectFinished: t.onSelectFinished
-		}, S.current = [], g(0), v(n), b(!1), E.current = e.getCanvas().style.cursor, e.getCanvas().style.cursor = "crosshair", m("selecting");
+		}, C.current = [], _(0), y(n), x(!1), D.current = e.getCanvas().style.cursor, e.getCanvas().style.cursor = "crosshair", h("selecting");
 	}, [
 		e,
 		i,
 		l,
-		Ce
+		Se
 	]);
-	useImperativeHandle(f, () => ({ startPlanning: k }), [k]);
-	let A = () => {
-		p === "idle" ? b((e) => !e) : p === "selecting" && Ce();
-	}, Ee = () => {
-		u && k({
-			pointCount: Math.max(2, _),
+	useImperativeHandle(f, () => ({ startPlanning: A }), [A]);
+	let j = () => {
+		p === "idle" ? x((e) => !e) : p === "selecting" && Se();
+	}, Te = () => {
+		u && A({
+			pointCount: Math.max(2, v),
 			visualType: l,
 			onSelectFinished: u
 		});
-	}, j = (e) => {
+	}, M = (e) => {
 		let t = parseInt(e.target.value, 10);
-		!isNaN(t) && t >= 2 ? v(t) : e.target.value === "" && v(2);
-	}, De = () => {
+		!isNaN(t) && t >= 2 ? y(t) : e.target.value === "" && y(2);
+	}, Ee = () => {
 		if (p === "planning") return /* @__PURE__ */ jsx("span", { children: "规划中..." });
 		if (p === "selecting") {
-			let e = T.current?.pointCount ?? _;
+			let e = E.current?.pointCount ?? v;
 			return /* @__PURE__ */ jsxs("span", { children: [
-				h,
+				g,
 				"/",
 				e
 			] });
 		}
 		return "路径规划";
-	}, Oe = p === "selecting", M = p === "planning";
+	}, De = p === "selecting", N = p === "planning";
 	return !d && p === "idle" ? null : /* @__PURE__ */ jsxs("div", {
 		className: `mapbox-route-planning-control${d ? "" : " mapbox-route-planning-control--floating"}`,
 		children: [/* @__PURE__ */ jsxs("button", {
-			ref: x,
-			className: `mapbox-control-btn mapbox-route-planning-control__btn${Oe ? " mapbox-route-planning-control__btn--active" : ""}${M ? " mapbox-route-planning-control__btn--planning" : ""}${y ? " mapbox-route-planning-control__btn--active" : ""}`,
-			onClick: A,
-			disabled: M,
+			ref: S,
+			className: `mapbox-control-btn mapbox-route-planning-control__btn${De ? " mapbox-route-planning-control__btn--active" : ""}${N ? " mapbox-route-planning-control__btn--planning" : ""}${b ? " mapbox-route-planning-control__btn--active" : ""}`,
+			onClick: j,
+			disabled: N,
 			title: p === "idle" ? "路径规划" : p === "selecting" ? "取消选点" : "规划中...",
 			children: [/* @__PURE__ */ jsx("img", {
 				src: route_planning_default,
 				alt: "route",
 				className: "mapbox-route-planning-control__btn-icon"
-			}), De()]
-		}), y && p === "idle" && /* @__PURE__ */ jsxs("div", {
-			ref: be,
+			}), Ee()]
+		}), b && p === "idle" && /* @__PURE__ */ jsxs("div", {
+			ref: ye,
 			className: "mapbox-route-planning-control__panel",
 			children: [/* @__PURE__ */ jsx("div", {
 				className: "mapbox-route-planning-control__panel-header",
@@ -5765,12 +5765,12 @@ const RoutePlanningControl = forwardRef(({ map: e, pointCount: i = 2, showPointC
 						}), c ? /* @__PURE__ */ jsx("input", {
 							type: "number",
 							className: "mapbox-route-planning-control__panel-input",
-							value: _,
+							value: v,
 							min: 2,
-							onChange: j
+							onChange: M
 						}) : /* @__PURE__ */ jsx("span", {
 							className: "mapbox-route-planning-control__panel-value",
-							children: _
+							children: v
 						})]
 					}),
 					/* @__PURE__ */ jsx("div", {
@@ -5779,7 +5779,7 @@ const RoutePlanningControl = forwardRef(({ map: e, pointCount: i = 2, showPointC
 					}),
 					/* @__PURE__ */ jsx("button", {
 						className: "mapbox-route-planning-control__panel-start",
-						onClick: Ee,
+						onClick: Te,
 						disabled: !u,
 						children: "开始规划"
 					})
@@ -5936,53 +5936,53 @@ function adjustPopupForBounds(e, t) {
 	return r.x + t.width + 10 > n.width && (r.x = n.width - t.width - 10), r.x < 10 && (r.x = 10), r.y + t.height + 10 > n.height && (r.y = n.height - t.height - 10), r.y < 10 && (r.y = 10), r;
 }
 const Mapbox = forwardRef((e, c) => {
-	let { center: l = [116.4074, 39.9042], zoom: u = 12, pitch: d = 0, bearing: f = 0, style: p = "mapbox://styles/mapbox/dark-v11", maxBounds: m, mode: h = "display", editConfig: g = {}, pickerConfig: _ = {}, onPick: v, interactive: y = {}, layers: b = [], rasterPaint: x, entities: C = [], selectedIds: w = [], entityConfig: T, nameConfig: E, selectNameConfig: D, areaConfig: O, circleConfig: k, lengthConfig: A, showCoordinates: Ee = !0, showScale: j = !0, showResetView: De = !0, showRoadHighlight: Oe = !1, showMeasure: M = !1, showRasterPaint: Ae = !1, showRoutePlanning: Pe, onRasterPaintChange: Fe, popupDefaults: N, renderPopup: Le, onMapLoad: Re, onEntityClick: ze, onPopupOpen: Be, onPopupClose: Ve, className: He = "", containerStyle: Ue } = e, We = useRef(null), Ge = useRef(null), P = useRef(null), F = useRef(/* @__PURE__ */ new Map()), I = useRef(/* @__PURE__ */ new Map()), Ke = useRef(/* @__PURE__ */ new Set()), [L, qe] = useState(null), Je = useRef(null), Ye = useRef(null), Xe = useRef(null), [Ze, Qe] = useState(null), $e = useRef(null), et = useRef(null), [R, tt] = useState(null), [z, nt] = useState(h), [rt, it] = useState(null), at = useRef(null), [ot, B] = useState(null), [st, V] = useState(null), [ct, lt] = useState(null), H = useRef(!1), U = useRef(null), ut = useRef(null), W = useRef(null), dt = useRef(null), G = useRef(null), ft = useRef([]), K = useRef(null), pt = useRef(null), q = useRef(null), mt = useRef([]), ht = useRef(null), gt = useRef(!1), [_t, vt] = useState([]), yt = useRef([]);
+	let { center: l = [116.4074, 39.9042], zoom: u = 12, pitch: d = 0, bearing: f = 0, style: p = "mapbox://styles/mapbox/dark-v11", maxBounds: h, mode: g = "display", editConfig: _ = {}, pickerConfig: v = {}, onPick: y, interactive: b = {}, layers: x = [], rasterPaint: S, entities: w = [], selectedIds: T = [], entityConfig: E, nameConfig: D, selectNameConfig: O, areaConfig: k, circleConfig: A, lengthConfig: j, showCoordinates: Te = !0, showScale: M = !0, showResetView: Ee = !0, showRoadHighlight: De = !1, showMeasure: N = !1, showRasterPaint: ke = !1, showRoutePlanning: Ne, onRasterPaintChange: Pe, popupDefaults: P, renderPopup: Ie, onMapLoad: Le, onEntityClick: Re, onPopupOpen: ze, onPopupClose: Be, className: Ve = "", containerStyle: He } = e, Ue = useRef(null), We = useRef(null), F = useRef(null), I = useRef(/* @__PURE__ */ new Map()), L = useRef(/* @__PURE__ */ new Map()), Ge = useRef(/* @__PURE__ */ new Set()), [R, Ke] = useState(null), qe = useRef(null), Je = useRef(null), Ye = useRef(null), [Xe, Ze] = useState(null), Qe = useRef(null), $e = useRef(null), [z, et] = useState(null), [tt, nt] = useState(g), [rt, it] = useState(null), at = useRef(null), [ot, B] = useState(null), [st, V] = useState(null), [ct, lt] = useState(null), H = useRef(!1), U = useRef(null), ut = useRef(null), W = useRef(null), dt = useRef(null), G = useRef(null), ft = useRef([]), K = useRef(null), pt = useRef(null), q = useRef(null), mt = useRef([]), ht = useRef(null), gt = useRef(!1), [_t, vt] = useState([]), yt = useRef([]);
 	yt.current = _t;
 	let J = useRef(null);
 	useEffect(() => {
-		nt(h);
-	}, [h]);
+		nt(g);
+	}, [g]);
 	let bt = useCallback((e) => {
-		let t = F.current.get(e), n = I.current.get(e);
+		let t = I.current.get(e), n = L.current.get(e);
 		if (t && n) {
 			if (n.type === "radar" && t instanceof CanvasRadarRenderer) {
 				let r = {
 					...n,
 					isAnimating: !0
 				};
-				I.current.set(e, r), t.startAnimation();
+				L.current.set(e, r), t.startAnimation();
 			} else if (n.type === "circle" && t instanceof CanvasCircleRenderer) {
 				let r = {
 					...n,
 					isAnimating: !0
 				};
-				I.current.set(e, r), t.startAnimation();
+				L.current.set(e, r), t.startAnimation();
 			}
 		}
 	}, []), xt = useCallback((e) => {
-		let t = F.current.get(e), n = I.current.get(e);
+		let t = I.current.get(e), n = L.current.get(e);
 		if (t && n) {
 			if (n.type === "radar" && t instanceof CanvasRadarRenderer) {
 				let r = {
 					...n,
 					isAnimating: !1
 				};
-				I.current.set(e, r), t.stopAnimation();
+				L.current.set(e, r), t.stopAnimation();
 			} else if (n.type === "circle" && t instanceof CanvasCircleRenderer) {
 				let r = {
 					...n,
 					isAnimating: !1
 				};
-				I.current.set(e, r), t.stopAnimation();
+				L.current.set(e, r), t.stopAnimation();
 			}
 		}
 	}, []), St = useCallback((e) => {
-		let t = I.current.get(e);
+		let t = L.current.get(e);
 		t && (t.type === "radar" || t.type === "circle") && (t.type, t.isAnimating ? xt(e) : bt(e));
 	}, [bt, xt]), Ct = useCallback((e) => {
 		if (e === void 0) {
 			let e = !1;
-			for (let [, t] of F.current) if (t instanceof UnitRenderer) {
+			for (let [, t] of I.current) if (t instanceof UnitRenderer) {
 				let n = t.getShowTrajectory();
 				if (n === "all" || typeof n == "number" && n > 0) {
 					e = !0;
@@ -5990,46 +5990,46 @@ const Mapbox = forwardRef((e, c) => {
 				}
 			}
 			let t = e ? 0 : "all";
-			for (let [, e] of F.current) e instanceof UnitRenderer && e.setShowTrajectory(t);
+			for (let [, e] of I.current) e instanceof UnitRenderer && e.setShowTrajectory(t);
 		} else {
 			let t = new Set(e.map(String));
-			for (let [e, n] of F.current) n instanceof UnitRenderer && n.setShowTrajectory(t.has(String(e)) ? "all" : 0);
+			for (let [e, n] of I.current) n instanceof UnitRenderer && n.setShowTrajectory(t.has(String(e)) ? "all" : 0);
 		}
 	}, []), wt = useCallback((e, t, n) => {
-		let r = C.find((t) => String(t.id) === String(e));
-		if (!r?.popup || !P.current) return;
-		let i = r.popup.content ?? Le?.(r);
+		let r = w.find((t) => String(t.id) === String(e));
+		if (!r?.popup || !F.current) return;
+		let i = r.popup.content ?? Ie?.(r);
 		if (!i) return;
-		let a = mergePopupConfig(r.popup, N, i), { position: o, actualPosition: s } = calculatePopupPosition(r, a, P.current, n);
-		qe({
+		let a = mergePopupConfig(r.popup, P, i), { position: o, actualPosition: s } = calculatePopupPosition(r, a, F.current, n);
+		Ke({
 			entityId: e,
 			position: o,
 			config: a,
 			openedBy: t,
 			actualPosition: s
-		}), Be?.(e);
+		}), ze?.(e);
 	}, [
-		C,
-		N,
-		Le,
-		Be
+		w,
+		P,
+		Ie,
+		ze
 	]), Tt = useCallback((e) => {
-		L?.entityId === e && (qe(null), Ve?.(e));
-	}, [L, Ve]), Et = useCallback(() => {
-		qe((e) => (e && Ve?.(e.entityId), null));
-	}, [Ve]), Dt = useCallback((e) => L?.entityId === e, [L]), Ot = useCallback((e, t, n) => {
-		let r = P.current;
+		R?.entityId === e && (Ke(null), Be?.(e));
+	}, [R, Be]), Et = useCallback(() => {
+		Ke((e) => (e && Be?.(e.entityId), null));
+	}, [Be]), Dt = useCallback((e) => R?.entityId === e, [R]), Ot = useCallback((e, t, n) => {
+		let r = F.current;
 		r && r.flyTo({
 			center: e,
 			zoom: t ?? r.getZoom(),
 			...n
 		});
 	}, []), kt = useCallback((e, t, n) => {
-		let r = P.current;
+		let r = F.current;
 		if (!r || e.length === 0) return;
 		let i = [];
 		for (let t of e) {
-			let e = F.current.get(t);
+			let e = I.current.get(t);
 			e && i.push(e.getBounds());
 		}
 		if (i.length === 0) return;
@@ -6052,9 +6052,9 @@ const Mapbox = forwardRef((e, c) => {
 		};
 		t !== void 0 && (p.maxZoom = t), n?.essential !== void 0 && (p.essential = n.essential), r.fitBounds(f, p);
 	}, []), At = useCallback((e) => {
-		let t = P.current;
+		let t = F.current;
 		if (!t || !t.getContainer()) return;
-		let { showMarker: n = !0, markerColor: r = "#3388ff", name: i, nameConfig: a } = _;
+		let { showMarker: n = !0, markerColor: r = "#3388ff", name: i, nameConfig: a } = v;
 		if (!n) {
 			at.current &&= (at.current.remove(), null);
 			return;
@@ -6063,7 +6063,7 @@ const Mapbox = forwardRef((e, c) => {
 			at.current.setLngLat(e);
 			let t = at.current.getElement(), n = t.querySelector(".marker-label");
 			if (i) {
-				let e = resolveNameConfig(a, E);
+				let e = resolveNameConfig(a, D);
 				if (n) n.textContent = i, n.style.color = e.fillColor, n.style.opacity = String(e.fillOpacity), n.style.webkitTextStrokeColor = e.strokeColor, n.style.webkitTextStrokeWidth = `${e.strokeWidth}px`;
 				else {
 					let n = document.createElement("div");
@@ -6075,7 +6075,7 @@ const Mapbox = forwardRef((e, c) => {
 			n.className = "mapbox-picker-marker";
 			let o = document.createElement("div");
 			if (o.className = "marker-inner", o.style.background = r, n.appendChild(o), i) {
-				let e = resolveNameConfig(a, E), t = document.createElement("div");
+				let e = resolveNameConfig(a, D), t = document.createElement("div");
 				t.className = "marker-label", t.textContent = i, t.style.color = e.fillColor, t.style.opacity = String(e.fillOpacity), t.style.webkitTextStrokeColor = e.strokeColor, t.style.webkitTextStrokeWidth = `${e.strokeWidth}px`, n.appendChild(t);
 			}
 			at.current = new mapboxgl.Marker({
@@ -6083,11 +6083,11 @@ const Mapbox = forwardRef((e, c) => {
 				anchor: "bottom"
 			}).setLngLat(e).addTo(t);
 		}
-	}, [_, E]), jt = useCallback(() => {
+	}, [v, D]), jt = useCallback(() => {
 		at.current &&= (at.current.remove(), null);
 	}, []), Mt = useCallback(() => `marker-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`, []), Nt = useCallback((e) => {
-		let t = P.current;
-		if (We.current) if (ht.current &&= (ht.current.remove(), null), e && t) {
+		let t = F.current;
+		if (Ue.current) if (ht.current &&= (ht.current.remove(), null), e && t) {
 			t.getCanvas().style.cursor = "none";
 			let n = document.createElement("div");
 			n.className = "mapbox-custom-cursor";
@@ -6107,7 +6107,7 @@ const Mapbox = forwardRef((e, c) => {
 			let e = ht.current._cleanup;
 			e && e(), ht.current.remove(), ht.current = null;
 		}
-		let e = P.current;
+		let e = F.current;
 		e && (e.getCanvas().style.cursor = "");
 	}, []), Pt = useCallback((e, t, n) => {
 		if (!e.getSource(t)) {
@@ -6146,7 +6146,7 @@ const Mapbox = forwardRef((e, c) => {
 			});
 		}
 	}, []), Ft = useCallback(() => {
-		let e = P.current;
+		let e = F.current;
 		e && (e.getSource("rect-preview-source") || (e.addSource("rect-preview-source", {
 			type: "geojson",
 			data: {
@@ -6172,7 +6172,7 @@ const Mapbox = forwardRef((e, c) => {
 			}
 		}), Pt(e, "rect-preview-measure-source", "rect-preview-measure-label")));
 	}, [Pt]), It = useCallback((e, t) => {
-		let n = P.current;
+		let n = F.current;
 		if (!n) return;
 		let r = n.getSource("rect-preview-source");
 		if (!r) return;
@@ -6193,8 +6193,8 @@ const Mapbox = forwardRef((e, c) => {
 		});
 		let l = U.current, u = l?.strokeColor ?? "#3388ff", d = l?.strokeWidth ?? 2, f = l?.fillColor ?? "#3388ff", p = l?.fillOpacity ?? .1;
 		n.getLayer("rect-preview-line") && (n.setPaintProperty("rect-preview-line", "line-color", u), n.setPaintProperty("rect-preview-line", "line-width", d)), n.getLayer("rect-preview-fill") && (n.setPaintProperty("rect-preview-fill", "fill-color", f), n.setPaintProperty("rect-preview-fill", "fill-opacity", p));
-		let ve = n.getSource("rect-preview-measure-source");
-		if (ve) {
+		let m = n.getSource("rect-preview-measure-source");
+		if (m) {
 			let e = Pn.current, t = [], n = c[0], r = c[1], i = c[2];
 			if (e?.showArea) {
 				let e = [(n[0] + i[0]) / 2, (n[1] + i[1]) / 2], a = distance(n, r), o = distance(r, i);
@@ -6227,13 +6227,13 @@ const Mapbox = forwardRef((e, c) => {
 					properties: { label: formatLength(distance(r, i)) }
 				});
 			}
-			ve.setData({
+			m.setData({
 				type: "FeatureCollection",
 				features: t
 			});
 		}
 	}, []), Lt = useCallback(() => {
-		let e = P.current;
+		let e = F.current;
 		if (!e) return;
 		let t = e.getSource("rect-preview-source");
 		t && t.setData({
@@ -6248,7 +6248,7 @@ const Mapbox = forwardRef((e, c) => {
 	}, []), X = useCallback(() => {
 		lt(null), Lt();
 	}, [Lt]), Rt = useCallback(() => {
-		let e = P.current;
+		let e = F.current;
 		e && (e.getSource("circle-preview-source") || (e.addSource("circle-preview-source", {
 			type: "geojson",
 			data: {
@@ -6300,7 +6300,7 @@ const Mapbox = forwardRef((e, c) => {
 		let [n, r] = e, [i, a] = t, o = (a - r) * Math.PI / 180, s = (i - n) * Math.PI / 180, c = Math.sin(o / 2) * Math.sin(o / 2) + Math.cos(r * Math.PI / 180) * Math.cos(a * Math.PI / 180) * Math.sin(s / 2) * Math.sin(s / 2);
 		return 6371e3 * (2 * Math.atan2(Math.sqrt(c), Math.sqrt(1 - c)));
 	}, []), Vt = useCallback((e, t) => {
-		let n = P.current;
+		let n = F.current;
 		if (!n) return;
 		let r = n.getSource("circle-preview-source");
 		if (!r) return;
@@ -6345,18 +6345,18 @@ const Mapbox = forwardRef((e, c) => {
 				properties: { label: formatLength(i) }
 			});
 		}
-		let ve = n.getSource("circle-preview-measure-source");
-		ve && ve.setData({
+		let m = n.getSource("circle-preview-measure-source");
+		m && m.setData({
 			type: "FeatureCollection",
 			features: f
 		});
-		let ye = n.getSource("circle-preview-radius-source");
-		ye && ye.setData({
+		let ve = n.getSource("circle-preview-radius-source");
+		ve && ve.setData({
 			type: "FeatureCollection",
 			features: p
 		});
 	}, [Bt, zt]), Ht = useCallback(() => {
-		let e = P.current;
+		let e = F.current;
 		if (!e) return;
 		let t = e.getSource("circle-preview-source");
 		t && t.setData({
@@ -6376,7 +6376,7 @@ const Mapbox = forwardRef((e, c) => {
 	}, []), Ut = useCallback(() => {
 		dt.current = null, Ht();
 	}, [Ht]), Wt = useCallback(() => {
-		let e = P.current;
+		let e = F.current;
 		e && (e.getSource("polygon-preview-source") || (e.addSource("polygon-preview-source", {
 			type: "geojson",
 			data: {
@@ -6418,7 +6418,7 @@ const Mapbox = forwardRef((e, c) => {
 			}
 		}), Pt(e, "polygon-preview-measure-source", "polygon-preview-measure-label")));
 	}, [Pt]), Gt = useCallback((e, t) => {
-		let n = P.current;
+		let n = F.current;
 		if (!n) return;
 		let r = n.getSource("polygon-preview-source"), i = n.getSource("polygon-vertices-source");
 		if (!r || !i) return;
@@ -6502,7 +6502,7 @@ const Mapbox = forwardRef((e, c) => {
 			});
 		}
 	}, []), Kt = useCallback(() => {
-		let e = P.current;
+		let e = F.current;
 		if (!e) return;
 		let t = e.getSource("polygon-preview-source");
 		t && t.setData({
@@ -6522,7 +6522,7 @@ const Mapbox = forwardRef((e, c) => {
 	}, []), qt = useCallback(() => {
 		ft.current = [], Kt();
 	}, [Kt]), Jt = useCallback(() => {
-		let e = P.current;
+		let e = F.current;
 		e && (e.getSource("square-preview-source") || (e.addSource("square-preview-source", {
 			type: "geojson",
 			data: {
@@ -6557,7 +6557,7 @@ const Mapbox = forwardRef((e, c) => {
 			[n - s, r + o]
 		];
 	}, []), Xt = useCallback((e, t) => {
-		let n = P.current;
+		let n = F.current;
 		if (!n) return;
 		let r = n.getSource("square-preview-source");
 		if (!r) return;
@@ -6599,7 +6599,7 @@ const Mapbox = forwardRef((e, c) => {
 			});
 		}
 	}, [Bt, Yt]), Zt = useCallback(() => {
-		let e = P.current;
+		let e = F.current;
 		if (!e) return;
 		let t = e.getSource("square-preview-source");
 		t && t.setData({
@@ -6614,7 +6614,7 @@ const Mapbox = forwardRef((e, c) => {
 	}, []), Qt = useCallback(() => {
 		pt.current = null, Zt();
 	}, [Zt]), $t = useCallback(() => {
-		let e = P.current;
+		let e = F.current;
 		e && (e.getSource("polyline-preview-source") || (e.addSource("polyline-preview-source", {
 			type: "geojson",
 			data: {
@@ -6648,7 +6648,7 @@ const Mapbox = forwardRef((e, c) => {
 			}
 		}), Pt(e, "polyline-preview-measure-source", "polyline-preview-measure-label")));
 	}, [Pt]), en = useCallback((e, t) => {
-		let n = P.current;
+		let n = F.current;
 		if (!n) return;
 		let r = n.getSource("polyline-preview-source"), i = n.getSource("polyline-vertices-source");
 		if (!r || !i) return;
@@ -6696,7 +6696,7 @@ const Mapbox = forwardRef((e, c) => {
 			});
 		}
 	}, []), tn = useCallback(() => {
-		let e = P.current;
+		let e = F.current;
 		if (!e) return;
 		let t = e.getSource("polyline-preview-source");
 		t && t.setData({
@@ -6727,23 +6727,23 @@ const Mapbox = forwardRef((e, c) => {
 	]), rn = useCallback((e) => {
 		if (V(e), e === "rectangle") {
 			B(null), Y(), Ut(), qt(), Qt(), Z();
-			let e = P.current;
+			let e = F.current;
 			e && (e.getCanvas().style.cursor = "crosshair");
 		} else if (e === "circle") {
 			B(null), Y(), X(), qt(), Qt(), Z();
-			let e = P.current;
+			let e = F.current;
 			e && (e.getCanvas().style.cursor = "crosshair");
 		} else if (e === "polygon") {
 			B(null), Y(), X(), Ut(), Qt(), Z();
-			let e = P.current;
+			let e = F.current;
 			e && (e.getCanvas().style.cursor = "crosshair");
 		} else if (e === "square") {
 			B(null), Y(), X(), Ut(), qt(), Z();
-			let e = P.current;
+			let e = F.current;
 			e && (e.getCanvas().style.cursor = "crosshair");
 		} else if (e === "polyline") {
 			B(null), Y(), X(), Ut(), qt(), Qt();
-			let e = P.current;
+			let e = F.current;
 			e && (e.getCanvas().style.cursor = "crosshair");
 		} else e === "marker" ? (X(), Ut(), qt(), Qt(), Z()) : (B(null), Y(), X(), Ut(), qt(), Qt(), Z());
 	}, [
@@ -6755,7 +6755,7 @@ const Mapbox = forwardRef((e, c) => {
 		Z
 	]), an = useCallback((e) => {
 		if (e !== "picker") {
-			let e = _.value && isFinite(_.value.lng) && isFinite(_.value.lat), t = _.showMarker !== !1;
+			let e = v.value && isFinite(v.value.lng) && isFinite(v.value.lat), t = v.showMarker !== !1;
 			(!e || !t) && jt(), it(null);
 		}
 		e !== "edit" && (B(null), V(null), X(), Z(), Y()), nt(e);
@@ -6764,20 +6764,20 @@ const Mapbox = forwardRef((e, c) => {
 		Y,
 		X,
 		Z
-	]), on = useCallback(() => z, [z]), sn = useCallback(() => rt, [rt]), cn = useCallback(() => {
+	]), on = useCallback(() => tt, [tt]), sn = useCallback(() => rt, [rt]), cn = useCallback(() => {
 		jt(), it(null);
 	}, [jt]);
 	useEffect(() => {
-		if (!R) return;
-		let e = _.value;
+		if (!z) return;
+		let e = v.value;
 		if (e && isFinite(e.lng) && isFinite(e.lat)) {
 			let t = [e.lng, e.lat];
 			it(e), At(t);
 		}
 	}, [
-		_.value,
+		v.value,
 		At,
-		R
+		z
 	]);
 	let ln = (e) => "mode" in e, un = useCallback((e) => {
 		if (nt("edit"), jt(), it(null), H.current = !0, ln(e)) {
@@ -6789,23 +6789,23 @@ const Mapbox = forwardRef((e, c) => {
 			}) : Y()) : e.template && (ut.current = null, U.current = null, W.current = null, G.current = null, K.current = null, q.current = null, B(e.template), V("marker"), Nt(e.template));
 			else if (e.mode === "rectangle") {
 				U.current = e.rectangleStyle || null, ut.current = null, W.current = null, G.current = null, K.current = null, q.current = null, B(null), V("rectangle"), Y();
-				let t = P.current;
+				let t = F.current;
 				t && (t.getCanvas().style.cursor = "crosshair");
 			} else if (e.mode === "circle") {
 				W.current = e.circleStyle || null, U.current = null, ut.current = null, G.current = null, K.current = null, q.current = null, B(null), V("circle"), Y();
-				let t = P.current;
+				let t = F.current;
 				t && (t.getCanvas().style.cursor = "crosshair");
 			} else if (e.mode === "polygon") {
 				G.current = e.polygonStyle || null, U.current = null, ut.current = null, W.current = null, K.current = null, q.current = null, B(null), V("polygon"), Y();
-				let t = P.current;
+				let t = F.current;
 				t && (t.getCanvas().style.cursor = "crosshair");
 			} else if (e.mode === "square") {
 				K.current = e.squareStyle || null, U.current = null, ut.current = null, W.current = null, G.current = null, q.current = null, B(null), V("square"), Y();
-				let t = P.current;
+				let t = F.current;
 				t && (t.getCanvas().style.cursor = "crosshair");
 			} else if (e.mode === "polyline") {
 				q.current = e.polylineStyle || null, U.current = null, ut.current = null, W.current = null, G.current = null, K.current = null, B(null), V("polyline"), Y();
-				let t = P.current;
+				let t = F.current;
 				t && (t.getCanvas().style.cursor = "crosshair");
 			}
 		} else B(e), V("marker"), Nt(e), U.current = null, ut.current = null, W.current = null, G.current = null, K.current = null, q.current = null;
@@ -6818,7 +6818,7 @@ const Mapbox = forwardRef((e, c) => {
 		startAnimation: bt,
 		stopAnimation: xt,
 		toggleAnimation: St,
-		getMap: () => P.current,
+		getMap: () => F.current,
 		openPopup: (e) => wt(e, "programmatic"),
 		closePopup: Tt,
 		closeAllPopups: Et,
@@ -6831,15 +6831,15 @@ const Mapbox = forwardRef((e, c) => {
 		getPickedLocation: sn,
 		clearPickedLocation: cn,
 		startDrawing: un,
-		getRenderer: (e) => F.current.get(e),
+		getRenderer: (e) => I.current.get(e),
 		setEditingEntities: (e) => {
-			for (let t of yt.current) e.map(String).includes(String(t)) || F.current.get(t)?.setEditing?.(!1);
-			for (let t of e) F.current.get(t)?.setEditing?.(!0);
-			J.current &&= (F.current.get(J.current.entityId)?.cancelEditPreview?.(), null), vt(e);
+			for (let t of yt.current) e.map(String).includes(String(t)) || I.current.get(t)?.setEditing?.(!1);
+			for (let t of e) I.current.get(t)?.setEditing?.(!0);
+			J.current &&= (I.current.get(J.current.entityId)?.cancelEditPreview?.(), null), vt(e);
 		},
 		getEditingEntities: () => yt.current,
 		startRoutePlanning: (e) => {
-			Ge.current?.startPlanning(e);
+			We.current?.startPlanning(e);
 		}
 	}), [
 		bt,
@@ -6859,13 +6859,13 @@ const Mapbox = forwardRef((e, c) => {
 		un
 	]);
 	let dn = useCallback(() => {
-		let e = P.current;
+		let e = F.current;
 		if (!e) return;
-		let t = new Set(C.map((e) => e.id)), n = new Set(F.current.keys());
-		for (let e of n) t.has(e) || (F.current.get(e)?.destroy(), F.current.delete(e));
-		let r = new Set(w.map(String));
-		for (let t of C) {
-			let n = applyEntityConfig(t, T), i = F.current.get(n.id);
+		let t = new Set(w.map((e) => e.id)), n = new Set(I.current.keys());
+		for (let e of n) t.has(e) || (I.current.get(e)?.destroy(), I.current.delete(e));
+		let r = new Set(T.map(String));
+		for (let t of w) {
+			let n = applyEntityConfig(t, E), i = I.current.get(n.id);
 			if (i) if (n.type === "radar" && i instanceof CanvasRadarRenderer) i.update(n);
 			else if (n.type === "image" && i instanceof CanvasImageRenderer) i.update(n);
 			else if (n.type === "marker" && i instanceof MarkerRenderer) i.update(n);
@@ -6874,37 +6874,37 @@ const Mapbox = forwardRef((e, c) => {
 			else if (n.type === "circle") if (n.fillType === "radial-gradient") if (i instanceof CanvasCircleRenderer) i.update(n);
 			else {
 				i.destroy();
-				let t = new CanvasCircleRenderer(e, n, E, D, O, k);
-				F.current.set(n.id, t), t.setSelected(r.has(String(n.id)));
+				let t = new CanvasCircleRenderer(e, n, D, O, k, A);
+				I.current.set(n.id, t), t.setSelected(r.has(String(n.id)));
 			}
 			else if (i instanceof CircleRenderer) i.update(n);
 			else {
 				i.destroy();
-				let t = new CircleRenderer(e, n, E, D, O, k);
-				F.current.set(n.id, t), t.setSelected(r.has(String(n.id)));
+				let t = new CircleRenderer(e, n, D, O, k, A);
+				I.current.set(n.id, t), t.setSelected(r.has(String(n.id)));
 			}
 			else (n.type === "square" && i instanceof SquareRenderer || n.type === "rectangle" && i instanceof RectangleRenderer || n.type === "polyline" && i instanceof PolylineRenderer) && i.update(n);
 			else {
 				let t = null;
-				n.type === "radar" ? t = new CanvasRadarRenderer(e, n, E, D) : n.type === "image" ? t = new CanvasImageRenderer(e, n, E, D) : n.type === "marker" ? t = new MarkerRenderer(e, n, E, D) : n.type === "unit" ? t = new UnitRenderer(e, n, E, D) : n.type === "polygon" ? t = new PolygonRenderer(e, n, E, D, O, A) : n.type === "circle" ? t = n.fillType === "radial-gradient" ? new CanvasCircleRenderer(e, n, E, D, O, k) : new CircleRenderer(e, n, E, D, O, k) : n.type === "square" ? t = new SquareRenderer(e, n, E, D, O, A) : n.type === "rectangle" ? t = new RectangleRenderer(e, n, E, D, O, A) : n.type === "polyline" && (t = new PolylineRenderer(e, n, E, D, A)), t && (F.current.set(n.id, t), t.setSelected(r.has(String(n.id))), yt.current.map(String).includes(String(n.id)) && t.setEditing?.(!0));
+				n.type === "radar" ? t = new CanvasRadarRenderer(e, n, D, O) : n.type === "image" ? t = new CanvasImageRenderer(e, n, D, O) : n.type === "marker" ? t = new MarkerRenderer(e, n, D, O) : n.type === "unit" ? t = new UnitRenderer(e, n, D, O) : n.type === "polygon" ? t = new PolygonRenderer(e, n, D, O, k, j) : n.type === "circle" ? t = n.fillType === "radial-gradient" ? new CanvasCircleRenderer(e, n, D, O, k, A) : new CircleRenderer(e, n, D, O, k, A) : n.type === "square" ? t = new SquareRenderer(e, n, D, O, k, j) : n.type === "rectangle" ? t = new RectangleRenderer(e, n, D, O, k, j) : n.type === "polyline" && (t = new PolylineRenderer(e, n, D, O, j)), t && (I.current.set(n.id, t), t.setSelected(r.has(String(n.id))), yt.current.map(String).includes(String(n.id)) && t.setEditing?.(!0));
 			}
 		}
 		for (let e of yt.current) {
-			let t = F.current.get(e);
+			let t = I.current.get(e);
 			t && t.setEditing?.(!0);
 		}
 	}, [
-		C,
 		w,
 		T,
 		E,
 		D,
 		O,
 		k,
-		A
+		A,
+		j
 	]), fn = useCallback(() => {
-		for (let e of F.current.values()) e.destroy();
-		F.current.clear();
+		for (let e of I.current.values()) e.destroy();
+		I.current.clear();
 	}, []), pn = useCallback((e) => {
 		let t = e.getStyle();
 		if (!t?.layers) return;
@@ -6921,9 +6921,9 @@ const Mapbox = forwardRef((e, c) => {
 		];
 		for (let e of t.layers) if (n.some((t) => e.id.startsWith(t))) return e.id;
 	}, []), mn = useCallback((e) => {
-		let t = x, n = { "raster-opacity": e.opacity ?? 1 }, r = e.brightness ?? t?.brightness, i = e.saturation ?? t?.saturation, a = e.contrast ?? t?.contrast, o = e.hueRotate ?? t?.hueRotate;
+		let t = S, n = { "raster-opacity": e.opacity ?? 1 }, r = e.brightness ?? t?.brightness, i = e.saturation ?? t?.saturation, a = e.contrast ?? t?.contrast, o = e.hueRotate ?? t?.hueRotate;
 		return r !== void 0 && (n["raster-brightness-min"] = 0, n["raster-brightness-max"] = r), i !== void 0 && (n["raster-saturation"] = i), a !== void 0 && (n["raster-contrast"] = a), o !== void 0 && (n["raster-hue-rotate"] = o), n;
-	}, [x]), hn = useCallback((e, t) => {
+	}, [S]), hn = useCallback((e, t) => {
 		let n = `base-layer-source-${t.id}`, r = `base-layer-${t.id}`, i = {
 			type: "raster",
 			tiles: [t.url],
@@ -6944,7 +6944,7 @@ const Mapbox = forwardRef((e, c) => {
 	}, [pn, mn]), gn = useCallback(async (e, t) => {
 		try {
 			let n = await (await fetch(t.url)).json(), r = `base-layer-source-${t.id}`, i = `base-layer-${t.id}`;
-			if (!Ke.current.has(t.id)) return;
+			if (!Ge.current.has(t.id)) return;
 			let a = n.format === "pbf" || n.vector_layers, o = pn(e);
 			if (a) {
 				let t = {
@@ -6975,7 +6975,7 @@ const Mapbox = forwardRef((e, c) => {
 	}, [pn, mn]), _n = useCallback(async (e, t) => {
 		try {
 			let n = await (await fetch(t.url)).json();
-			if (!Ke.current.has(t.id)) return;
+			if (!Ge.current.has(t.id)) return;
 			if (n.sources) for (let [r, i] of Object.entries(n.sources)) {
 				let n = `base-layer-source-${t.id}-${r}`;
 				e.getSource(n) || e.addSource(n, i);
@@ -7012,9 +7012,9 @@ const Mapbox = forwardRef((e, c) => {
 		let a = `base-layer-source-${t}`, o = n.sources ?? {};
 		for (let t of Object.keys(o)) t.startsWith(a) && e.getSource(t) && e.removeSource(t);
 	}, []), yn = useCallback((e) => {
-		let t = P.current;
+		let t = F.current;
 		if (!t) return;
-		let n = new Set(e.map((e) => e.id)), r = Ke.current;
+		let n = new Set(e.map((e) => e.id)), r = Ge.current;
 		for (let e of r) n.has(e) || (vn(t, e), r.delete(e));
 		for (let n of e) if (r.has(n.id)) {
 			let e = `base-layer-${n.id}`;
@@ -7080,12 +7080,12 @@ const Mapbox = forwardRef((e, c) => {
 						id: n?.id ?? Mt(),
 						type: "rectangle",
 						bounds: [e, t]
-					}, T);
+					}, E);
 					Lt();
-					let i = P.current;
-					if (i && !F.current.has(r.id)) {
-						let e = new RectangleRenderer(i, r, E, D, O, A);
-						F.current.set(r.id, e);
+					let i = F.current;
+					if (i && !I.current.has(r.id)) {
+						let e = new RectangleRenderer(i, r, D, O, k, j);
+						I.current.set(r.id, e);
 					}
 					Q.current.onRectangleAdd?.(r), lt(null), U.current = null, H.current && (H.current = !1, V(null), i && (i.getCanvas().style.cursor = ""));
 				}
@@ -7101,12 +7101,12 @@ const Mapbox = forwardRef((e, c) => {
 						type: "circle",
 						center: e.center,
 						radius: n
-					}, T);
+					}, E);
 					Ht();
-					let a = P.current;
-					if (a && !F.current.has(i.id)) {
-						let e = new CircleRenderer(a, i, E, D, O, k);
-						F.current.set(i.id, e);
+					let a = F.current;
+					if (a && !I.current.has(i.id)) {
+						let e = new CircleRenderer(a, i, D, O, k, A);
+						I.current.set(i.id, e);
 					}
 					Q.current.onCircleAdd?.(i), dt.current = null, W.current = null, H.current && (H.current = !1, V(null), a && (a.getCanvas().style.cursor = ""));
 				}
@@ -7122,12 +7122,12 @@ const Mapbox = forwardRef((e, c) => {
 							id: t?.id ?? Mt(),
 							type: "polygon",
 							coordinates: [...e]
-						}, T);
+						}, E);
 						Kt();
-						let r = P.current;
-						if (r && !F.current.has(n.id)) {
-							let e = new PolygonRenderer(r, n, E, D, O, A);
-							F.current.set(n.id, e);
+						let r = F.current;
+						if (r && !I.current.has(n.id)) {
+							let e = new PolygonRenderer(r, n, D, O, k, j);
+							I.current.set(n.id, e);
 						}
 						Q.current.onPolygonAdd?.(n), ft.current = [], G.current = null, H.current && (H.current = !1, V(null), r && (r.getCanvas().style.cursor = ""));
 						return;
@@ -7146,12 +7146,12 @@ const Mapbox = forwardRef((e, c) => {
 						type: "square",
 						center: e.center,
 						length: n
-					}, T);
+					}, E);
 					Zt();
-					let a = P.current;
-					if (a && !F.current.has(i.id)) {
-						let e = new SquareRenderer(a, i, E, D, O, A);
-						F.current.set(i.id, e);
+					let a = F.current;
+					if (a && !I.current.has(i.id)) {
+						let e = new SquareRenderer(a, i, D, O, k, j);
+						I.current.set(i.id, e);
 					}
 					Q.current.onSquareAdd?.(i), pt.current = null, K.current = null, H.current && (H.current = !1, V(null), a && (a.getCanvas().style.cursor = ""));
 				}
@@ -7189,9 +7189,9 @@ const Mapbox = forwardRef((e, c) => {
 			}
 		}
 		if (yt.current.length > 0) {
-			let e = P.current?.getZoom() ?? 12;
+			let e = F.current?.getZoom() ?? 12;
 			if (J.current) {
-				let { entityId: e, activeHandle: n } = J.current, r = F.current.get(e);
+				let { entityId: e, activeHandle: n } = J.current, r = I.current.get(e);
 				if (r?.applyHandleMove) {
 					let e = r.applyHandleMove(n, t);
 					Q.current.onEntityEdit?.(e);
@@ -7200,7 +7200,7 @@ const Mapbox = forwardRef((e, c) => {
 				return;
 			}
 			for (let n of yt.current) {
-				let r = F.current.get(n);
+				let r = I.current.get(n);
 				if (!r?.getEditHandleAt) continue;
 				let i = r.getEditHandleAt(t, e);
 				if (i) {
@@ -7227,44 +7227,44 @@ const Mapbox = forwardRef((e, c) => {
 			let e = i.find((e) => String(e.id) === s);
 			if (e) {
 				if (a?.(e), e.popup) {
-					let t = e.popup.content ?? Le?.(e);
-					t && mergePopupConfig(e.popup, N, t).trigger === "click" && o(s, "click", n);
+					let t = e.popup.content ?? Ie?.(e);
+					t && mergePopupConfig(e.popup, P, t).trigger === "click" && o(s, "click", n);
 				}
 				return;
 			}
 		}
-		for (let [t, r] of F.current) {
+		for (let [t, r] of I.current) {
 			let s = r.getLabelLayerId();
-			if (s && P.current?.getLayer(s) && P.current.queryRenderedFeatures(e.point, { layers: [s] }).length > 0) {
+			if (s && F.current?.getLayer(s) && F.current.queryRenderedFeatures(e.point, { layers: [s] }).length > 0) {
 				let e = i.find((e) => e.id === t);
 				if (e) {
 					if (a?.(e), e.popup) {
-						let r = e.popup.content ?? Le?.(e);
-						r && mergePopupConfig(e.popup, N, r).trigger === "click" && o(t, "click", n);
+						let r = e.popup.content ?? Ie?.(e);
+						r && mergePopupConfig(e.popup, P, r).trigger === "click" && o(t, "click", n);
 					}
 					return;
 				}
 			}
 		}
-		for (let [e, r] of F.current) if (r.isPointInEntity(t)) {
+		for (let [e, r] of I.current) if (r.isPointInEntity(t)) {
 			let t = i.find((t) => t.id === e);
 			if (t) {
 				if (a?.(t), t.popup) {
-					let r = t.popup.content ?? Le?.(t);
-					r && mergePopupConfig(t.popup, N, r).trigger === "click" && o(e, "click", n);
+					let r = t.popup.content ?? Ie?.(t);
+					r && mergePopupConfig(t.popup, P, r).trigger === "click" && o(e, "click", n);
 				}
 				return;
 			}
 		}
 	}, [
-		N,
-		Le,
+		P,
+		Ie,
 		bn
 	]), Sn = useCallback((e) => {
 		let t = [e.lngLat.lng, e.lngLat.lat];
 		if (J.current) {
 			let { entityId: e, activeHandle: n } = J.current;
-			F.current.get(e)?.updateEditPreview?.(n, t);
+			I.current.get(e)?.updateEditPreview?.(n, t);
 			return;
 		}
 		let n = Mn.current, r = Nn.current;
@@ -7278,27 +7278,27 @@ const Mapbox = forwardRef((e, c) => {
 		let s = mt.current;
 		n === "polyline" && s.length > 0 && en(s, t);
 		let c = En.current, l = On.current;
-		for (let [e, n] of F.current) if (n.isPointInEntity(t)) {
+		for (let [e, n] of I.current) if (n.isPointInEntity(t)) {
 			let t = c.find((t) => t.id === e);
 			if (!t?.popup) continue;
-			let n = t.popup.content ?? Le?.(t);
+			let n = t.popup.content ?? Ie?.(t);
 			if (!n) continue;
-			let r = mergePopupConfig(t.popup, N, n);
+			let r = mergePopupConfig(t.popup, P, n);
 			if (r.trigger === "hover") {
-				Xe.current && clearTimeout(Xe.current), Xe.current = window.setTimeout(() => {
+				Ye.current && clearTimeout(Ye.current), Ye.current = window.setTimeout(() => {
 					l(e, "hover");
 				}, r.hoverDelay);
 				return;
 			}
 		}
-		if (Xe.current &&= (clearTimeout(Xe.current), null), L?.openedBy === "hover") {
-			let e = F.current.get(L.entityId);
-			e && !e.isPointInEntity(t) && Tt(L.entityId);
+		if (Ye.current &&= (clearTimeout(Ye.current), null), R?.openedBy === "hover") {
+			let e = I.current.get(R.entityId);
+			e && !e.isPointInEntity(t) && Tt(R.entityId);
 		}
 	}, [
-		N,
-		Le,
-		L,
+		P,
+		Ie,
+		R,
 		Tt,
 		It,
 		Vt,
@@ -7310,12 +7310,12 @@ const Mapbox = forwardRef((e, c) => {
 		if (yt.current.length > 0) {
 			let t = [e.lngLat.lng, e.lngLat.lat];
 			if (J.current) {
-				F.current.get(J.current.entityId)?.cancelEditPreview?.(), J.current = null;
+				I.current.get(J.current.entityId)?.cancelEditPreview?.(), J.current = null;
 				return;
 			}
-			let n = P.current?.getZoom() ?? 12;
+			let n = F.current?.getZoom() ?? 12;
 			for (let e of yt.current) {
-				let r = F.current.get(e);
+				let r = I.current.get(e);
 				if (!r?.getEditHandleAt || !r.deleteVertex) continue;
 				let i = r.getEditHandleAt(t, n);
 				if (i && i.type === "vertex") {
@@ -7335,7 +7335,7 @@ const Mapbox = forwardRef((e, c) => {
 			if (Nn.current) lt(null), Lt();
 			else {
 				V(null);
-				let e = P.current;
+				let e = F.current;
 				e && (e.getCanvas().style.cursor = "");
 			}
 			return;
@@ -7344,7 +7344,7 @@ const Mapbox = forwardRef((e, c) => {
 			if (dt.current) dt.current = null, Ht();
 			else {
 				V(null);
-				let e = P.current;
+				let e = F.current;
 				e && (e.getCanvas().style.cursor = "");
 			}
 			return;
@@ -7357,18 +7357,18 @@ const Mapbox = forwardRef((e, c) => {
 					id: t?.id ?? Mt(),
 					type: "polygon",
 					coordinates: [...e]
-				}, T);
+				}, E);
 				Kt();
-				let r = P.current;
-				if (r && !F.current.has(n.id)) {
-					let e = new PolygonRenderer(r, n, E, D, O, A);
-					F.current.set(n.id, e);
+				let r = F.current;
+				if (r && !I.current.has(n.id)) {
+					let e = new PolygonRenderer(r, n, D, O, k, j);
+					I.current.set(n.id, e);
 				}
 				Q.current.onPolygonAdd?.(n), ft.current = [], G.current = null, H.current && (H.current = !1, V(null), r && (r.getCanvas().style.cursor = ""));
 			} else if (e.length > 0) ft.current = [], Kt();
 			else {
 				V(null);
-				let e = P.current;
+				let e = F.current;
 				e && (e.getCanvas().style.cursor = "");
 			}
 			return;
@@ -7377,7 +7377,7 @@ const Mapbox = forwardRef((e, c) => {
 			if (pt.current) pt.current = null, Zt();
 			else {
 				V(null);
-				let e = P.current;
+				let e = F.current;
 				e && (e.getCanvas().style.cursor = "");
 			}
 			return;
@@ -7390,18 +7390,18 @@ const Mapbox = forwardRef((e, c) => {
 					id: t?.id ?? Mt(),
 					type: "polyline",
 					coordinates: [...e]
-				}, T);
+				}, E);
 				tn();
-				let r = P.current;
-				if (r && !F.current.has(n.id)) {
-					let e = new PolylineRenderer(r, n, E, D, A);
-					F.current.set(n.id, e);
+				let r = F.current;
+				if (r && !I.current.has(n.id)) {
+					let e = new PolylineRenderer(r, n, D, O, j);
+					I.current.set(n.id, e);
 				}
 				Q.current.onPolylineAdd?.(n), mt.current = [], q.current = null, H.current && (H.current = !1, V(null), r && (r.getCanvas().style.cursor = ""));
 			} else if (e.length > 0) mt.current = [], tn();
 			else {
 				V(null);
-				let e = P.current;
+				let e = F.current;
 				e && (e.getCanvas().style.cursor = "");
 			}
 			return;
@@ -7417,9 +7417,9 @@ const Mapbox = forwardRef((e, c) => {
 				return;
 			}
 		}
-		for (let [t, a] of F.current) {
+		for (let [t, a] of I.current) {
 			let o = a.getLabelLayerId();
-			if (o && P.current?.getLayer(o) && P.current.queryRenderedFeatures(e.point, { layers: [o] }).length > 0) {
+			if (o && F.current?.getLayer(o) && F.current.queryRenderedFeatures(e.point, { layers: [o] }).length > 0) {
 				let e = i.find((e) => e.id === t);
 				if (e) {
 					wn(e, r, n);
@@ -7427,7 +7427,7 @@ const Mapbox = forwardRef((e, c) => {
 				}
 			}
 		}
-		for (let [e, t] of F.current) if (t.isPointInEntity(n)) {
+		for (let [e, t] of I.current) if (t.isPointInEntity(n)) {
 			let t = i.find((t) => t.id === e);
 			if (t) {
 				wn(t, r, n);
@@ -7443,11 +7443,11 @@ const Mapbox = forwardRef((e, c) => {
 		Zt,
 		tn
 	]), wn = useCallback((e, t, n) => {
-		let r = We.current?.getBoundingClientRect(), i = r ? {
+		let r = Ue.current?.getBoundingClientRect(), i = r ? {
 			x: t.x + r.left,
 			y: t.y + r.top
 		} : t;
-		Qe({
+		Ze({
 			position: i,
 			lngLat: n,
 			items: [{
@@ -7468,7 +7468,7 @@ const Mapbox = forwardRef((e, c) => {
 			}]
 		});
 	}, []), Tn = useCallback(() => {
-		Qe(null);
+		Ze(null);
 	}, []);
 	useEffect(() => {
 		let e = document.createElement("div");
@@ -7479,11 +7479,11 @@ const Mapbox = forwardRef((e, c) => {
 			width: 100%;
 			pointer-events: none;
 			height: 100%;
-			z-index: ${N?.zIndex ?? 1e3};
-		`, document.body.appendChild(e), Je.current = e, () => {
+			z-index: ${P?.zIndex ?? 1e3};
+		`, document.body.appendChild(e), qe.current = e, () => {
 			document.body.contains(e) && document.body.removeChild(e);
 		};
-	}, [N?.zIndex]), useEffect(() => {
+	}, [P?.zIndex]), useEffect(() => {
 		let e = document.createElement("div");
 		return e.id = `mapbox-context-menu-container-${Date.now()}`, e.style.cssText = `
 			position: fixed;
@@ -7492,65 +7492,65 @@ const Mapbox = forwardRef((e, c) => {
 			width: 100%;
 			pointer-events: none;
 			height: 100%;
-			z-index: ${(N?.zIndex ?? 1e3) + 100};
-		`, document.body.appendChild(e), $e.current = e, () => {
+			z-index: ${(P?.zIndex ?? 1e3) + 100};
+		`, document.body.appendChild(e), Qe.current = e, () => {
 			document.body.contains(e) && document.body.removeChild(e);
 		};
-	}, [N?.zIndex]);
-	let En = useRef(C);
-	En.current = C;
-	let Dn = useRef(ze);
-	Dn.current = ze;
+	}, [P?.zIndex]);
+	let En = useRef(w);
+	En.current = w;
+	let Dn = useRef(Re);
+	Dn.current = Re;
 	let On = useRef(wt);
 	On.current = wt;
-	let kn = useRef(z);
-	kn.current = z;
-	let An = useRef(v);
-	An.current = v;
+	let kn = useRef(tt);
+	kn.current = tt;
+	let An = useRef(y);
+	An.current = y;
 	let jn = useRef(ot);
 	jn.current = ot;
 	let Mn = useRef(st);
 	Mn.current = st;
 	let Nn = useRef(ct);
 	Nn.current = ct;
-	let Q = useRef(g);
-	Q.current = g;
-	let Pn = useRef(T);
-	Pn.current = T, useEffect(() => {
+	let Q = useRef(_);
+	Q.current = _;
+	let Pn = useRef(E);
+	Pn.current = E, useEffect(() => {
 		let e = (e) => {
 			if (e.key === "Escape" && J.current) {
-				F.current.get(J.current.entityId)?.cancelEditPreview?.(), J.current = null;
+				I.current.get(J.current.entityId)?.cancelEditPreview?.(), J.current = null;
 				return;
 			}
-			if (e.key === "Escape" && z === "edit") {
+			if (e.key === "Escape" && tt === "edit") {
 				if (ot && (B(null), V(null), Y()), st === "rectangle") if (ct) lt(null), Lt();
 				else {
 					V(null);
-					let e = P.current;
+					let e = F.current;
 					e && (e.getCanvas().style.cursor = "");
 				}
 				if (st === "circle") if (dt.current) dt.current = null, Ht();
 				else {
 					V(null);
-					let e = P.current;
+					let e = F.current;
 					e && (e.getCanvas().style.cursor = "");
 				}
 				if (st === "polygon") if (ft.current.length > 0) ft.current = [], Kt();
 				else {
 					V(null);
-					let e = P.current;
+					let e = F.current;
 					e && (e.getCanvas().style.cursor = "");
 				}
 				if (st === "square") if (pt.current) pt.current = null, Zt();
 				else {
 					V(null);
-					let e = P.current;
+					let e = F.current;
 					e && (e.getCanvas().style.cursor = "");
 				}
 				if (st === "polyline") if (mt.current.length > 0) mt.current = [], tn();
 				else {
 					V(null);
-					let e = P.current;
+					let e = F.current;
 					e && (e.getCanvas().style.cursor = "");
 				}
 			}
@@ -7559,7 +7559,7 @@ const Mapbox = forwardRef((e, c) => {
 			document.removeEventListener("keydown", e);
 		};
 	}, [
-		z,
+		tt,
 		ot,
 		st,
 		ct,
@@ -7570,51 +7570,51 @@ const Mapbox = forwardRef((e, c) => {
 		Zt,
 		tn
 	]), useEffect(() => {
-		let e = P.current;
-		if (!e || !L) return;
-		let t = L.entityId, n = L.config, r = () => {
+		let e = F.current;
+		if (!e || !R) return;
+		let t = R.entityId, n = R.config, r = () => {
 			let r = En.current.find((e) => e.id === t);
 			if (!r) {
 				Et();
 				return;
 			}
-			let { position: i } = calculatePopupPosition(r, n, e, void 0, Ye.current);
-			Ye.current && (Ye.current.style.left = `${i.x}px`, Ye.current.style.top = `${i.y}px`);
+			let { position: i } = calculatePopupPosition(r, n, e, void 0, Je.current);
+			Je.current && (Je.current.style.left = `${i.x}px`, Je.current.style.top = `${i.y}px`);
 		}, i = setTimeout(() => {
 			r();
 		}, 50);
 		return e.on("move", r), e.on("zoom", r), e.on("rotate", r), e.on("pitch", r), () => {
 			clearTimeout(i), e.off("move", r), e.off("zoom", r), e.off("rotate", r), e.off("pitch", r);
 		};
-	}, [L?.entityId, Et]), useEffect(() => {
-		let e = P.current, t = We.current;
-		if (!e || !Ze || !t) return;
-		let n = Ze.lngLat, r = () => {
+	}, [R?.entityId, Et]), useEffect(() => {
+		let e = F.current, t = Ue.current;
+		if (!e || !Xe || !t) return;
+		let n = Xe.lngLat, r = () => {
 			let r = e.project(n), i = t.clientWidth, a = t.clientHeight;
 			if (r.x < 0 || r.x > i || r.y < 0 || r.y > a) {
 				Tn();
 				return;
 			}
 			let o = t.getBoundingClientRect(), s = r.x + o.left, c = r.y + o.top;
-			et.current && (et.current.style.left = `${s}px`, et.current.style.top = `${c}px`);
+			$e.current && ($e.current.style.left = `${s}px`, $e.current.style.top = `${c}px`);
 		};
 		return e.on("move", r), e.on("zoom", r), e.on("rotate", r), e.on("pitch", r), () => {
 			e.off("move", r), e.off("zoom", r), e.off("rotate", r), e.off("pitch", r);
 		};
-	}, [Ze?.lngLat, Tn]), useEffect(() => {
-		if (!We.current) return;
+	}, [Xe?.lngLat, Tn]), useEffect(() => {
+		if (!Ue.current) return;
 		let e = {
 			version: 8,
 			sources: {},
 			layers: []
-		}, { dragPan: t = !0, scrollZoom: n = !0, doubleClickZoom: r = !0, touchZoomRotate: i = !0, keyboard: a = !0, dragRotate: o = !0, pitchWithRotate: c = !0, touchPitch: ve = !0, boxZoom: ye = !0 } = y, h = new mapboxgl.Map({
-			container: We.current,
+		}, { dragPan: t = !0, scrollZoom: n = !0, doubleClickZoom: r = !0, touchZoomRotate: i = !0, keyboard: a = !0, dragRotate: o = !0, pitchWithRotate: c = !0, touchPitch: m = !0, boxZoom: ve = !0 } = b, g = new mapboxgl.Map({
+			container: Ue.current,
 			style: p || e,
 			center: l,
 			zoom: u,
 			pitch: d,
 			bearing: f,
-			maxBounds: m,
+			maxBounds: h,
 			dragPan: t,
 			scrollZoom: n,
 			doubleClickZoom: r,
@@ -7622,8 +7622,8 @@ const Mapbox = forwardRef((e, c) => {
 			keyboard: a,
 			dragRotate: o,
 			pitchWithRotate: c,
-			touchPitch: ve,
-			boxZoom: ye,
+			touchPitch: m,
+			boxZoom: ve,
 			transformRequest: (e, t) => {
 				if (t === "Glyphs") {
 					let t = e.match(/\/fonts\/([^/]+)\/(\d+-\d+)\.pbf/);
@@ -7635,54 +7635,54 @@ const Mapbox = forwardRef((e, c) => {
 				return { url: e };
 			}
 		});
-		return P.current = h, h.on("load", () => {
-			if (!h.getStyle().glyphs) {
-				let e = h.style, t = "/gis-fonts/{fontstack}/{range}.pbf";
+		return F.current = g, g.on("load", () => {
+			if (!g.getStyle().glyphs) {
+				let e = g.style, t = "/gis-fonts/{fontstack}/{range}.pbf";
 				e.glyphs = t, e.stylesheet && (e.stylesheet.glyphs = t);
 			}
-			I.current.clear(), C.forEach((e) => {
-				I.current.set(e.id, e);
-			}), yn(b), dn(), Ft(), Rt(), Wt(), Jt(), $t(), tt(h), Re?.(h);
-		}), h.on("click", xn), h.on("mousemove", Sn), h.on("contextmenu", Cn), () => {
-			h.off("click", xn), h.off("mousemove", Sn), h.off("contextmenu", Cn), fn(), jt(), Y(), X(), Z(), h.remove(), P.current = null;
+			L.current.clear(), w.forEach((e) => {
+				L.current.set(e.id, e);
+			}), yn(x), dn(), Ft(), Rt(), Wt(), Jt(), $t(), et(g), Le?.(g);
+		}), g.on("click", xn), g.on("mousemove", Sn), g.on("contextmenu", Cn), () => {
+			g.off("click", xn), g.off("mousemove", Sn), g.off("contextmenu", Cn), fn(), jt(), Y(), X(), Z(), g.remove(), F.current = null;
 		};
 	}, []), useEffect(() => {
-		if (P.current) {
-			if (!P.current.isStyleLoaded()) {
-				P.current.once("load", () => {
-					I.current.clear(), C.forEach((e) => {
-						I.current.set(e.id, e);
+		if (F.current) {
+			if (!F.current.isStyleLoaded()) {
+				F.current.once("load", () => {
+					L.current.clear(), w.forEach((e) => {
+						L.current.set(e.id, e);
 					}), dn();
 				});
 				return;
 			}
-			I.current.clear(), C.forEach((e) => {
-				I.current.set(e.id, e);
+			L.current.clear(), w.forEach((e) => {
+				L.current.set(e.id, e);
 			}), dn();
 		}
-	}, [C, dn]), useEffect(() => {
-		!P.current || !P.current.isStyleLoaded() || (fn(), dn());
+	}, [w, dn]), useEffect(() => {
+		!F.current || !F.current.isStyleLoaded() || (fn(), dn());
 	}, [
-		E,
 		D,
 		O,
 		k,
 		A,
+		j,
 		fn,
 		dn
 	]), useEffect(() => {
-		if (P.current) {
-			if (!P.current.isStyleLoaded()) {
-				P.current.once("load", () => {
-					yn(b);
+		if (F.current) {
+			if (!F.current.isStyleLoaded()) {
+				F.current.once("load", () => {
+					yn(x);
 				});
 				return;
 			}
-			yn(b);
+			yn(x);
 		}
-	}, [b, yn]);
-	let Fn = useRef(void 0), In = useRef(!0), Ln = useRef(b);
-	Ln.current = b;
+	}, [x, yn]);
+	let Fn = useRef(void 0), In = useRef(!0), Ln = useRef(x);
+	Ln.current = x;
 	let Rn = useRef(yn);
 	Rn.current = yn;
 	let zn = useRef(fn);
@@ -7699,7 +7699,7 @@ const Mapbox = forwardRef((e, c) => {
 	Wn.current = Jt;
 	let Gn = useRef($t);
 	Gn.current = $t, useEffect(() => {
-		let e = P.current;
+		let e = F.current;
 		if (!e) return;
 		let t = p || {
 			version: 8,
@@ -7715,15 +7715,15 @@ const Mapbox = forwardRef((e, c) => {
 				let t = e.style, n = "/gis-fonts/{fontstack}/{range}.pbf";
 				t.glyphs = n, t.stylesheet && (t.stylesheet.glyphs = n);
 			}
-			Ke.current.clear(), Rn.current(Ln.current), zn.current(), Bn.current(), Vn.current(), Hn.current(), Un.current(), Wn.current(), Gn.current();
+			Ge.current.clear(), Rn.current(Ln.current), zn.current(), Bn.current(), Vn.current(), Hn.current(), Un.current(), Wn.current(), Gn.current();
 		}));
 	}, [p]), useEffect(() => {
-		let e = new Set(w.map(String));
-		for (let [t, n] of F.current) n.setSelected(e.has(String(t)));
-	}, [w]);
+		let e = new Set(T.map(String));
+		for (let [t, n] of I.current) n.setSelected(e.has(String(t)));
+	}, [T]);
 	let Kn = useRef({});
 	useEffect(() => {
-		let e = P.current;
+		let e = F.current;
 		if (!e) return;
 		let t = Kn.current, n = l && (t.center?.[0] !== l[0] || t.center?.[1] !== l[1]), r = t.zoom !== u, i = t.pitch !== d, a = t.bearing !== f;
 		!n && !r && !i && !a || (Kn.current = {
@@ -7743,13 +7743,13 @@ const Mapbox = forwardRef((e, c) => {
 		d,
 		f
 	]);
-	let qn = (() => Ee === !1 ? null : Ee === !0 ? { enabled: !0 } : Ee)(), Jn = (() => j === !1 ? null : j === !0 ? { enabled: !0 } : j)(), Yn = (() => De === !1 ? null : De === !0 ? { enabled: !0 } : De)(), $ = (() => {
-		if (Oe === !1) return null;
+	let qn = (() => Te === !1 ? null : Te === !0 ? { enabled: !0 } : Te)(), Jn = (() => M === !1 ? null : M === !0 ? { enabled: !0 } : M)(), Yn = (() => Ee === !1 ? null : Ee === !0 ? { enabled: !0 } : Ee)(), $ = (() => {
+		if (De === !1) return null;
 		let e, t, n;
-		if (b && b.length > 0) {
-			let r = b.find((e) => e.hasRoadNetwork === !0) || b[0];
+		if (x && x.length > 0) {
+			let r = x.find((e) => e.hasRoadNetwork === !0) || x[0];
 			if (r.type === "style") {
-				let t = P.current?.getStyle();
+				let t = F.current?.getStyle();
 				if (t?.sources) {
 					let n = `base-layer-source-${r.id}-`, i = Object.keys(t.sources).find((e) => e.startsWith(n));
 					i && (e = i);
@@ -7757,63 +7757,63 @@ const Mapbox = forwardRef((e, c) => {
 			} else e = `base-layer-source-${r.id}`;
 			t = r.roadNetworkSourceLayer || "road", n = r.roadNetworkClassField;
 		}
-		return Oe === !0 ? {
+		return De === !0 ? {
 			enabled: !0,
 			source: e,
 			sourceLayer: t,
 			classField: n
 		} : {
-			...Oe,
-			source: Oe.source || e,
-			sourceLayer: Oe.sourceLayer || t,
-			classField: Oe.classField || n
+			...De,
+			source: De.source || e,
+			sourceLayer: De.sourceLayer || t,
+			classField: De.classField || n
 		};
-	})(), Xn = (() => M ? M === !0 ? { enabled: !0 } : M : null)(), Zn = (() => Ae ? Ae === !0 ? { enabled: !0 } : Ae : null)(), Qn = (() => Pe || null)(), $n = useMemo(() => {
+	})(), Xn = (() => N ? N === !0 ? { enabled: !0 } : N : null)(), Zn = (() => ke ? ke === !0 ? { enabled: !0 } : ke : null)(), Qn = (() => Ne || null)(), $n = useMemo(() => {
 		let e = [];
-		for (let t of b) if (t.applyRasterPaint) if (t.type === "style") {
-			let n = P.current;
+		for (let t of x) if (t.applyRasterPaint) if (t.type === "style") {
+			let n = F.current;
 			if (n) {
 				let r = `base-layer-${t.id}-`, i = n.getStyle();
 				if (i?.layers) for (let t of i.layers) t.id.startsWith(r) && t.type === "raster" && e.push(t.id);
 			}
 		} else e.push(`base-layer-${t.id}`);
 		return e;
-	}, [b, R]);
+	}, [x, z]);
 	return /* @__PURE__ */ jsxs("div", {
-		className: `comp-mapbox ${z === "picker" ? "comp-mapbox--picker-mode" : ""} ${He}`,
-		style: Ue,
+		className: `comp-mapbox ${tt === "picker" ? "comp-mapbox--picker-mode" : ""} ${Ve}`,
+		style: He,
 		children: [
 			/* @__PURE__ */ jsx("div", {
-				ref: We,
+				ref: Ue,
 				className: "comp-mapbox__map"
 			}),
-			z === "picker" && _.showCrosshair === !0 && /* @__PURE__ */ jsxs("div", {
+			tt === "picker" && v.showCrosshair === !0 && /* @__PURE__ */ jsxs("div", {
 				className: "comp-mapbox__crosshair",
 				children: [/* @__PURE__ */ jsx("div", {
 					className: "comp-mapbox__crosshair-h",
-					style: _.crosshairColor ? { backgroundColor: _.crosshairColor } : void 0
+					style: v.crosshairColor ? { backgroundColor: v.crosshairColor } : void 0
 				}), /* @__PURE__ */ jsx("div", {
 					className: "comp-mapbox__crosshair-v",
-					style: _.crosshairColor ? { backgroundColor: _.crosshairColor } : void 0
+					style: v.crosshairColor ? { backgroundColor: v.crosshairColor } : void 0
 				})]
 			}),
-			z === "edit" && g.showEditTools !== !1 && (g.markerTemplates && g.markerTemplates.length > 0 || g.showRectangleTool || g.showCircleTool || g.showPolygonTool || g.showSquareTool || g.showPolylineTool) || $ && $.enabled !== !1 || Qn && Qn.enabled !== !1 ? /* @__PURE__ */ jsxs("div", {
+			tt === "edit" && _.showEditTools !== !1 && (_.markerTemplates && _.markerTemplates.length > 0 || _.showRectangleTool || _.showCircleTool || _.showPolygonTool || _.showSquareTool || _.showPolylineTool) || $ && $.enabled !== !1 || Qn && Qn.enabled !== !1 ? /* @__PURE__ */ jsxs("div", {
 				className: "comp-mapbox__edit-controls",
 				children: [
-					z === "edit" && g.showEditTools !== !1 && (g.markerTemplates && g.markerTemplates.length > 0 || g.showRectangleTool || g.showCircleTool || g.showPolygonTool || g.showSquareTool || g.showPolylineTool) && /* @__PURE__ */ jsx(EditControl, {
-						markerTemplates: g.markerTemplates || [],
+					tt === "edit" && _.showEditTools !== !1 && (_.markerTemplates && _.markerTemplates.length > 0 || _.showRectangleTool || _.showCircleTool || _.showPolygonTool || _.showSquareTool || _.showPolylineTool) && /* @__PURE__ */ jsx(EditControl, {
+						markerTemplates: _.markerTemplates || [],
 						selectedTemplate: ot,
 						onTemplateSelect: nn,
 						drawMode: st,
 						onDrawModeChange: rn,
-						showRectangleTool: g.showRectangleTool,
-						showCircleTool: g.showCircleTool,
-						showPolygonTool: g.showPolygonTool,
-						showSquareTool: g.showSquareTool,
-						showPolylineTool: g.showPolylineTool
+						showRectangleTool: _.showRectangleTool,
+						showCircleTool: _.showCircleTool,
+						showPolygonTool: _.showPolygonTool,
+						showSquareTool: _.showSquareTool,
+						showPolylineTool: _.showPolylineTool
 					}),
 					$ && $.enabled !== !1 && /* @__PURE__ */ jsx(RoadHighlightControl, {
-						map: R,
+						map: z,
 						highlightWidth: $.highlightWidth,
 						defaultRoadTypes: $.defaultRoadTypes,
 						defaultMinWidth: $.defaultMinWidth,
@@ -7824,8 +7824,8 @@ const Mapbox = forwardRef((e, c) => {
 						style: $.style
 					}),
 					Qn && Qn.enabled !== !1 && /* @__PURE__ */ jsx(RoutePlanningControl, {
-						ref: Ge,
-						map: R,
+						ref: We,
+						map: z,
 						pointCount: Qn.pointCount,
 						showPointCountInput: Qn.showPointCountInput,
 						visualType: Qn.visualType,
@@ -7837,21 +7837,21 @@ const Mapbox = forwardRef((e, c) => {
 				className: "comp-mapbox__controls",
 				children: [
 					qn && qn.enabled !== !1 && /* @__PURE__ */ jsx(CoordinateDisplay, {
-						map: R,
+						map: z,
 						precision: qn.precision,
 						className: qn.className,
 						style: qn.style
 					}),
 					Jn && Jn.enabled !== !1 && /* @__PURE__ */ jsx(ScaleControl, {
-						map: R,
+						map: z,
 						maxWidth: Jn.maxWidth,
 						unit: Jn.unit,
 						className: Jn.className,
 						style: Jn.style
 					}),
 					Xn && Xn.enabled !== !1 && /* @__PURE__ */ jsx(MeasureControl, {
-						map: R,
-						entityConfig: T,
+						map: z,
+						entityConfig: E,
 						onDrawModeChange: (e) => {
 							gt.current = e;
 						},
@@ -7859,15 +7859,15 @@ const Mapbox = forwardRef((e, c) => {
 						style: Xn.style
 					}),
 					Zn && Zn.enabled !== !1 && /* @__PURE__ */ jsx(RasterPaintControl, {
-						map: R,
-						value: x,
-						onChange: Fe,
+						map: z,
+						value: S,
+						onChange: Pe,
 						rasterPaintLayerIds: $n,
 						className: Zn.className,
 						style: Zn.style
 					}),
 					Yn && Yn.enabled !== !1 && /* @__PURE__ */ jsx(ResetViewControl, {
-						map: R,
+						map: z,
 						initialCenter: l,
 						initialZoom: u,
 						initialPitch: d,
@@ -7879,21 +7879,21 @@ const Mapbox = forwardRef((e, c) => {
 				]
 			}),
 			!(Qn && Qn.enabled !== !1) && /* @__PURE__ */ jsx(RoutePlanningControl, {
-				ref: Ge,
-				map: R,
+				ref: We,
+				map: z,
 				showButton: !1
 			}),
-			L && Je.current && /* @__PURE__ */ jsx(EntityPopup, {
-				popupState: L,
-				onClose: () => Tt(L.entityId),
-				portalContainer: Je.current,
-				popupRef: Ye
+			R && qe.current && /* @__PURE__ */ jsx(EntityPopup, {
+				popupState: R,
+				onClose: () => Tt(R.entityId),
+				portalContainer: qe.current,
+				popupRef: Je
 			}),
-			Ze && $e.current && /* @__PURE__ */ jsx(ContextMenu, {
-				menuState: Ze,
+			Xe && Qe.current && /* @__PURE__ */ jsx(ContextMenu, {
+				menuState: Xe,
 				onClose: Tn,
-				portalContainer: $e.current,
-				menuRef: et
+				portalContainer: Qe.current,
+				menuRef: $e
 			})
 		]
 	});