bbl-mapbox-react 0.0.18 → 0.0.19

package/dist/index.mjs

@@ -4167,9 +4167,9 @@ function detectVectorSource(e) {
 	};
 	return null;
 }
-function RoadHighlightControl({ map: e, highlightWidth: r = 3, defaultRoadTypes: i = [], defaultMinWidth: c = 0, source: l, sourceLayer: u, className: d = "", style: f }) {
-	let [g, _] = useState(!1), [v, y] = useState(i), [b, x] = useState(!1), S = useRef(null), C = useRef(null), w = useRef(null), T = useCallback((e, t, n) => {
-		if (!e.isStyleLoaded()) return !1;
+function RoadHighlightControl({ map: e, highlightWidth: r = 3, defaultRoadTypes: i = [], defaultMinWidth: c = 0, source: l, sourceLayer: u, classField: d = "class", className: f = "", style: g }) {
+	let [_, v] = useState(!1), [y, b] = useState(i), [x, S] = useState(!1), C = useRef(!1), ve = useRef(null), w = useRef(null), T = useRef(null), E = useCallback((e, t, n) => {
+		if (!e.isStyleLoaded() || !e.getSource(t)) return !1;
 		let i = !0;
 		return ROAD_TYPE_OPTIONS.forEach((a) => {
 			let o = `${LAYER_ID_PREFIX}${a.class}`;
@@ -4181,7 +4181,7 @@ function RoadHighlightControl({ map: e, highlightWidth: r = 3, defaultRoadTypes:
 					"source-layer": n,
 					filter: [
 						"==",
-						["get", "class"],
+						["get", d],
 						a.class
 					],
 					paint: {
@@ -4195,7 +4195,7 @@ function RoadHighlightControl({ map: e, highlightWidth: r = 3, defaultRoadTypes:
 				console.error(`Failed to add road highlight layer for ${a.class}:`, e), i = !1;
 			}
 		}), i;
-	}, [r]);
+	}, [r, d]);
 	useEffect(() => {
 		if (!e) return;
 		let t = () => {
@@ -4204,25 +4204,27 @@ 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 ? T(e, t, n) && x(!0) : console.warn("No vector source found for road highlighting");
+			t && n ? E(e, t, n) && (C.current = !0, S(!0)) : console.warn("No vector source found for road highlighting");
 		};
 		e.isStyleLoaded() ? t() : e.once("load", t);
 		let n = () => {
 			e.isStyleLoaded() && t();
+		}, r = () => {
+			C.current || t();
 		};
-		return e.on("styledata", n), () => {
-			e.off("styledata", n);
+		return e.on("styledata", n), e.on("sourcedata", r), () => {
+			e.off("styledata", n), e.off("sourcedata", r);
 		};
 	}, [
 		e,
 		l,
 		u,
-		T
+		E
 	]), useEffect(() => {
-		!e || !b || ROAD_TYPE_OPTIONS.forEach((t) => {
+		!e || !x || ROAD_TYPE_OPTIONS.forEach((t) => {
 			let n = `${LAYER_ID_PREFIX}${t.class}`;
 			if (e.getLayer(n)) try {
-				let r = v.includes(t.class);
+				let r = y.includes(t.class);
 				e.setLayoutProperty(n, "visibility", r ? "visible" : "none");
 			} catch (e) {
 				console.error(`Failed to update layer ${n}:`, e);
@@ -4230,38 +4232,38 @@ function RoadHighlightControl({ map: e, highlightWidth: r = 3, defaultRoadTypes:
 		});
 	}, [
 		e,
-		b,
-		v
+		x,
+		y
 	]), useEffect(() => {
-		if (!g) return;
+		if (!_) return;
 		let e = (e) => {
-			S.current && !S.current.contains(e.target) && C.current && !C.current.contains(e.target) && _(!1);
+			ve.current && !ve.current.contains(e.target) && w.current && !w.current.contains(e.target) && v(!1);
 		}, t = setTimeout(() => {
 			document.addEventListener("mousedown", e);
 		}, 0);
 		return () => {
 			clearTimeout(t), document.removeEventListener("mousedown", e);
 		};
-	}, [g]), useEffect(() => () => {
+	}, [_]), 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 {}
-		}), w.current &&= (w.current.remove(), null);
+		}), T.current &&= (T.current.remove(), null);
 	}, [e]);
-	let E = useCallback((e) => ROAD_TYPE_OPTIONS.find((t) => t.class === e)?.label || e, []), D = useCallback((t) => {
-		if (!e || v.length === 0) {
-			w.current && w.current.remove(), e?.getCanvas().style.cursor && (e.getCanvas().style.cursor = "");
+	let ye = useCallback((e) => ROAD_TYPE_OPTIONS.find((t) => t.class === e)?.label || e, []), be = useCallback((t) => {
+		if (!e || y.length === 0) {
+			T.current && T.current.remove(), e?.getCanvas().style.cursor && (e.getCanvas().style.cursor = "");
 			return;
 		}
-		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)) });
+		let n = y.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.class || "", c = n.type || "", l = n.structure || "", u = n.oneway, d = n.layer, f = n.iso_3166_1 || "", p = n.iso_3166_2 || "", m = (e) => !(e == null || e === "" || typeof e == "string" && e.toLowerCase() === "none"), h = [];
 			m(o) && h.push(`
 						<div class="road-highlight-popup__row">
 							<span>道路类型:</span>
-							<span class="road-highlight-popup__value">${E(o)}</span>
+							<span class="road-highlight-popup__value">${ye(o)}</span>
 						</div>
 					`), h.push(`
 					<div class="road-highlight-popup__row">
@@ -4310,47 +4312,47 @@ function RoadHighlightControl({ map: e, highlightWidth: r = 3, defaultRoadTypes:
 						<div class="road-highlight-popup__info">${h.join("")}</div>
 					</div>
 				`;
-			w.current ||= new mapboxgl.Popup({
+			T.current ||= new mapboxgl.Popup({
 				closeButton: !1,
 				closeOnClick: !1,
 				offset: 15,
 				className: "road-highlight-popup"
-			}), w.current.setLngLat(r).setHTML(g).addTo(e), e.getCanvas().style.cursor = "pointer";
-		} else w.current && w.current.remove(), e.getCanvas().style.cursor = "";
+			}), T.current.setLngLat(r).setHTML(g).addTo(e), e.getCanvas().style.cursor = "pointer";
+		} else T.current && T.current.remove(), e.getCanvas().style.cursor = "";
 	}, [
 		e,
-		v,
-		E
+		y,
+		ye
 	]);
 	useEffect(() => {
-		if (!(!e || !b)) return e.on("mousemove", D), () => {
-			e.off("mousemove", D), w.current && w.current.remove(), e.getCanvas().style.cursor = "";
+		if (!(!e || !x)) return e.on("mousemove", be), () => {
+			e.off("mousemove", be), T.current && T.current.remove(), e.getCanvas().style.cursor = "";
 		};
 	}, [
 		e,
-		b,
-		D
+		x,
+		be
 	]);
-	let ve = (e, t) => {
-		y((n) => t ? [...n, e] : n.filter((t) => t !== e));
-	}, ye = (e) => {
-		y(e ? ROAD_TYPE_OPTIONS.map((e) => e.class) : []);
-	}, k = v.length > 0;
+	let O = (e, t) => {
+		b((n) => t ? [...n, e] : n.filter((t) => t !== e));
+	}, xe = (e) => {
+		b(e ? ROAD_TYPE_OPTIONS.map((e) => e.class) : []);
+	}, Se = y.length > 0;
 	return /* @__PURE__ */ jsxs("div", {
-		className: `mapbox-road-highlight-control ${d}`,
-		style: f,
+		className: `mapbox-road-highlight-control ${f}`,
+		style: g,
 		children: [/* @__PURE__ */ jsxs("button", {
-			ref: C,
-			className: `mapbox-control-btn mapbox-road-highlight-control__btn ${k ? "mapbox-road-highlight-control__btn--active" : ""}`,
-			onClick: () => _(!g),
-			title: `路网高亮${v.length > 0 ? ` (已选 ${v.length})` : ""}`,
+			ref: w,
+			className: `mapbox-control-btn mapbox-road-highlight-control__btn ${Se ? "mapbox-road-highlight-control__btn--active" : ""}`,
+			onClick: () => v(!_),
+			title: `路网高亮${y.length > 0 ? ` (已选 ${y.length})` : ""}`,
 			children: [/* @__PURE__ */ jsx("img", {
 				src: road_default,
 				alt: "road",
 				className: "mapbox-road-highlight-control__btn-icon"
-			}), /* @__PURE__ */ jsxs("span", { children: ["路网", v.length > 0 ? ` (${v.length})` : ""] })]
-		}), g && /* @__PURE__ */ jsxs("div", {
-			ref: S,
+			}), /* @__PURE__ */ jsxs("span", { children: ["路网", y.length > 0 ? ` (${y.length})` : ""] })]
+		}), _ && /* @__PURE__ */ jsxs("div", {
+			ref: ve,
 			className: "mapbox-road-highlight-control__panel",
 			children: [
 				/* @__PURE__ */ jsxs("div", {
@@ -4359,9 +4361,9 @@ function RoadHighlightControl({ map: e, highlightWidth: r = 3, defaultRoadTypes:
 						className: "mapbox-road-highlight-control__panel-title",
 						children: "道路类型"
 					}), /* @__PURE__ */ jsx(Checkbox, {
-						checked: v.length === ROAD_TYPE_OPTIONS.length,
-						indeterminate: v.length > 0 && v.length < ROAD_TYPE_OPTIONS.length,
-						onChange: ye,
+						checked: y.length === ROAD_TYPE_OPTIONS.length,
+						indeterminate: y.length > 0 && y.length < ROAD_TYPE_OPTIONS.length,
+						onChange: xe,
 						style: {
 							"--color-text-1": "#fff",
 							"--color-border-2": "rgba(255, 255, 255, 0.3)"
@@ -4378,11 +4380,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: () => ve(e.class, !v.includes(e.class)),
+							onClick: () => O(e.class, !y.includes(e.class)),
 							children: [
 								/* @__PURE__ */ jsx(Checkbox, {
-									checked: v.includes(e.class),
-									onChange: (t) => ve(e.class, t),
+									checked: y.includes(e.class),
+									onChange: (t) => O(e.class, t),
 									onClick: (e) => e.stopPropagation(),
 									style: {
 										"--color-text-1": "#fff",
@@ -4407,7 +4409,7 @@ function RoadHighlightControl({ map: e, highlightWidth: r = 3, defaultRoadTypes:
 					className: "mapbox-road-highlight-control__tip",
 					children: "💡 选中道路类型后立即显示高亮"
 				}),
-				!b && /* @__PURE__ */ jsx("div", {
+				!x && /* @__PURE__ */ jsx("div", {
 					className: "mapbox-road-highlight-control__warning",
 					children: "⚠️ 正在初始化图层..."
 				})
@@ -4664,38 +4666,38 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 		showArea: r.showArea ?? !0,
 		showLength: r.showLength ?? !0,
 		showRadius: r.showRadius ?? !0
-	} : _, [x, S] = useState([]), C = useRef(/* @__PURE__ */ new Map()), T = useRef(0), E = useRef(null), D = useRef(null), O = useRef(null), k = useRef(null), A = useRef(null), j = useRef([]), M = useRef([]), N = useRef(b);
-	N.current = b;
-	let Ce = useRef(f);
-	Ce.current = f;
-	let P = useCallback(() => `measure-${++T.current}`, []);
+	} : _, [x, S] = useState([]), C = useRef(/* @__PURE__ */ new Map()), w = useRef(0), T = useRef(null), E = useRef(null), D = useRef(null), O = useRef(null), k = useRef(null), A = useRef([]), j = useRef([]), M = useRef(b);
+	M.current = b;
+	let we = useRef(f);
+	we.current = f;
+	let N = useCallback(() => `measure-${++w.current}`, []);
 	useEffect(() => {
 		s?.(f !== null);
 	}, [f, s]);
-	let we = useRef(!1), Te = useCallback(() => {
-		!e || !e.isStyleLoaded() || (initAllPreviewLayers(e), we.current = !0);
+	let Te = useRef(!1), Ee = useCallback(() => {
+		!e || !e.isStyleLoaded() || (initAllPreviewLayers(e), Te.current = !0);
 	}, [e]);
 	useEffect(() => {
 		if (!e) return;
 		let t = () => {
-			initAllPreviewLayers(e), we.current = !0;
+			initAllPreviewLayers(e), Te.current = !0;
 		};
 		e.isStyleLoaded() ? t() : e.once("load", t);
 		let n = () => {
-			we.current = !1;
+			Te.current = !1;
 		};
 		return e.on("style.load", n), () => {
 			e.off("style.load", n);
 		};
 	}, [e]), useEffect(() => {
 		let e = (e) => {
-			E.current && !E.current.contains(e.target) && D.current && !D.current.contains(e.target) && d(!1);
+			T.current && !T.current.contains(e.target) && E.current && !E.current.contains(e.target) && d(!1);
 		};
 		return document.addEventListener("mousedown", e), () => document.removeEventListener("mousedown", e);
 	}, []);
-	let F = useCallback((t) => {
+	let P = useCallback((t) => {
 		if (!e) return;
-		let n = applyEntityConfig(t, N.current), r = null;
+		let n = applyEntityConfig(t, M.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) {
 			C.current.set(n.id, r);
 			let e = {
@@ -4706,12 +4708,12 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 			};
 			S((t) => [...t, e]);
 		}
-	}, [e]), Ee = useCallback((e) => {
+	}, [e]), De = useCallback((e) => {
 		let t = C.current.get(e);
 		t && (t.destroy(), C.current.delete(e)), S((t) => t.filter((t) => t.entity.id !== e));
-	}, []), De = useCallback(() => {
+	}, []), Oe = useCallback(() => {
 		C.current.forEach((e) => e.destroy()), C.current.clear(), S([]);
-	}, []), Oe = useCallback((t) => {
+	}, []), ke = useCallback((t) => {
 		if (!e) return;
 		let n = C.current.get(t);
 		if (!n) return;
@@ -4721,9 +4723,9 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 			maxZoom: 18,
 			duration: 1e3
 		});
-	}, [e]), ke = useCallback((e, t) => {
+	}, [e]), Ae = useCallback((e, t) => {
 		let n = {
-			...N.current,
+			...M.current,
 			[e]: t
 		};
 		y ? i?.({ ...n }) : v(n), S((t) => t.map((t) => {
@@ -4735,7 +4737,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 				entity: i
 			};
 		}));
-	}, [y, i]), Ae = useCallback((t, n) => {
+	}, [y, i]), je = useCallback((t, n) => {
 		if (!e) return;
 		let [r, i] = t, [a, o] = n, s = [
 			[Math.min(r, a), Math.max(i, o)],
@@ -4754,7 +4756,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 		});
 		let l = e.getSource(`${PREVIEW_PREFIX}rect-preview-measure-source`);
 		if (l) {
-			let e = N.current, t = [], n = s[0], r = s[1], i = s[2];
+			let e = M.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({
@@ -4785,7 +4787,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 				features: t
 			});
 		}
-	}, [e]), je = useCallback((t, n) => {
+	}, [e]), Me = 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({
@@ -4796,7 +4798,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 			},
 			properties: {}
 		});
-		let o = N.current, s = [], c = [];
+		let o = M.current, s = [], c = [];
 		if (o?.showArea && s.push({
 			type: "Feature",
 			geometry: {
@@ -4832,7 +4834,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 			type: "FeatureCollection",
 			features: c
 		});
-	}, [e]), Me = useCallback((t, n) => {
+	}, [e]), Ne = 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({
@@ -4845,7 +4847,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 		});
 		let o = e.getSource(`${PREVIEW_PREFIX}square-preview-measure-source`);
 		if (o) {
-			let e = N.current, n = [];
+			let e = M.current, n = [];
 			if (e?.showArea && n.push({
 				type: "Feature",
 				geometry: {
@@ -4869,7 +4871,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 				features: n
 			});
 		}
-	}, [e]), Ne = useCallback((t, n) => {
+	}, [e]), Pe = useCallback((t, n) => {
 		if (!e) return;
 		let r = [...t, n], i = e.getSource(`${PREVIEW_PREFIX}polygon-preview-source`);
 		i && (r.length >= 3 ? i.setData({
@@ -4904,7 +4906,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 		});
 		let o = e.getSource(`${PREVIEW_PREFIX}polygon-preview-measure-source`);
 		if (o) {
-			let e = N.current, t = [];
+			let e = M.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];
@@ -4946,7 +4948,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 				features: t
 			});
 		}
-	}, [e]), I = useCallback((t, n) => {
+	}, [e]), F = useCallback((t, n) => {
 		if (!e) return;
 		let r = [...t, n], i = e.getSource(`${PREVIEW_PREFIX}polyline-preview-source`);
 		i && (r.length >= 2 ? i.setData({
@@ -4974,7 +4976,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 		});
 		let o = e.getSource(`${PREVIEW_PREFIX}polyline-preview-measure-source`);
 		if (o) {
-			let e = N.current, t = [];
+			let e = M.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({
@@ -4994,117 +4996,117 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 	}, [e]);
 	useEffect(() => {
 		if (!e || !f) return;
-		Te(), e.getCanvas().style.cursor = "crosshair";
+		Ee(), e.getCanvas().style.cursor = "crosshair";
 		let t = (t) => {
-			let n = [t.lngLat.lng, t.lngLat.lat], r = Ce.current;
+			let n = [t.lngLat.lng, t.lngLat.lat], r = we.current;
 			if (r === "rectangle") {
-				let t = O.current;
-				if (!t) O.current = n;
+				let t = D.current;
+				if (!t) D.current = n;
 				else {
 					let r = {
-						id: P(),
+						id: N(),
 						type: "rectangle",
 						bounds: [t, n]
 					};
-					F(r), O.current = null, clearAllPreviewSources(e), g(null);
+					P(r), D.current = null, clearAllPreviewSources(e), g(null);
 				}
 			} else if (r === "circle") {
-				let t = k.current;
-				if (!t) k.current = { center: n };
+				let t = O.current;
+				if (!t) O.current = { center: n };
 				else {
 					let r = calculateDistance(t.center, n), i = {
-						id: P(),
+						id: N(),
 						type: "circle",
 						center: t.center,
 						radius: r
 					};
-					F(i), k.current = null, clearAllPreviewSources(e), g(null);
+					P(i), O.current = null, clearAllPreviewSources(e), g(null);
 				}
 			} else if (r === "square") {
-				let t = A.current;
-				if (!t) A.current = { center: n };
+				let t = k.current;
+				if (!t) k.current = { center: n };
 				else {
 					let r = calculateDistance(t.center, n) * 2, i = {
-						id: P(),
+						id: N(),
 						type: "square",
 						center: t.center,
 						length: r
 					};
-					F(i), A.current = null, clearAllPreviewSources(e), g(null);
+					P(i), k.current = null, clearAllPreviewSources(e), g(null);
 				}
 			} else if (r === "polygon") {
-				let t = j.current;
+				let t = A.current;
 				if (t.length >= 3 && calculateDistance(t[0], n) < 20) {
 					let n = {
-						id: P(),
+						id: N(),
 						type: "polygon",
 						coordinates: [...t]
 					};
-					F(n), j.current = [], clearAllPreviewSources(e), g(null);
+					P(n), A.current = [], clearAllPreviewSources(e), g(null);
 					return;
 				}
-				j.current = [...t, n];
-			} else r === "polyline" && (M.current = [...M.current, n]);
+				A.current = [...t, n];
+			} else r === "polyline" && (j.current = [...j.current, n]);
 		}, n = (e) => {
-			let t = [e.lngLat.lng, e.lngLat.lat], n = Ce.current;
-			if (n === "rectangle" && O.current) Ae(O.current, t);
-			else if (n === "circle" && k.current) je(k.current.center, t);
-			else if (n === "square" && A.current) Me(A.current.center, t);
+			let t = [e.lngLat.lng, e.lngLat.lat], n = we.current;
+			if (n === "rectangle" && D.current) je(D.current, t);
+			else if (n === "circle" && O.current) Me(O.current.center, t);
+			else if (n === "square" && k.current) Ne(k.current.center, t);
 			else if (n === "polygon") {
-				let e = j.current;
-				e.length > 0 && Ne(e, t);
+				let e = A.current;
+				e.length > 0 && Pe(e, t);
 			} else if (n === "polyline") {
-				let e = M.current;
-				e.length > 0 && I(e, t);
+				let e = j.current;
+				e.length > 0 && F(e, t);
 			}
 		}, r = (t) => {
 			t.preventDefault();
-			let n = Ce.current;
+			let n = we.current;
 			if (n === "polygon") {
-				let t = j.current;
+				let t = A.current;
 				if (t.length >= 3) {
 					let n = {
-						id: P(),
+						id: N(),
 						type: "polygon",
 						coordinates: [...t]
 					};
-					F(n), j.current = [], clearAllPreviewSources(e), g(null);
-				} else j.current = [], clearAllPreviewSources(e);
+					P(n), A.current = [], clearAllPreviewSources(e), g(null);
+				} else A.current = [], clearAllPreviewSources(e);
 			} else if (n === "polyline") {
-				let t = M.current;
+				let t = j.current;
 				if (t.length >= 2) {
 					let n = {
-						id: P(),
+						id: N(),
 						type: "polyline",
 						coordinates: [...t]
 					};
-					F(n), M.current = [], clearAllPreviewSources(e), g(null);
-				} else M.current = [], clearAllPreviewSources(e);
+					P(n), j.current = [], clearAllPreviewSources(e), g(null);
+				} else j.current = [], clearAllPreviewSources(e);
 			}
 		}, i = (t) => {
-			t.key === "Escape" && (O.current = null, k.current = null, A.current = null, j.current = [], M.current = [], clearAllPreviewSources(e), g(null));
+			t.key === "Escape" && (D.current = null, O.current = null, k.current = null, A.current = [], j.current = [], clearAllPreviewSources(e), g(null));
 		}, a = (t) => {
 			t.preventDefault();
-			let n = Ce.current;
+			let n = we.current;
 			if (n === "polygon") {
-				let t = j.current;
+				let t = A.current;
 				if (t.length >= 3) {
 					let n = {
-						id: P(),
+						id: N(),
 						type: "polygon",
 						coordinates: [...t]
 					};
-					F(n), j.current = [], clearAllPreviewSources(e), g(null);
+					P(n), A.current = [], clearAllPreviewSources(e), g(null);
 				}
 			} else if (n === "polyline") {
-				let t = M.current;
+				let t = j.current;
 				if (t.length >= 2) {
 					let n = {
-						id: P(),
+						id: N(),
 						type: "polyline",
 						coordinates: [...t]
 					};
-					F(n), M.current = [], clearAllPreviewSources(e), g(null);
+					P(n), j.current = [], clearAllPreviewSources(e), g(null);
 				}
 			}
 		};
@@ -5114,25 +5116,25 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 	}, [
 		e,
 		f,
+		N,
 		P,
-		F,
-		Te,
-		Ae,
+		Ee,
 		je,
 		Me,
 		Ne,
-		I
+		Pe,
+		F
 	]), useEffect(() => () => {
 		C.current.forEach((e) => e.destroy()), C.current.clear();
 	}, []);
-	let Pe = useCallback((t) => {
-		g((e) => e === t ? null : t), O.current = null, k.current = null, A.current = null, j.current = [], M.current = [], e && clearAllPreviewSources(e);
+	let Fe = useCallback((t) => {
+		g((e) => e === t ? null : t), D.current = null, O.current = null, k.current = null, A.current = [], j.current = [], e && clearAllPreviewSources(e);
 	}, [e]);
 	return e ? /* @__PURE__ */ jsxs("div", {
 		className: `mapbox-measure-control ${c}`,
 		style: l,
 		children: [/* @__PURE__ */ jsxs("button", {
-			ref: D,
+			ref: E,
 			className: `mapbox-control-btn mapbox-measure-control__btn ${u ? "mapbox-measure-control__btn--active" : ""}`,
 			onClick: () => d(!u),
 			title: "测量",
@@ -5150,7 +5152,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 				] })
 			]
 		}), u && /* @__PURE__ */ jsxs("div", {
-			ref: E,
+			ref: T,
 			className: "mapbox-measure-control__panel",
 			children: [
 				/* @__PURE__ */ jsx("div", {
@@ -5162,17 +5164,17 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 					children: [
 						/* @__PURE__ */ jsx(Checkbox, {
 							checked: b.showArea,
-							onChange: (e) => ke("showArea", e),
+							onChange: (e) => Ae("showArea", e),
 							children: "面积"
 						}),
 						/* @__PURE__ */ jsx(Checkbox, {
 							checked: b.showLength,
-							onChange: (e) => ke("showLength", e),
+							onChange: (e) => Ae("showLength", e),
 							children: "长度"
 						}),
 						/* @__PURE__ */ jsx(Checkbox, {
 							checked: b.showRadius,
-							onChange: (e) => ke("showRadius", e),
+							onChange: (e) => Ae("showRadius", e),
 							children: "半径"
 						})
 					]
@@ -5185,7 +5187,7 @@ 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: () => Pe(e.mode),
+						onClick: () => Fe(e.mode),
 						title: e.label,
 						children: /* @__PURE__ */ jsx("img", {
 							src: e.icon,
@@ -5193,7 +5195,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 						})
 					}, e.mode)), x.length > 0 && /* @__PURE__ */ jsx("button", {
 						className: "mapbox-measure-control__tool-btn mapbox-measure-control__tool-btn--danger",
-						onClick: De,
+						onClick: Oe,
 						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",
@@ -5213,7 +5215,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 							/* @__PURE__ */ jsx("th", {})
 						] }) }), /* @__PURE__ */ jsx("tbody", { children: x.map((e) => /* @__PURE__ */ jsxs("tr", {
 							className: "mapbox-measure-control__table-row",
-							onClick: () => Oe(e.entity.id),
+							onClick: () => ke(e.entity.id),
 							children: [
 								/* @__PURE__ */ jsx("td", { children: e.shapeLabel }),
 								/* @__PURE__ */ jsx("td", { children: String(e.entity.id) }),
@@ -5222,7 +5224,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(), Ee(e.entity.id);
+										t.stopPropagation(), De(e.entity.id);
 									},
 									title: "删除",
 									children: /* @__PURE__ */ jsx("img", {
@@ -5299,7 +5301,7 @@ function RasterPaintControl({ map: e, value: r, onChange: s, rasterPaintLayerIds
 	}, [b, x]);
 	let C = 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]), w = useCallback((e, t) => {
+	}, [e, c]), ve = useCallback((e, t) => {
 		if (b) s?.({
 			...x,
 			[e]: t
@@ -5317,7 +5319,7 @@ function RasterPaintControl({ map: e, value: r, onChange: s, rasterPaintLayerIds
 		x,
 		h,
 		C
-	]), T = useCallback(() => {
+	]), w = useCallback(() => {
 		b ? s?.({ ...DEFAULT_CONFIG }) : (_({ ...DEFAULT_CONFIG }), C({ ...DEFAULT_CONFIG }));
 	}, [
 		b,
@@ -5332,7 +5334,7 @@ function RasterPaintControl({ map: e, value: r, onChange: s, rasterPaintLayerIds
 		C,
 		h
 	]);
-	let E = (e, t) => e === "hueRotate" ? `${Math.round(t)}°` : t.toFixed(2);
+	let T = (e, t) => e === "hueRotate" ? `${Math.round(t)}°` : t.toFixed(2);
 	return /* @__PURE__ */ jsxs("div", {
 		className: `mapbox-raster-paint-control${l ? ` ${l}` : ""}`,
 		style: u,
@@ -5362,17 +5364,17 @@ function RasterPaintControl({ map: e, value: r, onChange: s, rasterPaintLayerIds
 						max: r,
 						step: i,
 						value: x[e],
-						onChange: (t) => w(e, t),
+						onChange: (t) => ve(e, t),
 						tooltipVisible: !1
 					}),
 					/* @__PURE__ */ jsx("span", {
 						className: "mapbox-raster-paint-control__value",
-						children: E(e, x[e])
+						children: T(e, x[e])
 					})
 				]
 			}, e)), /* @__PURE__ */ jsx("button", {
 				className: "mapbox-raster-paint-control__reset",
-				onClick: T,
+				onClick: w,
 				children: "重置"
 			})]
 		})]
@@ -5399,15 +5401,15 @@ const EditControl = ({ markerTemplates: e, selectedTemplate: t, onTemplateSelect
 		i === "square" ? s(null) : (r(null), s("square"));
 	}, C = () => {
 		i === "polyline" ? s(null) : (r(null), s("polyline"));
-	}, w = () => {
+	}, ve = () => {
 		(i === "rectangle" || i === "circle" || i === "polygon" || i === "square" || i === "polyline") && s(null), g(!h);
-	}, T = (e) => e.size ? {
+	}, w = (e) => e.size ? {
 		width: e.size,
 		height: e.size
 	} : {
 		width: e.width || 32,
 		height: e.height || 32
-	}, E = h || t, D = i === "rectangle", O = i === "circle", ve = i === "polygon", ye = i === "square", k = i === "polyline";
+	}, T = h || t, E = i === "rectangle", D = i === "circle", ye = i === "polygon", be = i === "square", O = i === "polyline";
 	return /* @__PURE__ */ jsxs("div", {
 		ref: _,
 		className: "mapbox-edit-control",
@@ -5415,8 +5417,8 @@ const EditControl = ({ markerTemplates: e, selectedTemplate: t, onTemplateSelect
 			className: "mapbox-edit-control__btn-group",
 			children: [
 				/* @__PURE__ */ jsxs("button", {
-					className: `mapbox-control-btn ${E ? "mapbox-control-btn--active" : ""}`,
-					onClick: w,
+					className: `mapbox-control-btn ${T ? "mapbox-control-btn--active" : ""}`,
+					onClick: ve,
 					title: "Marker",
 					children: [t ? /* @__PURE__ */ jsx("img", {
 						src: t.icon,
@@ -5429,7 +5431,7 @@ const EditControl = ({ markerTemplates: e, selectedTemplate: t, onTemplateSelect
 					}), /* @__PURE__ */ jsx("span", { children: t ? t.name : "Marker" })]
 				}),
 				d && /* @__PURE__ */ jsxs("button", {
-					className: `mapbox-control-btn ${ye ? "mapbox-control-btn--active" : ""}`,
+					className: `mapbox-control-btn ${be ? "mapbox-control-btn--active" : ""}`,
 					onClick: S,
 					title: "绘制正方形",
 					children: [/* @__PURE__ */ jsx("img", {
@@ -5439,7 +5441,7 @@ const EditControl = ({ markerTemplates: e, selectedTemplate: t, onTemplateSelect
 					}), /* @__PURE__ */ jsx("span", { children: "正方形" })]
 				}),
 				c && /* @__PURE__ */ jsxs("button", {
-					className: `mapbox-control-btn ${D ? "mapbox-control-btn--active" : ""}`,
+					className: `mapbox-control-btn ${E ? "mapbox-control-btn--active" : ""}`,
 					onClick: y,
 					title: "绘制矩形",
 					children: [/* @__PURE__ */ jsx("img", {
@@ -5449,7 +5451,7 @@ const EditControl = ({ markerTemplates: e, selectedTemplate: t, onTemplateSelect
 					}), /* @__PURE__ */ jsx("span", { children: "矩形" })]
 				}),
 				l && /* @__PURE__ */ jsxs("button", {
-					className: `mapbox-control-btn ${O ? "mapbox-control-btn--active" : ""}`,
+					className: `mapbox-control-btn ${D ? "mapbox-control-btn--active" : ""}`,
 					onClick: b,
 					title: "绘制圆形",
 					children: [/* @__PURE__ */ jsx("img", {
@@ -5459,7 +5461,7 @@ const EditControl = ({ markerTemplates: e, selectedTemplate: t, onTemplateSelect
 					}), /* @__PURE__ */ jsx("span", { children: "圆形" })]
 				}),
 				u && /* @__PURE__ */ jsxs("button", {
-					className: `mapbox-control-btn ${ve ? "mapbox-control-btn--active" : ""}`,
+					className: `mapbox-control-btn ${ye ? "mapbox-control-btn--active" : ""}`,
 					onClick: x,
 					title: "绘制多边形",
 					children: [/* @__PURE__ */ jsx("img", {
@@ -5469,7 +5471,7 @@ const EditControl = ({ markerTemplates: e, selectedTemplate: t, onTemplateSelect
 					}), /* @__PURE__ */ jsx("span", { children: "多边形" })]
 				}),
 				f && /* @__PURE__ */ jsxs("button", {
-					className: `mapbox-control-btn ${k ? "mapbox-control-btn--active" : ""}`,
+					className: `mapbox-control-btn ${O ? "mapbox-control-btn--active" : ""}`,
 					onClick: C,
 					title: "绘制折线",
 					children: [/* @__PURE__ */ jsx("img", {
@@ -5487,7 +5489,7 @@ const EditControl = ({ markerTemplates: e, selectedTemplate: t, onTemplateSelect
 			}), /* @__PURE__ */ jsx("div", {
 				className: "mapbox-edit-control__template-list",
 				children: e.map((e) => {
-					let n = T(e), r = t?.id === e.id;
+					let n = w(e), r = t?.id === e.id;
 					return /* @__PURE__ */ jsxs("div", {
 						className: `mapbox-edit-control__template-item ${r ? "mapbox-edit-control__template-item--selected" : ""}`,
 						onClick: () => v(e),
@@ -5559,15 +5561,15 @@ 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 [h, g] = useState("idle"), [_, v] = useState(0), [y, b] = useState(i), [x, S] = useState(!1), C = useRef(null), w = useRef(null), T = useRef([]), E = useRef([]), D = useRef("idle"), O = useRef(null), ve = useRef("");
+	let [h, g] = useState("idle"), [_, v] = useState(0), [y, b] = useState(i), [x, S] = useState(!1), C = useRef(null), ve = useRef(null), w = useRef([]), T = useRef([]), E = useRef("idle"), D = useRef(null), ye = useRef("");
 	useEffect(() => {
-		D.current = h;
+		E.current = h;
 	}, [h]), useEffect(() => {
 		b(i);
 	}, [i]), useEffect(() => {
 		if (!x) return;
 		let e = (e) => {
-			w.current && !w.current.contains(e.target) && C.current && !C.current.contains(e.target) && S(!1);
+			ve.current && !ve.current.contains(e.target) && C.current && !C.current.contains(e.target) && S(!1);
 		}, t = setTimeout(() => {
 			document.addEventListener("mousedown", e);
 		}, 0);
@@ -5575,12 +5577,12 @@ const RoutePlanningControl = forwardRef(({ map: e, pointCount: i = 2, showPointC
 			clearTimeout(t), document.removeEventListener("mousedown", e);
 		};
 	}, [x]);
-	let ye = useCallback(() => {
-		for (let e of E.current) e.remove();
-		E.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]), k = useCallback(() => {
+	let be = useCallback(() => {
+		for (let e of T.current) e.remove();
+		T.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]), O = useCallback(() => {
 		if (!e) return;
-		let t = T.current, n = {
+		let t = w.current, n = {
 			type: "FeatureCollection",
 			features: [{
 				type: "Feature",
@@ -5631,21 +5633,21 @@ const RoutePlanningControl = forwardRef(({ map: e, pointCount: i = 2, showPointC
 				"circle-stroke-color": "#fff"
 			}
 		}));
-	}, [e]), be = useCallback((t) => {
-		if (!e || !O.current) return;
-		let { visualType: n } = O.current;
+	}, [e]), xe = useCallback((t) => {
+		if (!e || !D.current) return;
+		let { visualType: n } = D.current;
 		if (n === "marker") {
 			let n = document.createElement("div");
-			n.className = "route-planning-temp-marker", n.textContent = String(T.current.length);
+			n.className = "route-planning-temp-marker", n.textContent = String(w.current.length);
 			let r = new mapboxgl.Marker({ element: n }).setLngLat(t).addTo(e);
-			E.current.push(r);
-		} else k();
-	}, [e, k]), xe = useCallback(() => {
-		ye(), T.current = [], O.current = null, v(0), g("idle"), e && (e.getCanvas().style.cursor = ve.current);
-	}, [ye, e]), Se = useCallback(async () => {
-		let e = O.current, t = [...T.current];
+			T.current.push(r);
+		} else O();
+	}, [e, O]), Se = useCallback(() => {
+		be(), w.current = [], D.current = null, v(0), g("idle"), e && (e.getCanvas().style.cursor = ye.current);
+	}, [be, e]), Ce = useCallback(async () => {
+		let e = D.current, t = [...w.current];
 		if (!e || t.length < 2) {
-			xe();
+			Se();
 			return;
 		}
 		g("planning");
@@ -5654,58 +5656,58 @@ const RoutePlanningControl = forwardRef(({ map: e, pointCount: i = 2, showPointC
 		} catch (e) {
 			console.error("Route planning onSelectFinished failed:", e);
 		} finally {
-			xe();
+			Se();
 		}
-	}, [xe]), A = useCallback((e) => {
-		if (D.current !== "selecting" || !O.current) return;
+	}, [Se]), k = useCallback((e) => {
+		if (E.current !== "selecting" || !D.current) return;
 		let t = [e.lngLat.lng, e.lngLat.lat];
-		T.current.push(t);
-		let n = T.current.length;
-		v(n), be(t), n >= O.current.pointCount && Se();
-	}, [be, Se]), j = useCallback((e) => {
-		D.current === "selecting" && (e.preventDefault(), xe());
-	}, [xe]);
+		w.current.push(t);
+		let n = w.current.length;
+		v(n), xe(t), n >= D.current.pointCount && Ce();
+	}, [xe, Ce]), A = useCallback((e) => {
+		E.current === "selecting" && (e.preventDefault(), Se());
+	}, [Se]);
 	useEffect(() => {
-		if (e && h === "selecting") return e.on("click", A), e.on("contextmenu", j), () => {
-			e.off("click", A), e.off("contextmenu", j);
+		if (e && h === "selecting") return e.on("click", k), e.on("contextmenu", A), () => {
+			e.off("click", k), e.off("contextmenu", A);
 		};
 	}, [
 		e,
 		h,
-		A,
-		j
+		k,
+		A
 	]);
-	let M = useCallback((t) => {
+	let j = useCallback((t) => {
 		if (!e) return;
-		D.current !== "idle" && xe();
+		E.current !== "idle" && Se();
 		let n = Math.max(2, t.pointCount ?? i), r = t.visualType ?? l;
-		O.current = {
+		D.current = {
 			pointCount: n,
 			visualType: r,
 			onSelectFinished: t.onSelectFinished
-		}, T.current = [], v(0), b(n), S(!1), ve.current = e.getCanvas().style.cursor, e.getCanvas().style.cursor = "crosshair", g("selecting");
+		}, w.current = [], v(0), b(n), S(!1), ye.current = e.getCanvas().style.cursor, e.getCanvas().style.cursor = "crosshair", g("selecting");
 	}, [
 		e,
 		i,
 		l,
-		xe
+		Se
 	]);
-	useImperativeHandle(f, () => ({ startPlanning: M }), [M]);
-	let N = () => {
-		h === "idle" ? S((e) => !e) : h === "selecting" && xe();
-	}, Ce = () => {
-		u && M({
+	useImperativeHandle(f, () => ({ startPlanning: j }), [j]);
+	let M = () => {
+		h === "idle" ? S((e) => !e) : h === "selecting" && Se();
+	}, we = () => {
+		u && j({
 			pointCount: Math.max(2, y),
 			visualType: l,
 			onSelectFinished: u
 		});
-	}, P = (e) => {
+	}, N = (e) => {
 		let t = parseInt(e.target.value, 10);
 		!isNaN(t) && t >= 2 ? b(t) : e.target.value === "" && b(2);
-	}, we = () => {
+	}, Te = () => {
 		if (h === "planning") return /* @__PURE__ */ jsx("span", { children: "规划中..." });
 		if (h === "selecting") {
-			let e = O.current?.pointCount ?? y;
+			let e = D.current?.pointCount ?? y;
 			return /* @__PURE__ */ jsxs("span", { children: [
 				_,
 				"/",
@@ -5713,22 +5715,22 @@ const RoutePlanningControl = forwardRef(({ map: e, pointCount: i = 2, showPointC
 			] });
 		}
 		return "路径规划";
-	}, Te = h === "selecting", F = h === "planning";
+	}, Ee = h === "selecting", P = h === "planning";
 	return !d && h === "idle" ? null : /* @__PURE__ */ jsxs("div", {
 		className: `mapbox-route-planning-control${d ? "" : " mapbox-route-planning-control--floating"}`,
 		children: [/* @__PURE__ */ jsxs("button", {
 			ref: C,
-			className: `mapbox-control-btn mapbox-route-planning-control__btn${Te ? " mapbox-route-planning-control__btn--active" : ""}${F ? " mapbox-route-planning-control__btn--planning" : ""}${x ? " mapbox-route-planning-control__btn--active" : ""}`,
-			onClick: N,
-			disabled: F,
+			className: `mapbox-control-btn mapbox-route-planning-control__btn${Ee ? " mapbox-route-planning-control__btn--active" : ""}${P ? " mapbox-route-planning-control__btn--planning" : ""}${x ? " mapbox-route-planning-control__btn--active" : ""}`,
+			onClick: M,
+			disabled: P,
 			title: h === "idle" ? "路径规划" : h === "selecting" ? "取消选点" : "规划中...",
 			children: [/* @__PURE__ */ jsx("img", {
 				src: route_planning_default,
 				alt: "route",
 				className: "mapbox-route-planning-control__btn-icon"
-			}), we()]
+			}), Te()]
 		}), x && h === "idle" && /* @__PURE__ */ jsxs("div", {
-			ref: w,
+			ref: ve,
 			className: "mapbox-route-planning-control__panel",
 			children: [/* @__PURE__ */ jsx("div", {
 				className: "mapbox-route-planning-control__panel-header",
@@ -5749,7 +5751,7 @@ const RoutePlanningControl = forwardRef(({ map: e, pointCount: i = 2, showPointC
 							className: "mapbox-route-planning-control__panel-input",
 							value: y,
 							min: 2,
-							onChange: P
+							onChange: N
 						}) : /* @__PURE__ */ jsx("span", {
 							className: "mapbox-route-planning-control__panel-value",
 							children: y
@@ -5761,7 +5763,7 @@ const RoutePlanningControl = forwardRef(({ map: e, pointCount: i = 2, showPointC
 					}),
 					/* @__PURE__ */ jsx("button", {
 						className: "mapbox-route-planning-control__panel-start",
-						onClick: Ce,
+						onClick: we,
 						disabled: !u,
 						children: "开始规划"
 					})
@@ -5918,53 +5920,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: h = "mapbox://styles/mapbox/dark-v11", maxBounds: g, mode: _ = "display", editConfig: v = {}, pickerConfig: y = {}, onPick: b, interactive: x = {}, layers: S = [], rasterPaint: T, entities: E = [], selectedIds: D = [], entityConfig: O, nameConfig: k, selectNameConfig: A, areaConfig: j, circleConfig: M, lengthConfig: N, showCoordinates: Ce = !0, showScale: P = !0, showResetView: we = !0, showRoadHighlight: Te = !1, showMeasure: Ee = !1, showRasterPaint: Ae = !1, showRoutePlanning: je, onRasterPaintChange: Me, popupDefaults: I, renderPopup: Pe, onMapLoad: Fe, onEntityClick: Ie, onPopupOpen: Le, onPopupClose: Re, className: ze = "", containerStyle: Be } = e, Ve = useRef(null), He = useRef(null), L = useRef(null), R = useRef(/* @__PURE__ */ new Map()), z = useRef(/* @__PURE__ */ new Map()), Ue = useRef(/* @__PURE__ */ new Set()), [B, We] = useState(null), Ge = useRef(null), Ke = useRef(null), qe = useRef(null), [Je, Ye] = useState(null), Xe = useRef(null), Ze = useRef(null), [V, Qe] = useState(null), [$e, et] = useState(_), [tt, nt] = useState(null), rt = useRef(null), [it, H] = useState(null), [at, U] = useState(null), [ot, st] = useState(null), W = useRef(!1), G = useRef(null), ct = useRef(null), K = useRef(null), lt = useRef(null), q = useRef(null), ut = useRef([]), J = useRef(null), dt = useRef(null), ft = useRef(null), pt = useRef([]), mt = useRef(null), ht = useRef(!1), [gt, _t] = useState([]), vt = useRef([]);
-	vt.current = gt;
-	let Y = useRef(null);
+	let { center: l = [116.4074, 39.9042], zoom: u = 12, pitch: d = 0, bearing: f = 0, style: h = "mapbox://styles/mapbox/dark-v11", maxBounds: g, mode: _ = "display", editConfig: v = {}, pickerConfig: y = {}, onPick: b, interactive: x = {}, layers: S = [], rasterPaint: w, entities: T = [], selectedIds: E = [], entityConfig: D, nameConfig: O, selectNameConfig: k, areaConfig: A, circleConfig: j, lengthConfig: M, showCoordinates: we = !0, showScale: N = !0, showResetView: Te = !0, showRoadHighlight: Ee = !1, showMeasure: De = !1, showRasterPaint: je = !1, showRoutePlanning: Me, onRasterPaintChange: Ne, popupDefaults: F, renderPopup: Fe, onMapLoad: Ie, onEntityClick: Le, onPopupOpen: Re, onPopupClose: ze, className: Be = "", containerStyle: Ve } = e, He = useRef(null), Ue = useRef(null), I = useRef(null), L = useRef(/* @__PURE__ */ new Map()), R = useRef(/* @__PURE__ */ new Map()), We = useRef(/* @__PURE__ */ new Set()), [z, Ge] = useState(null), Ke = useRef(null), qe = useRef(null), Je = useRef(null), [Ye, Xe] = useState(null), Ze = useRef(null), Qe = useRef(null), [B, $e] = useState(null), [et, tt] = useState(_), [nt, rt] = useState(null), it = useRef(null), [at, V] = useState(null), [ot, H] = useState(null), [st, ct] = useState(null), U = useRef(!1), W = useRef(null), lt = useRef(null), G = useRef(null), ut = useRef(null), K = useRef(null), dt = useRef([]), q = useRef(null), ft = useRef(null), pt = useRef(null), mt = useRef([]), ht = useRef(null), gt = useRef(!1), [_t, vt] = useState([]), yt = useRef([]);
+	yt.current = _t;
+	let J = useRef(null);
 	useEffect(() => {
-		et(_);
+		tt(_);
 	}, [_]);
-	let yt = useCallback((e) => {
-		let t = R.current.get(e), n = z.current.get(e);
+	let bt = useCallback((e) => {
+		let t = L.current.get(e), n = R.current.get(e);
 		if (t && n) {
 			if (n.type === "radar" && t instanceof CanvasRadarRenderer) {
 				let r = {
 					...n,
 					isAnimating: !0
 				};
-				z.current.set(e, r), t.startAnimation();
+				R.current.set(e, r), t.startAnimation();
 			} else if (n.type === "circle" && t instanceof CanvasCircleRenderer) {
 				let r = {
 					...n,
 					isAnimating: !0
 				};
-				z.current.set(e, r), t.startAnimation();
+				R.current.set(e, r), t.startAnimation();
 			}
 		}
-	}, []), bt = useCallback((e) => {
-		let t = R.current.get(e), n = z.current.get(e);
+	}, []), xt = useCallback((e) => {
+		let t = L.current.get(e), n = R.current.get(e);
 		if (t && n) {
 			if (n.type === "radar" && t instanceof CanvasRadarRenderer) {
 				let r = {
 					...n,
 					isAnimating: !1
 				};
-				z.current.set(e, r), t.stopAnimation();
+				R.current.set(e, r), t.stopAnimation();
 			} else if (n.type === "circle" && t instanceof CanvasCircleRenderer) {
 				let r = {
 					...n,
 					isAnimating: !1
 				};
-				z.current.set(e, r), t.stopAnimation();
+				R.current.set(e, r), t.stopAnimation();
 			}
 		}
-	}, []), xt = useCallback((e) => {
-		let t = z.current.get(e);
-		t && (t.type === "radar" || t.type === "circle") && (t.type, t.isAnimating ? bt(e) : yt(e));
-	}, [yt, bt]), St = useCallback((e) => {
+	}, []), St = useCallback((e) => {
+		let t = R.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 R.current) if (t instanceof UnitRenderer) {
+			for (let [, t] of L.current) if (t instanceof UnitRenderer) {
 				let n = t.getShowTrajectory();
 				if (n === "all" || typeof n == "number" && n > 0) {
 					e = !0;
@@ -5972,46 +5974,46 @@ const Mapbox = forwardRef((e, c) => {
 				}
 			}
 			let t = e ? 0 : "all";
-			for (let [, e] of R.current) e instanceof UnitRenderer && e.setShowTrajectory(t);
+			for (let [, e] of L.current) e instanceof UnitRenderer && e.setShowTrajectory(t);
 		} else {
 			let t = new Set(e.map(String));
-			for (let [e, n] of R.current) n instanceof UnitRenderer && n.setShowTrajectory(t.has(String(e)) ? "all" : 0);
+			for (let [e, n] of L.current) n instanceof UnitRenderer && n.setShowTrajectory(t.has(String(e)) ? "all" : 0);
 		}
-	}, []), Ct = useCallback((e, t, n) => {
-		let r = E.find((t) => String(t.id) === String(e));
-		if (!r?.popup || !L.current) return;
-		let i = r.popup.content ?? Pe?.(r);
+	}, []), wt = useCallback((e, t, n) => {
+		let r = T.find((t) => String(t.id) === String(e));
+		if (!r?.popup || !I.current) return;
+		let i = r.popup.content ?? Fe?.(r);
 		if (!i) return;
-		let a = mergePopupConfig(r.popup, I, i), { position: o, actualPosition: s } = calculatePopupPosition(r, a, L.current, n);
-		We({
+		let a = mergePopupConfig(r.popup, F, i), { position: o, actualPosition: s } = calculatePopupPosition(r, a, I.current, n);
+		Ge({
 			entityId: e,
 			position: o,
 			config: a,
 			openedBy: t,
 			actualPosition: s
-		}), Le?.(e);
+		}), Re?.(e);
 	}, [
-		E,
-		I,
-		Pe,
-		Le
-	]), wt = useCallback((e) => {
-		B?.entityId === e && (We(null), Re?.(e));
-	}, [B, Re]), Tt = useCallback(() => {
-		We((e) => (e && Re?.(e.entityId), null));
-	}, [Re]), Et = useCallback((e) => B?.entityId === e, [B]), Dt = useCallback((e, t, n) => {
-		let r = L.current;
+		T,
+		F,
+		Fe,
+		Re
+	]), Tt = useCallback((e) => {
+		z?.entityId === e && (Ge(null), ze?.(e));
+	}, [z, ze]), Et = useCallback(() => {
+		Ge((e) => (e && ze?.(e.entityId), null));
+	}, [ze]), Dt = useCallback((e) => z?.entityId === e, [z]), Ot = useCallback((e, t, n) => {
+		let r = I.current;
 		r && r.flyTo({
 			center: e,
 			zoom: t ?? r.getZoom(),
 			...n
 		});
-	}, []), Ot = useCallback((e, t, n) => {
-		let r = L.current;
+	}, []), kt = useCallback((e, t, n) => {
+		let r = I.current;
 		if (!r || e.length === 0) return;
 		let i = [];
 		for (let t of e) {
-			let e = R.current.get(t);
+			let e = L.current.get(t);
 			e && i.push(e.getBounds());
 		}
 		if (i.length === 0) return;
@@ -6033,19 +6035,19 @@ const Mapbox = forwardRef((e, c) => {
 			pitch: n?.pitch ?? r.getPitch()
 		};
 		t !== void 0 && (p.maxZoom = t), n?.essential !== void 0 && (p.essential = n.essential), r.fitBounds(f, p);
-	}, []), kt = useCallback((e) => {
-		let t = L.current;
+	}, []), At = useCallback((e) => {
+		let t = I.current;
 		if (!t || !t.getContainer()) return;
 		let { showMarker: n = !0, markerColor: r = "#3388ff", name: i, nameConfig: a } = y;
 		if (!n) {
-			rt.current &&= (rt.current.remove(), null);
+			it.current &&= (it.current.remove(), null);
 			return;
 		}
-		if (rt.current) {
-			rt.current.setLngLat(e);
-			let t = rt.current.getElement(), n = t.querySelector(".marker-label");
+		if (it.current) {
+			it.current.setLngLat(e);
+			let t = it.current.getElement(), n = t.querySelector(".marker-label");
 			if (i) {
-				let e = resolveNameConfig(a, k);
+				let e = resolveNameConfig(a, O);
 				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");
@@ -6057,41 +6059,41 @@ 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, k), t = document.createElement("div");
+				let e = resolveNameConfig(a, O), 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);
 			}
-			rt.current = new mapboxgl.Marker({
+			it.current = new mapboxgl.Marker({
 				element: n,
 				anchor: "bottom"
 			}).setLngLat(e).addTo(t);
 		}
-	}, [y, k]), At = useCallback(() => {
-		rt.current &&= (rt.current.remove(), null);
-	}, []), jt = useCallback(() => `marker-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`, []), Mt = useCallback((e) => {
-		let t = L.current;
-		if (Ve.current) if (mt.current &&= (mt.current.remove(), null), e && t) {
+	}, [y, O]), jt = useCallback(() => {
+		it.current &&= (it.current.remove(), null);
+	}, []), Mt = useCallback(() => `marker-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`, []), Nt = useCallback((e) => {
+		let t = I.current;
+		if (He.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";
 			let r = e.size || e.width || 32;
 			n.style.cssText = "\n				position: fixed;\n				pointer-events: none;\n				z-index: 9999;\n				transform: translate(-50%, -50%);\n				opacity: 0.8;\n			";
 			let i = document.createElement("img");
-			i.src = e.icon, i.style.width = `${r}px`, i.style.height = `${e.size || e.height || r}px`, i.style.objectFit = "contain", n.appendChild(i), document.body.appendChild(n), mt.current = n;
+			i.src = e.icon, i.style.width = `${r}px`, i.style.height = `${e.size || e.height || r}px`, i.style.objectFit = "contain", n.appendChild(i), document.body.appendChild(n), ht.current = n;
 			let a = (e) => {
-				mt.current && (mt.current.style.left = `${e.clientX}px`, mt.current.style.top = `${e.clientY}px`);
+				ht.current && (ht.current.style.left = `${e.clientX}px`, ht.current.style.top = `${e.clientY}px`);
 			};
 			document.addEventListener("mousemove", a), n.dataset.cleanup = "true", n._cleanup = () => {
 				document.removeEventListener("mousemove", a);
 			};
 		} else t && (t.getCanvas().style.cursor = "");
-	}, []), X = useCallback(() => {
-		if (mt.current) {
-			let e = mt.current._cleanup;
-			e && e(), mt.current.remove(), mt.current = null;
+	}, []), Y = useCallback(() => {
+		if (ht.current) {
+			let e = ht.current._cleanup;
+			e && e(), ht.current.remove(), ht.current = null;
 		}
-		let e = L.current;
+		let e = I.current;
 		e && (e.getCanvas().style.cursor = "");
-	}, []), Nt = useCallback((e, t, n) => {
+	}, []), Pt = useCallback((e, t, n) => {
 		if (!e.getSource(t)) {
 			if (!e.getStyle().glyphs) {
 				let t = e.style, n = "/gis-fonts/{fontstack}/{range}.pbf";
@@ -6127,8 +6129,8 @@ const Mapbox = forwardRef((e, c) => {
 				}
 			});
 		}
-	}, []), Pt = useCallback(() => {
-		let e = L.current;
+	}, []), Ft = useCallback(() => {
+		let e = I.current;
 		e && (e.getSource("rect-preview-source") || (e.addSource("rect-preview-source", {
 			type: "geojson",
 			data: {
@@ -6152,9 +6154,9 @@ const Mapbox = forwardRef((e, c) => {
 				"line-width": 2,
 				"line-dasharray": [4, 4]
 			}
-		}), Nt(e, "rect-preview-measure-source", "rect-preview-measure-label")));
-	}, [Nt]), Ft = useCallback((e, t) => {
-		let n = L.current;
+		}), Pt(e, "rect-preview-measure-source", "rect-preview-measure-label")));
+	}, [Pt]), It = useCallback((e, t) => {
+		let n = I.current;
 		if (!n) return;
 		let r = n.getSource("rect-preview-source");
 		if (!r) return;
@@ -6173,11 +6175,11 @@ const Mapbox = forwardRef((e, c) => {
 			},
 			properties: {}
 		});
-		let l = G.current, u = l?.strokeColor ?? "#3388ff", d = l?.strokeWidth ?? 2, f = l?.fillColor ?? "#3388ff", p = l?.fillOpacity ?? .1;
+		let l = W.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 m = n.getSource("rect-preview-measure-source");
 		if (m) {
-			let e = Nn.current, t = [], n = c[0], r = c[1], i = c[2];
+			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);
 				t.push({
@@ -6214,8 +6216,8 @@ const Mapbox = forwardRef((e, c) => {
 				features: t
 			});
 		}
-	}, []), It = useCallback(() => {
-		let e = L.current;
+	}, []), Lt = useCallback(() => {
+		let e = I.current;
 		if (!e) return;
 		let t = e.getSource("rect-preview-source");
 		t && t.setData({
@@ -6227,10 +6229,10 @@ const Mapbox = forwardRef((e, c) => {
 			type: "FeatureCollection",
 			features: []
 		});
-	}, []), Z = useCallback(() => {
-		st(null), It();
-	}, [It]), Lt = useCallback(() => {
-		let e = L.current;
+	}, []), X = useCallback(() => {
+		ct(null), Lt();
+	}, [Lt]), Rt = useCallback(() => {
+		let e = I.current;
 		e && (e.getSource("circle-preview-source") || (e.addSource("circle-preview-source", {
 			type: "geojson",
 			data: {
@@ -6254,7 +6256,7 @@ const Mapbox = forwardRef((e, c) => {
 				"line-width": 2,
 				"line-dasharray": [4, 4]
 			}
-		}), Nt(e, "circle-preview-measure-source", "circle-preview-measure-label"), e.getSource("circle-preview-radius-source") || (e.addSource("circle-preview-radius-source", {
+		}), Pt(e, "circle-preview-measure-source", "circle-preview-measure-label"), e.getSource("circle-preview-radius-source") || (e.addSource("circle-preview-radius-source", {
 			type: "geojson",
 			data: {
 				type: "FeatureCollection",
@@ -6271,22 +6273,22 @@ const Mapbox = forwardRef((e, c) => {
 				"line-dasharray": [4, 4]
 			}
 		}))));
-	}, [Nt]), Rt = useCallback((e, t, n = 64) => {
+	}, [Pt]), zt = useCallback((e, t, n = 64) => {
 		let [r, i] = e, a = [], o = t / 6371e3, s = i * Math.PI / 180;
 		for (let e = 0; e <= n; e++) {
 			let t = e / n * 2 * Math.PI, c = o * Math.cos(t), l = o * Math.sin(t) / Math.cos(s), u = i + c * 180 / Math.PI, d = r + l * 180 / Math.PI;
 			a.push([d, u]);
 		}
 		return a;
-	}, []), zt = useCallback((e, t) => {
+	}, []), Bt = useCallback((e, t) => {
 		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)));
-	}, []), Bt = useCallback((e, t) => {
-		let n = L.current;
+	}, []), Vt = useCallback((e, t) => {
+		let n = I.current;
 		if (!n) return;
 		let r = n.getSource("circle-preview-source");
 		if (!r) return;
-		let i = zt(e, t), a = Rt(e, i);
+		let i = Bt(e, t), a = zt(e, i);
 		r.setData({
 			type: "Feature",
 			geometry: {
@@ -6295,9 +6297,9 @@ const Mapbox = forwardRef((e, c) => {
 			},
 			properties: {}
 		});
-		let o = K.current, s = o?.strokeColor ?? "#3388ff", c = o?.strokeWidth ?? 2, l = o?.fillColor ?? "#3388ff", u = o?.fillOpacity ?? .1;
+		let o = G.current, s = o?.strokeColor ?? "#3388ff", c = o?.strokeWidth ?? 2, l = o?.fillColor ?? "#3388ff", u = o?.fillOpacity ?? .1;
 		n.getLayer("circle-preview-line") && (n.setPaintProperty("circle-preview-line", "line-color", s), n.setPaintProperty("circle-preview-line", "line-width", c)), n.getLayer("circle-preview-fill") && (n.setPaintProperty("circle-preview-fill", "fill-color", l), n.setPaintProperty("circle-preview-fill", "fill-opacity", u));
-		let d = Nn.current, f = [], p = [];
+		let d = Pn.current, f = [], p = [];
 		if (d?.showArea) {
 			let t = Math.PI * i * i;
 			f.push({
@@ -6310,7 +6312,7 @@ const Mapbox = forwardRef((e, c) => {
 			});
 		}
 		if (d?.showRadius) {
-			let t = K.current?.radiusAngle ?? 90, n = destinationPoint(e, i, t), r = [(e[0] + n[0]) / 2, (e[1] + n[1]) / 2];
+			let t = G.current?.radiusAngle ?? 90, n = destinationPoint(e, i, t), r = [(e[0] + n[0]) / 2, (e[1] + n[1]) / 2];
 			p.push({
 				type: "Feature",
 				geometry: {
@@ -6337,8 +6339,8 @@ const Mapbox = forwardRef((e, c) => {
 			type: "FeatureCollection",
 			features: p
 		});
-	}, [zt, Rt]), Vt = useCallback(() => {
-		let e = L.current;
+	}, [Bt, zt]), Ht = useCallback(() => {
+		let e = I.current;
 		if (!e) return;
 		let t = e.getSource("circle-preview-source");
 		t && t.setData({
@@ -6355,10 +6357,10 @@ const Mapbox = forwardRef((e, c) => {
 			type: "FeatureCollection",
 			features: []
 		});
-	}, []), Ht = useCallback(() => {
-		lt.current = null, Vt();
-	}, [Vt]), Ut = useCallback(() => {
-		let e = L.current;
+	}, []), Ut = useCallback(() => {
+		ut.current = null, Ht();
+	}, [Ht]), Wt = useCallback(() => {
+		let e = I.current;
 		e && (e.getSource("polygon-preview-source") || (e.addSource("polygon-preview-source", {
 			type: "geojson",
 			data: {
@@ -6398,9 +6400,9 @@ const Mapbox = forwardRef((e, c) => {
 				"circle-stroke-color": "#ffffff",
 				"circle-stroke-width": 2
 			}
-		}), Nt(e, "polygon-preview-measure-source", "polygon-preview-measure-label")));
-	}, [Nt]), Wt = useCallback((e, t) => {
-		let n = L.current;
+		}), Pt(e, "polygon-preview-measure-source", "polygon-preview-measure-label")));
+	}, [Pt]), Gt = useCallback((e, t) => {
+		let n = I.current;
 		if (!n) return;
 		let r = n.getSource("polygon-preview-source"), i = n.getSource("polygon-vertices-source");
 		if (!r || !i) return;
@@ -6437,11 +6439,11 @@ const Mapbox = forwardRef((e, c) => {
 				properties: {}
 			}))
 		});
-		let o = q.current, s = o?.strokeColor ?? "#3388ff", c = o?.strokeWidth ?? 2, l = o?.fillColor ?? "#3388ff", u = o?.fillOpacity ?? .1;
+		let o = K.current, s = o?.strokeColor ?? "#3388ff", c = o?.strokeWidth ?? 2, l = o?.fillColor ?? "#3388ff", u = o?.fillOpacity ?? .1;
 		n.getLayer("polygon-preview-line") && (n.setPaintProperty("polygon-preview-line", "line-color", s), n.setPaintProperty("polygon-preview-line", "line-width", c)), n.getLayer("polygon-preview-fill") && (n.setPaintProperty("polygon-preview-fill", "fill-color", l), n.setPaintProperty("polygon-preview-fill", "fill-opacity", u)), n.getLayer("polygon-vertices") && n.setPaintProperty("polygon-vertices", "circle-color", s);
 		let d = n.getSource("polygon-preview-measure-source");
 		if (d) {
-			let e = Nn.current, t = [];
+			let e = Pn.current, t = [];
 			if (e?.showArea && a.length >= 3) {
 				let e = [...a, a[0]], n = polygonArea(e), r = 0, i = 0;
 				for (let e of a) r += e[0], i += e[1];
@@ -6483,8 +6485,8 @@ const Mapbox = forwardRef((e, c) => {
 				features: t
 			});
 		}
-	}, []), Gt = useCallback(() => {
-		let e = L.current;
+	}, []), Kt = useCallback(() => {
+		let e = I.current;
 		if (!e) return;
 		let t = e.getSource("polygon-preview-source");
 		t && t.setData({
@@ -6501,10 +6503,10 @@ const Mapbox = forwardRef((e, c) => {
 			type: "FeatureCollection",
 			features: []
 		});
-	}, []), Kt = useCallback(() => {
-		ut.current = [], Gt();
-	}, [Gt]), qt = useCallback(() => {
-		let e = L.current;
+	}, []), qt = useCallback(() => {
+		dt.current = [], Kt();
+	}, [Kt]), Jt = useCallback(() => {
+		let e = I.current;
 		e && (e.getSource("square-preview-source") || (e.addSource("square-preview-source", {
 			type: "geojson",
 			data: {
@@ -6528,8 +6530,8 @@ const Mapbox = forwardRef((e, c) => {
 				"line-width": 2,
 				"line-dasharray": [4, 4]
 			}
-		}), Nt(e, "square-preview-measure-source", "square-preview-measure-label")));
-	}, [Nt]), Jt = useCallback((e, t) => {
+		}), Pt(e, "square-preview-measure-source", "square-preview-measure-label")));
+	}, [Pt]), Yt = useCallback((e, t) => {
 		let [n, r] = e, i = t / 2 / 6371e3, a = r * Math.PI / 180, o = i * 180 / Math.PI, s = i * 180 / Math.PI / Math.cos(a);
 		return [
 			[n - s, r + o],
@@ -6538,12 +6540,12 @@ const Mapbox = forwardRef((e, c) => {
 			[n - s, r - o],
 			[n - s, r + o]
 		];
-	}, []), Yt = useCallback((e, t) => {
-		let n = L.current;
+	}, []), Xt = useCallback((e, t) => {
+		let n = I.current;
 		if (!n) return;
 		let r = n.getSource("square-preview-source");
 		if (!r) return;
-		let i = zt(e, t) * 2, a = Jt(e, i);
+		let i = Bt(e, t) * 2, a = Yt(e, i);
 		r.setData({
 			type: "Feature",
 			geometry: {
@@ -6552,11 +6554,11 @@ const Mapbox = forwardRef((e, c) => {
 			},
 			properties: {}
 		});
-		let o = J.current, s = o?.strokeColor ?? "#3388ff", c = o?.strokeWidth ?? 2, l = o?.fillColor ?? "#3388ff", u = o?.fillOpacity ?? .1;
+		let o = q.current, s = o?.strokeColor ?? "#3388ff", c = o?.strokeWidth ?? 2, l = o?.fillColor ?? "#3388ff", u = o?.fillOpacity ?? .1;
 		n.getLayer("square-preview-line") && (n.setPaintProperty("square-preview-line", "line-color", s), n.setPaintProperty("square-preview-line", "line-width", c)), n.getLayer("square-preview-fill") && (n.setPaintProperty("square-preview-fill", "fill-color", l), n.setPaintProperty("square-preview-fill", "fill-opacity", u));
 		let d = n.getSource("square-preview-measure-source");
 		if (d) {
-			let t = Nn.current, n = [];
+			let t = Pn.current, n = [];
 			if (t?.showArea && n.push({
 				type: "Feature",
 				geometry: {
@@ -6580,8 +6582,8 @@ const Mapbox = forwardRef((e, c) => {
 				features: n
 			});
 		}
-	}, [zt, Jt]), Xt = useCallback(() => {
-		let e = L.current;
+	}, [Bt, Yt]), Zt = useCallback(() => {
+		let e = I.current;
 		if (!e) return;
 		let t = e.getSource("square-preview-source");
 		t && t.setData({
@@ -6593,10 +6595,10 @@ const Mapbox = forwardRef((e, c) => {
 			type: "FeatureCollection",
 			features: []
 		});
-	}, []), Zt = useCallback(() => {
-		dt.current = null, Xt();
-	}, [Xt]), Qt = useCallback(() => {
-		let e = L.current;
+	}, []), Qt = useCallback(() => {
+		ft.current = null, Zt();
+	}, [Zt]), $t = useCallback(() => {
+		let e = I.current;
 		e && (e.getSource("polyline-preview-source") || (e.addSource("polyline-preview-source", {
 			type: "geojson",
 			data: {
@@ -6628,9 +6630,9 @@ const Mapbox = forwardRef((e, c) => {
 				"circle-stroke-color": "#ffffff",
 				"circle-stroke-width": 2
 			}
-		}), Nt(e, "polyline-preview-measure-source", "polyline-preview-measure-label")));
-	}, [Nt]), $t = useCallback((e, t) => {
-		let n = L.current;
+		}), Pt(e, "polyline-preview-measure-source", "polyline-preview-measure-label")));
+	}, [Pt]), en = useCallback((e, t) => {
+		let n = I.current;
 		if (!n) return;
 		let r = n.getSource("polyline-preview-source"), i = n.getSource("polyline-vertices-source");
 		if (!r || !i) return;
@@ -6656,11 +6658,11 @@ const Mapbox = forwardRef((e, c) => {
 				properties: {}
 			}))
 		});
-		let o = ft.current, s = o?.strokeColor ?? "#3388ff", c = o?.strokeWidth ?? 2;
+		let o = pt.current, s = o?.strokeColor ?? "#3388ff", c = o?.strokeWidth ?? 2;
 		n.getLayer("polyline-preview-line") && (n.setPaintProperty("polyline-preview-line", "line-color", s), n.setPaintProperty("polyline-preview-line", "line-width", c)), n.getLayer("polyline-vertices") && n.setPaintProperty("polyline-vertices", "circle-color", s);
 		let l = n.getSource("polyline-preview-measure-source");
 		if (l) {
-			let e = Nn.current, t = [];
+			let e = Pn.current, t = [];
 			if (e?.showLength && a.length >= 2) for (let e = 0; e < a.length - 1; e++) {
 				let n = a[e], r = a[e + 1], i = [(n[0] + r[0]) / 2, (n[1] + r[1]) / 2];
 				t.push({
@@ -6677,8 +6679,8 @@ const Mapbox = forwardRef((e, c) => {
 				features: t
 			});
 		}
-	}, []), en = useCallback(() => {
-		let e = L.current;
+	}, []), tn = useCallback(() => {
+		let e = I.current;
 		if (!e) return;
 		let t = e.getSource("polyline-preview-source");
 		t && t.setData({
@@ -6695,159 +6697,159 @@ const Mapbox = forwardRef((e, c) => {
 			type: "FeatureCollection",
 			features: []
 		});
-	}, []), Q = useCallback(() => {
-		pt.current = [], en();
-	}, [en]), tn = useCallback((e) => {
-		H(e), Mt(e), e ? (U("marker"), Z(), Ht(), Kt(), Zt(), Q()) : U(null);
+	}, []), Z = useCallback(() => {
+		mt.current = [], tn();
+	}, [tn]), nn = useCallback((e) => {
+		V(e), Nt(e), e ? (H("marker"), X(), Ut(), qt(), Qt(), Z()) : H(null);
 	}, [
-		Mt,
-		Z,
-		Ht,
-		Kt,
-		Zt,
-		Q
-	]), nn = useCallback((e) => {
-		if (U(e), e === "rectangle") {
-			H(null), X(), Ht(), Kt(), Zt(), Q();
-			let e = L.current;
+		Nt,
+		X,
+		Ut,
+		qt,
+		Qt,
+		Z
+	]), rn = useCallback((e) => {
+		if (H(e), e === "rectangle") {
+			V(null), Y(), Ut(), qt(), Qt(), Z();
+			let e = I.current;
 			e && (e.getCanvas().style.cursor = "crosshair");
 		} else if (e === "circle") {
-			H(null), X(), Z(), Kt(), Zt(), Q();
-			let e = L.current;
+			V(null), Y(), X(), qt(), Qt(), Z();
+			let e = I.current;
 			e && (e.getCanvas().style.cursor = "crosshair");
 		} else if (e === "polygon") {
-			H(null), X(), Z(), Ht(), Zt(), Q();
-			let e = L.current;
+			V(null), Y(), X(), Ut(), Qt(), Z();
+			let e = I.current;
 			e && (e.getCanvas().style.cursor = "crosshair");
 		} else if (e === "square") {
-			H(null), X(), Z(), Ht(), Kt(), Q();
-			let e = L.current;
+			V(null), Y(), X(), Ut(), qt(), Z();
+			let e = I.current;
 			e && (e.getCanvas().style.cursor = "crosshair");
 		} else if (e === "polyline") {
-			H(null), X(), Z(), Ht(), Kt(), Zt();
-			let e = L.current;
+			V(null), Y(), X(), Ut(), qt(), Qt();
+			let e = I.current;
 			e && (e.getCanvas().style.cursor = "crosshair");
-		} else e === "marker" ? (Z(), Ht(), Kt(), Zt(), Q()) : (H(null), X(), Z(), Ht(), Kt(), Zt(), Q());
+		} else e === "marker" ? (X(), Ut(), qt(), Qt(), Z()) : (V(null), Y(), X(), Ut(), qt(), Qt(), Z());
 	}, [
+		Y,
 		X,
-		Z,
-		Ht,
-		Kt,
-		Zt,
-		Q
-	]), rn = useCallback((e) => {
+		Ut,
+		qt,
+		Qt,
+		Z
+	]), an = useCallback((e) => {
 		if (e !== "picker") {
 			let e = y.value && isFinite(y.value.lng) && isFinite(y.value.lat), t = y.showMarker !== !1;
-			(!e || !t) && At(), nt(null);
+			(!e || !t) && jt(), rt(null);
 		}
-		e !== "edit" && (H(null), U(null), Z(), Q(), X()), et(e);
+		e !== "edit" && (V(null), H(null), X(), Z(), Y()), tt(e);
 	}, [
-		At,
+		jt,
+		Y,
 		X,
-		Z,
-		Q
-	]), an = useCallback(() => $e, [$e]), on = useCallback(() => tt, [tt]), sn = useCallback(() => {
-		At(), nt(null);
-	}, [At]);
+		Z
+	]), on = useCallback(() => et, [et]), sn = useCallback(() => nt, [nt]), cn = useCallback(() => {
+		jt(), rt(null);
+	}, [jt]);
 	useEffect(() => {
-		if (!V) return;
+		if (!B) return;
 		let e = y.value;
 		if (e && isFinite(e.lng) && isFinite(e.lat)) {
 			let t = [e.lng, e.lat];
-			nt(e), kt(t);
+			rt(e), At(t);
 		}
 	}, [
 		y.value,
-		kt,
-		V
+		At,
+		B
 	]);
-	let cn = (e) => "mode" in e, ln = useCallback((e) => {
-		if (et("edit"), At(), nt(null), W.current = !0, cn(e)) {
-			if (e.mode === "marker") e.markerStyle ? (ct.current = e.markerStyle, G.current = null, K.current = null, q.current = null, J.current = null, ft.current = null, H(null), U("marker"), e.markerStyle.src && e.markerStyle.width ? Mt({
+	let ln = (e) => "mode" in e, un = useCallback((e) => {
+		if (tt("edit"), jt(), rt(null), U.current = !0, ln(e)) {
+			if (e.mode === "marker") e.markerStyle ? (lt.current = e.markerStyle, W.current = null, G.current = null, K.current = null, q.current = null, pt.current = null, V(null), H("marker"), e.markerStyle.src && e.markerStyle.width ? Nt({
 				id: "custom",
 				name: e.markerStyle.name || "Marker",
 				icon: e.markerStyle.src,
 				width: e.markerStyle.width
-			}) : X()) : e.template && (ct.current = null, G.current = null, K.current = null, q.current = null, J.current = null, ft.current = null, H(e.template), U("marker"), Mt(e.template));
+			}) : Y()) : e.template && (lt.current = null, W.current = null, G.current = null, K.current = null, q.current = null, pt.current = null, V(e.template), H("marker"), Nt(e.template));
 			else if (e.mode === "rectangle") {
-				G.current = e.rectangleStyle || null, ct.current = null, K.current = null, q.current = null, J.current = null, ft.current = null, H(null), U("rectangle"), X();
-				let t = L.current;
+				W.current = e.rectangleStyle || null, lt.current = null, G.current = null, K.current = null, q.current = null, pt.current = null, V(null), H("rectangle"), Y();
+				let t = I.current;
 				t && (t.getCanvas().style.cursor = "crosshair");
 			} else if (e.mode === "circle") {
-				K.current = e.circleStyle || null, G.current = null, ct.current = null, q.current = null, J.current = null, ft.current = null, H(null), U("circle"), X();
-				let t = L.current;
+				G.current = e.circleStyle || null, W.current = null, lt.current = null, K.current = null, q.current = null, pt.current = null, V(null), H("circle"), Y();
+				let t = I.current;
 				t && (t.getCanvas().style.cursor = "crosshair");
 			} else if (e.mode === "polygon") {
-				q.current = e.polygonStyle || null, G.current = null, ct.current = null, K.current = null, J.current = null, ft.current = null, H(null), U("polygon"), X();
-				let t = L.current;
+				K.current = e.polygonStyle || null, W.current = null, lt.current = null, G.current = null, q.current = null, pt.current = null, V(null), H("polygon"), Y();
+				let t = I.current;
 				t && (t.getCanvas().style.cursor = "crosshair");
 			} else if (e.mode === "square") {
-				J.current = e.squareStyle || null, G.current = null, ct.current = null, K.current = null, q.current = null, ft.current = null, H(null), U("square"), X();
-				let t = L.current;
+				q.current = e.squareStyle || null, W.current = null, lt.current = null, G.current = null, K.current = null, pt.current = null, V(null), H("square"), Y();
+				let t = I.current;
 				t && (t.getCanvas().style.cursor = "crosshair");
 			} else if (e.mode === "polyline") {
-				ft.current = e.polylineStyle || null, G.current = null, ct.current = null, K.current = null, q.current = null, J.current = null, H(null), U("polyline"), X();
-				let t = L.current;
+				pt.current = e.polylineStyle || null, W.current = null, lt.current = null, G.current = null, K.current = null, q.current = null, V(null), H("polyline"), Y();
+				let t = I.current;
 				t && (t.getCanvas().style.cursor = "crosshair");
 			}
-		} else H(e), U("marker"), Mt(e), G.current = null, ct.current = null, K.current = null, q.current = null, J.current = null, ft.current = null;
+		} else V(e), H("marker"), Nt(e), W.current = null, lt.current = null, G.current = null, K.current = null, q.current = null, pt.current = null;
 	}, [
-		At,
-		Mt,
-		X
+		jt,
+		Nt,
+		Y
 	]);
 	useImperativeHandle(c, () => ({
-		startAnimation: yt,
-		stopAnimation: bt,
-		toggleAnimation: xt,
-		getMap: () => L.current,
-		openPopup: (e) => Ct(e, "programmatic"),
-		closePopup: wt,
-		closeAllPopups: Tt,
-		isPopupOpen: Et,
-		toggleUnitTrajectory: St,
-		flyTo: Dt,
-		flyToEntities: Ot,
-		getMode: an,
-		setMode: rn,
-		getPickedLocation: on,
-		clearPickedLocation: sn,
-		startDrawing: ln,
-		getRenderer: (e) => R.current.get(e),
+		startAnimation: bt,
+		stopAnimation: xt,
+		toggleAnimation: St,
+		getMap: () => I.current,
+		openPopup: (e) => wt(e, "programmatic"),
+		closePopup: Tt,
+		closeAllPopups: Et,
+		isPopupOpen: Dt,
+		toggleUnitTrajectory: Ct,
+		flyTo: Ot,
+		flyToEntities: kt,
+		getMode: on,
+		setMode: an,
+		getPickedLocation: sn,
+		clearPickedLocation: cn,
+		startDrawing: un,
+		getRenderer: (e) => L.current.get(e),
 		setEditingEntities: (e) => {
-			for (let t of vt.current) e.map(String).includes(String(t)) || R.current.get(t)?.setEditing?.(!1);
-			for (let t of e) R.current.get(t)?.setEditing?.(!0);
-			Y.current &&= (R.current.get(Y.current.entityId)?.cancelEditPreview?.(), null), _t(e);
+			for (let t of yt.current) e.map(String).includes(String(t)) || L.current.get(t)?.setEditing?.(!1);
+			for (let t of e) L.current.get(t)?.setEditing?.(!0);
+			J.current &&= (L.current.get(J.current.entityId)?.cancelEditPreview?.(), null), vt(e);
 		},
-		getEditingEntities: () => vt.current,
+		getEditingEntities: () => yt.current,
 		startRoutePlanning: (e) => {
-			He.current?.startPlanning(e);
+			Ue.current?.startPlanning(e);
 		}
 	}), [
-		yt,
 		bt,
 		xt,
-		Ct,
+		St,
 		wt,
 		Tt,
 		Et,
-		St,
 		Dt,
+		Ct,
 		Ot,
-		an,
-		rn,
+		kt,
 		on,
+		an,
 		sn,
-		ln
+		cn,
+		un
 	]);
-	let un = useCallback(() => {
-		let e = L.current;
+	let dn = useCallback(() => {
+		let e = I.current;
 		if (!e) return;
-		let t = new Set(E.map((e) => e.id)), n = new Set(R.current.keys());
-		for (let e of n) t.has(e) || (R.current.get(e)?.destroy(), R.current.delete(e));
-		let r = new Set(D.map(String));
-		for (let t of E) {
-			let n = applyEntityConfig(t, O), i = R.current.get(n.id);
+		let t = new Set(T.map((e) => e.id)), n = new Set(L.current.keys());
+		for (let e of n) t.has(e) || (L.current.get(e)?.destroy(), L.current.delete(e));
+		let r = new Set(E.map(String));
+		for (let t of T) {
+			let n = applyEntityConfig(t, D), i = L.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);
@@ -6856,38 +6858,38 @@ 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, k, A, j, M);
-				R.current.set(n.id, t), t.setSelected(r.has(String(n.id)));
+				let t = new CanvasCircleRenderer(e, n, O, k, A, j);
+				L.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, k, A, j, M);
-				R.current.set(n.id, t), t.setSelected(r.has(String(n.id)));
+				let t = new CircleRenderer(e, n, O, k, A, j);
+				L.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, k, A) : n.type === "image" ? t = new CanvasImageRenderer(e, n, k, A) : n.type === "marker" ? t = new MarkerRenderer(e, n, k, A) : n.type === "unit" ? t = new UnitRenderer(e, n, k, A) : n.type === "polygon" ? t = new PolygonRenderer(e, n, k, A, j, N) : n.type === "circle" ? t = n.fillType === "radial-gradient" ? new CanvasCircleRenderer(e, n, k, A, j, M) : new CircleRenderer(e, n, k, A, j, M) : n.type === "square" ? t = new SquareRenderer(e, n, k, A, j, N) : n.type === "rectangle" ? t = new RectangleRenderer(e, n, k, A, j, N) : n.type === "polyline" && (t = new PolylineRenderer(e, n, k, A, N)), t && (R.current.set(n.id, t), t.setSelected(r.has(String(n.id))), vt.current.map(String).includes(String(n.id)) && t.setEditing?.(!0));
+				n.type === "radar" ? t = new CanvasRadarRenderer(e, n, O, k) : n.type === "image" ? t = new CanvasImageRenderer(e, n, O, k) : n.type === "marker" ? t = new MarkerRenderer(e, n, O, k) : n.type === "unit" ? t = new UnitRenderer(e, n, O, k) : n.type === "polygon" ? t = new PolygonRenderer(e, n, O, k, A, M) : n.type === "circle" ? t = n.fillType === "radial-gradient" ? new CanvasCircleRenderer(e, n, O, k, A, j) : new CircleRenderer(e, n, O, k, A, j) : n.type === "square" ? t = new SquareRenderer(e, n, O, k, A, M) : n.type === "rectangle" ? t = new RectangleRenderer(e, n, O, k, A, M) : n.type === "polyline" && (t = new PolylineRenderer(e, n, O, k, M)), t && (L.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 vt.current) {
-			let t = R.current.get(e);
+		for (let e of yt.current) {
+			let t = L.current.get(e);
 			t && t.setEditing?.(!0);
 		}
 	}, [
+		T,
 		E,
 		D,
 		O,
 		k,
 		A,
 		j,
-		M,
-		N
-	]), dn = useCallback(() => {
-		for (let e of R.current.values()) e.destroy();
-		R.current.clear();
-	}, []), fn = useCallback((e) => {
+		M
+	]), fn = useCallback(() => {
+		for (let e of L.current.values()) e.destroy();
+		L.current.clear();
+	}, []), pn = useCallback((e) => {
 		let t = e.getStyle();
 		if (!t?.layers) return;
 		let n = [
@@ -6902,10 +6904,10 @@ const Mapbox = forwardRef((e, c) => {
 			"marker-"
 		];
 		for (let e of t.layers) if (n.some((t) => e.id.startsWith(t))) return e.id;
-	}, []), pn = useCallback((e) => {
-		let t = T, 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;
+	}, []), mn = useCallback((e) => {
+		let t = w, 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;
-	}, [T]), mn = useCallback((e, t) => {
+	}, [w]), hn = useCallback((e, t) => {
 		let n = `base-layer-source-${t.id}`, r = `base-layer-${t.id}`, i = {
 			type: "raster",
 			tiles: [t.url],
@@ -6915,27 +6917,28 @@ const Mapbox = forwardRef((e, c) => {
 			scheme: t.scheme ?? "xyz"
 		};
 		t.bounds && (i.bounds = t.bounds), t.attribution && (i.attribution = t.attribution), e.addSource(n, i);
-		let a = fn(e);
+		let a = pn(e);
 		e.addLayer({
 			id: r,
 			type: "raster",
 			source: n,
-			paint: pn(t),
+			paint: mn(t),
 			layout: { visibility: t.visible === !1 ? "none" : "visible" }
 		}, a);
-	}, [fn, pn]), hn = useCallback(async (e, t) => {
+	}, [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 (!Ue.current.has(t.id)) return;
-			let a = n.format === "pbf" || n.vector_layers, o = fn(e);
-			a ? (e.addSource(r, {
-				type: "vector",
-				tiles: n.tiles,
-				minzoom: n.minzoom ?? 0,
-				maxzoom: n.maxzoom ?? 22,
-				bounds: n.bounds,
-				attribution: n.attribution
-			}), console.warn(`TileJSON "${t.id}" 是矢量瓦片，建议使用 type: 'style' 加载完整样式`)) : (e.addSource(r, {
+			if (!We.current.has(t.id)) return;
+			let a = n.format === "pbf" || n.vector_layers, o = pn(e);
+			if (a) {
+				let t = {
+					type: "vector",
+					tiles: n.tiles,
+					minzoom: n.minzoom ?? 0,
+					maxzoom: n.maxzoom ?? 22
+				};
+				n.bounds && (t.bounds = n.bounds), n.attribution && (t.attribution = n.attribution), e.addSource(r, t);
+			} else e.addSource(r, {
 				type: "raster",
 				tiles: n.tiles,
 				tileSize: t.tileSize ?? n.tileSize ?? 256,
@@ -6947,21 +6950,21 @@ const Mapbox = forwardRef((e, c) => {
 				id: i,
 				type: "raster",
 				source: r,
-				paint: pn(t),
+				paint: mn(t),
 				layout: { visibility: t.visible === !1 ? "none" : "visible" }
-			}, o));
+			}, o);
 		} catch (e) {
 			console.error(`Failed to load TileJSON from ${t.url}:`, e);
 		}
-	}, [fn, pn]), gn = useCallback(async (e, t) => {
+	}, [pn, mn]), _n = useCallback(async (e, t) => {
 		try {
 			let n = await (await fetch(t.url)).json();
-			if (!Ue.current.has(t.id)) return;
+			if (!We.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);
 			}
-			let r = fn(e);
+			let r = pn(e);
 			if (n.layers) for (let i of n.layers) {
 				let n = `base-layer-${t.id}-${i.id}`;
 				if (e.getLayer(n)) continue;
@@ -6972,7 +6975,7 @@ const Mapbox = forwardRef((e, c) => {
 				};
 				i.type === "raster" && (a.paint = {
 					...a.paint,
-					...pn(t)
+					...mn(t)
 				}), t.visible === !1 && (a.layout = {
 					...a.layout,
 					visibility: "none"
@@ -6985,50 +6988,50 @@ const Mapbox = forwardRef((e, c) => {
 		} catch (e) {
 			console.error(`Failed to load Style JSON from ${t.url}:`, e);
 		}
-	}, [fn, pn]), _n = useCallback((e, t) => {
+	}, [pn, mn]), vn = useCallback((e, t) => {
 		let n = e.getStyle();
 		if (!n) return;
 		let r = `base-layer-${t}`, i = n.layers?.filter((e) => e.id.startsWith(r)) ?? [];
 		for (let t of i) e.getLayer(t.id) && e.removeLayer(t.id);
 		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);
-	}, []), vn = useCallback((e) => {
-		let t = L.current;
+	}, []), yn = useCallback((e) => {
+		let t = I.current;
 		if (!t) return;
-		let n = new Set(e.map((e) => e.id)), r = Ue.current;
-		for (let e of r) n.has(e) || (_n(t, e), r.delete(e));
+		let n = new Set(e.map((e) => e.id)), r = We.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}`;
 			if (t.getLayer(e)) {
-				let r = pn(n);
+				let r = mn(n);
 				for (let [n, i] of Object.entries(r)) t.setPaintProperty(e, n, i);
 				t.setLayoutProperty(e, "visibility", n.visible === !1 ? "none" : "visible");
 			}
 		} else switch (r.add(n.id), n.type) {
 			case "raster":
-				mn(t, n);
+				hn(t, n);
 				break;
 			case "tilejson":
-				hn(t, n);
+				gn(t, n);
 				break;
 			case "style":
-				gn(t, n);
+				_n(t, n);
 				break;
 			default: {
 				let e = n;
-				e.url && mn(t, {
+				e.url && hn(t, {
 					...e,
 					type: "raster"
 				});
 			}
 		}
 	}, [
-		mn,
 		hn,
 		gn,
 		_n,
-		pn
-	]), yn = useCallback((e) => {
+		vn,
+		mn
+	]), bn = useCallback((e) => {
 		let t = e;
 		for (; t;) {
 			let e = t.getAttribute?.("data-entity-id");
@@ -7036,158 +7039,158 @@ const Mapbox = forwardRef((e, c) => {
 			t = t.parentElement;
 		}
 		return null;
-	}, []), bn = useCallback((e) => {
+	}, []), xn = useCallback((e) => {
 		let t = [e.lngLat.lng, e.lngLat.lat], n = {
 			x: e.point.x,
 			y: e.point.y
-		}, r = On.current;
+		}, r = kn.current;
 		if (r === "picker") {
 			let e = {
 				lng: t[0],
 				lat: t[1]
 			};
-			nt(e), kt(t), kn.current?.(e);
+			rt(e), At(t), An.current?.(e);
 			return;
 		}
-		if (ht.current) return;
+		if (gt.current) return;
 		if (r === "edit") {
-			let e = jn.current;
+			let e = Mn.current;
 			if (e === "rectangle") {
-				let e = Mn.current;
-				if (!e) st(t);
+				let e = Nn.current;
+				if (!e) ct(t);
 				else {
-					let n = G.current, r = applyEntityConfig({
+					let n = W.current, r = applyEntityConfig({
 						...n,
-						id: n?.id ?? jt(),
+						id: n?.id ?? Mt(),
 						type: "rectangle",
 						bounds: [e, t]
-					}, O);
-					It();
-					let i = L.current;
-					if (i && !R.current.has(r.id)) {
-						let e = new RectangleRenderer(i, r, k, A, j, N);
-						R.current.set(r.id, e);
+					}, D);
+					Lt();
+					let i = I.current;
+					if (i && !L.current.has(r.id)) {
+						let e = new RectangleRenderer(i, r, O, k, A, M);
+						L.current.set(r.id, e);
 					}
-					$.current.onRectangleAdd?.(r), st(null), G.current = null, W.current && (W.current = !1, U(null), i && (i.getCanvas().style.cursor = ""));
+					Q.current.onRectangleAdd?.(r), ct(null), W.current = null, U.current && (U.current = !1, H(null), i && (i.getCanvas().style.cursor = ""));
 				}
 				return;
 			}
 			if (e === "circle") {
-				let e = lt.current;
-				if (!e) lt.current = { center: t };
+				let e = ut.current;
+				if (!e) ut.current = { center: t };
 				else {
-					let n = zt(e.center, t), r = K.current, i = applyEntityConfig({
+					let n = Bt(e.center, t), r = G.current, i = applyEntityConfig({
 						...r,
-						id: r?.id ?? jt(),
+						id: r?.id ?? Mt(),
 						type: "circle",
 						center: e.center,
 						radius: n
-					}, O);
-					Vt();
-					let a = L.current;
-					if (a && !R.current.has(i.id)) {
-						let e = new CircleRenderer(a, i, k, A, j, M);
-						R.current.set(i.id, e);
+					}, D);
+					Ht();
+					let a = I.current;
+					if (a && !L.current.has(i.id)) {
+						let e = new CircleRenderer(a, i, O, k, A, j);
+						L.current.set(i.id, e);
 					}
-					$.current.onCircleAdd?.(i), lt.current = null, K.current = null, W.current && (W.current = !1, U(null), a && (a.getCanvas().style.cursor = ""));
+					Q.current.onCircleAdd?.(i), ut.current = null, G.current = null, U.current && (U.current = !1, H(null), a && (a.getCanvas().style.cursor = ""));
 				}
 				return;
 			}
 			if (e === "polygon") {
-				let e = ut.current;
+				let e = dt.current;
 				if (e.length >= 3) {
 					let n = e[0];
-					if (zt(n, t) < 20) {
-						let t = q.current, n = applyEntityConfig({
+					if (Bt(n, t) < 20) {
+						let t = K.current, n = applyEntityConfig({
 							...t,
-							id: t?.id ?? jt(),
+							id: t?.id ?? Mt(),
 							type: "polygon",
 							coordinates: [...e]
-						}, O);
-						Gt();
-						let r = L.current;
-						if (r && !R.current.has(n.id)) {
-							let e = new PolygonRenderer(r, n, k, A, j, N);
-							R.current.set(n.id, e);
+						}, D);
+						Kt();
+						let r = I.current;
+						if (r && !L.current.has(n.id)) {
+							let e = new PolygonRenderer(r, n, O, k, A, M);
+							L.current.set(n.id, e);
 						}
-						$.current.onPolygonAdd?.(n), ut.current = [], q.current = null, W.current && (W.current = !1, U(null), r && (r.getCanvas().style.cursor = ""));
+						Q.current.onPolygonAdd?.(n), dt.current = [], K.current = null, U.current && (U.current = !1, H(null), r && (r.getCanvas().style.cursor = ""));
 						return;
 					}
 				}
-				ut.current = [...e, t];
+				dt.current = [...e, t];
 				return;
 			}
 			if (e === "square") {
-				let e = dt.current;
-				if (!e) dt.current = { center: t };
+				let e = ft.current;
+				if (!e) ft.current = { center: t };
 				else {
-					let n = zt(e.center, t) * 2, r = J.current, i = applyEntityConfig({
+					let n = Bt(e.center, t) * 2, r = q.current, i = applyEntityConfig({
 						...r,
-						id: r?.id ?? jt(),
+						id: r?.id ?? Mt(),
 						type: "square",
 						center: e.center,
 						length: n
-					}, O);
-					Xt();
-					let a = L.current;
-					if (a && !R.current.has(i.id)) {
-						let e = new SquareRenderer(a, i, k, A, j, N);
-						R.current.set(i.id, e);
+					}, D);
+					Zt();
+					let a = I.current;
+					if (a && !L.current.has(i.id)) {
+						let e = new SquareRenderer(a, i, O, k, A, M);
+						L.current.set(i.id, e);
 					}
-					$.current.onSquareAdd?.(i), dt.current = null, J.current = null, W.current && (W.current = !1, U(null), a && (a.getCanvas().style.cursor = ""));
+					Q.current.onSquareAdd?.(i), ft.current = null, q.current = null, U.current && (U.current = !1, H(null), a && (a.getCanvas().style.cursor = ""));
 				}
 				return;
 			}
 			if (e === "polyline") {
-				pt.current = [...pt.current, t];
+				mt.current = [...mt.current, t];
 				return;
 			}
-			let n = ct.current;
+			let n = lt.current;
 			if (n && n.src && n.width) {
 				let e = {
 					...n,
-					id: n.id ?? jt(),
+					id: n.id ?? Mt(),
 					type: "marker",
 					center: t,
 					src: n.src,
 					width: n.width
 				};
-				$.current.onMarkerAdd?.(e), H(null), U(null), X(), ct.current = null, W.current = !1;
+				Q.current.onMarkerAdd?.(e), V(null), H(null), Y(), lt.current = null, U.current = !1;
 				return;
 			}
-			let r = An.current;
+			let r = jn.current;
 			if (r) {
 				let e = {
-					id: jt(),
+					id: Mt(),
 					type: "marker",
 					name: r.name,
 					center: t,
 					src: r.icon,
 					width: r.size || r.width || 32
 				};
-				r.customData !== void 0 && (e.customData = r.customData), $.current.onMarkerAdd?.(e), H(null), U(null), X(), W.current = !1;
+				r.customData !== void 0 && (e.customData = r.customData), Q.current.onMarkerAdd?.(e), V(null), H(null), Y(), U.current = !1;
 				return;
 			}
 		}
-		if (vt.current.length > 0) {
-			let e = L.current?.getZoom() ?? 12;
-			if (Y.current) {
-				let { entityId: e, activeHandle: n } = Y.current, r = R.current.get(e);
+		if (yt.current.length > 0) {
+			let e = I.current?.getZoom() ?? 12;
+			if (J.current) {
+				let { entityId: e, activeHandle: n } = J.current, r = L.current.get(e);
 				if (r?.applyHandleMove) {
 					let e = r.applyHandleMove(n, t);
-					$.current.onEntityEdit?.(e);
+					Q.current.onEntityEdit?.(e);
 				}
-				Y.current = null;
+				J.current = null;
 				return;
 			}
-			for (let n of vt.current) {
-				let r = R.current.get(n);
+			for (let n of yt.current) {
+				let r = L.current.get(n);
 				if (!r?.getEditHandleAt) continue;
 				let i = r.getEditHandleAt(t, e);
 				if (i) {
 					if (i.type === "midpoint" && r.addVertex) {
 						let e = r.addVertex(i.index, i.position);
-						$.current.onEntityEdit?.(e), Y.current = {
+						Q.current.onEntityEdit?.(e), J.current = {
 							entityId: n,
 							activeHandle: {
 								type: "vertex",
@@ -7195,7 +7198,7 @@ const Mapbox = forwardRef((e, c) => {
 								position: i.position
 							}
 						};
-					} else Y.current = {
+					} else J.current = {
 						entityId: n,
 						activeHandle: i
 					};
@@ -7203,186 +7206,186 @@ const Mapbox = forwardRef((e, c) => {
 				}
 			}
 		}
-		let i = Tn.current, a = En.current, o = Dn.current, s = yn(e.originalEvent.target);
+		let i = En.current, a = Dn.current, o = On.current, s = bn(e.originalEvent.target);
 		if (s) {
 			let e = i.find((e) => String(e.id) === s);
 			if (e) {
 				if (a?.(e), e.popup) {
-					let t = e.popup.content ?? Pe?.(e);
-					t && mergePopupConfig(e.popup, I, t).trigger === "click" && o(s, "click", n);
+					let t = e.popup.content ?? Fe?.(e);
+					t && mergePopupConfig(e.popup, F, t).trigger === "click" && o(s, "click", n);
 				}
 				return;
 			}
 		}
-		for (let [t, r] of R.current) {
+		for (let [t, r] of L.current) {
 			let s = r.getLabelLayerId();
-			if (s && L.current?.getLayer(s) && L.current.queryRenderedFeatures(e.point, { layers: [s] }).length > 0) {
+			if (s && I.current?.getLayer(s) && I.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 ?? Pe?.(e);
-						r && mergePopupConfig(e.popup, I, r).trigger === "click" && o(t, "click", n);
+						let r = e.popup.content ?? Fe?.(e);
+						r && mergePopupConfig(e.popup, F, r).trigger === "click" && o(t, "click", n);
 					}
 					return;
 				}
 			}
 		}
-		for (let [e, r] of R.current) if (r.isPointInEntity(t)) {
+		for (let [e, r] of L.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 ?? Pe?.(t);
-					r && mergePopupConfig(t.popup, I, r).trigger === "click" && o(e, "click", n);
+					let r = t.popup.content ?? Fe?.(t);
+					r && mergePopupConfig(t.popup, F, r).trigger === "click" && o(e, "click", n);
 				}
 				return;
 			}
 		}
 	}, [
-		I,
-		Pe,
-		yn
-	]), xn = useCallback((e) => {
+		F,
+		Fe,
+		bn
+	]), Sn = useCallback((e) => {
 		let t = [e.lngLat.lng, e.lngLat.lat];
-		if (Y.current) {
-			let { entityId: e, activeHandle: n } = Y.current;
-			R.current.get(e)?.updateEditPreview?.(n, t);
+		if (J.current) {
+			let { entityId: e, activeHandle: n } = J.current;
+			L.current.get(e)?.updateEditPreview?.(n, t);
 			return;
 		}
-		let n = jn.current, r = Mn.current;
-		n === "rectangle" && r && Ft(r, t);
-		let i = lt.current;
-		n === "circle" && i && Bt(i.center, t);
-		let a = ut.current;
-		n === "polygon" && a.length > 0 && Wt(a, t);
-		let o = dt.current;
-		n === "square" && o && Yt(o.center, t);
-		let s = pt.current;
-		n === "polyline" && s.length > 0 && $t(s, t);
-		let c = Tn.current, l = Dn.current;
-		for (let [e, n] of R.current) if (n.isPointInEntity(t)) {
+		let n = Mn.current, r = Nn.current;
+		n === "rectangle" && r && It(r, t);
+		let i = ut.current;
+		n === "circle" && i && Vt(i.center, t);
+		let a = dt.current;
+		n === "polygon" && a.length > 0 && Gt(a, t);
+		let o = ft.current;
+		n === "square" && o && Xt(o.center, t);
+		let s = mt.current;
+		n === "polyline" && s.length > 0 && en(s, t);
+		let c = En.current, l = On.current;
+		for (let [e, n] of L.current) if (n.isPointInEntity(t)) {
 			let t = c.find((t) => t.id === e);
 			if (!t?.popup) continue;
-			let n = t.popup.content ?? Pe?.(t);
+			let n = t.popup.content ?? Fe?.(t);
 			if (!n) continue;
-			let r = mergePopupConfig(t.popup, I, n);
+			let r = mergePopupConfig(t.popup, F, n);
 			if (r.trigger === "hover") {
-				qe.current && clearTimeout(qe.current), qe.current = window.setTimeout(() => {
+				Je.current && clearTimeout(Je.current), Je.current = window.setTimeout(() => {
 					l(e, "hover");
 				}, r.hoverDelay);
 				return;
 			}
 		}
-		if (qe.current &&= (clearTimeout(qe.current), null), B?.openedBy === "hover") {
-			let e = R.current.get(B.entityId);
-			e && !e.isPointInEntity(t) && wt(B.entityId);
+		if (Je.current &&= (clearTimeout(Je.current), null), z?.openedBy === "hover") {
+			let e = L.current.get(z.entityId);
+			e && !e.isPointInEntity(t) && Tt(z.entityId);
 		}
 	}, [
-		I,
-		Pe,
-		B,
-		wt,
-		Ft,
-		Bt,
-		Wt,
-		Yt,
-		$t
-	]), Sn = useCallback((e) => {
-		if (e.preventDefault(), ht.current) return;
-		if (vt.current.length > 0) {
+		F,
+		Fe,
+		z,
+		Tt,
+		It,
+		Vt,
+		Gt,
+		Xt,
+		en
+	]), Cn = useCallback((e) => {
+		if (e.preventDefault(), gt.current) return;
+		if (yt.current.length > 0) {
 			let t = [e.lngLat.lng, e.lngLat.lat];
-			if (Y.current) {
-				R.current.get(Y.current.entityId)?.cancelEditPreview?.(), Y.current = null;
+			if (J.current) {
+				L.current.get(J.current.entityId)?.cancelEditPreview?.(), J.current = null;
 				return;
 			}
-			let n = L.current?.getZoom() ?? 12;
-			for (let e of vt.current) {
-				let r = R.current.get(e);
+			let n = I.current?.getZoom() ?? 12;
+			for (let e of yt.current) {
+				let r = L.current.get(e);
 				if (!r?.getEditHandleAt || !r.deleteVertex) continue;
 				let i = r.getEditHandleAt(t, n);
 				if (i && i.type === "vertex") {
 					let e = r.deleteVertex(i.index);
-					e && $.current.onEntityEdit?.(e);
+					e && Q.current.onEntityEdit?.(e);
 					return;
 				}
 			}
 		}
-		if (On.current !== "edit") return;
-		if (An.current) {
-			H(null), U(null), X();
+		if (kn.current !== "edit") return;
+		if (jn.current) {
+			V(null), H(null), Y();
 			return;
 		}
-		let t = jn.current;
+		let t = Mn.current;
 		if (t === "rectangle") {
-			if (Mn.current) st(null), It();
+			if (Nn.current) ct(null), Lt();
 			else {
-				U(null);
-				let e = L.current;
+				H(null);
+				let e = I.current;
 				e && (e.getCanvas().style.cursor = "");
 			}
 			return;
 		}
 		if (t === "circle") {
-			if (lt.current) lt.current = null, Vt();
+			if (ut.current) ut.current = null, Ht();
 			else {
-				U(null);
-				let e = L.current;
+				H(null);
+				let e = I.current;
 				e && (e.getCanvas().style.cursor = "");
 			}
 			return;
 		}
 		if (t === "polygon") {
-			let e = ut.current;
+			let e = dt.current;
 			if (e.length >= 3) {
-				let t = q.current, n = applyEntityConfig({
+				let t = K.current, n = applyEntityConfig({
 					...t,
-					id: t?.id ?? jt(),
+					id: t?.id ?? Mt(),
 					type: "polygon",
 					coordinates: [...e]
-				}, O);
-				Gt();
-				let r = L.current;
-				if (r && !R.current.has(n.id)) {
-					let e = new PolygonRenderer(r, n, k, A, j, N);
-					R.current.set(n.id, e);
+				}, D);
+				Kt();
+				let r = I.current;
+				if (r && !L.current.has(n.id)) {
+					let e = new PolygonRenderer(r, n, O, k, A, M);
+					L.current.set(n.id, e);
 				}
-				$.current.onPolygonAdd?.(n), ut.current = [], q.current = null, W.current && (W.current = !1, U(null), r && (r.getCanvas().style.cursor = ""));
-			} else if (e.length > 0) ut.current = [], Gt();
+				Q.current.onPolygonAdd?.(n), dt.current = [], K.current = null, U.current && (U.current = !1, H(null), r && (r.getCanvas().style.cursor = ""));
+			} else if (e.length > 0) dt.current = [], Kt();
 			else {
-				U(null);
-				let e = L.current;
+				H(null);
+				let e = I.current;
 				e && (e.getCanvas().style.cursor = "");
 			}
 			return;
 		}
 		if (t === "square") {
-			if (dt.current) dt.current = null, Xt();
+			if (ft.current) ft.current = null, Zt();
 			else {
-				U(null);
-				let e = L.current;
+				H(null);
+				let e = I.current;
 				e && (e.getCanvas().style.cursor = "");
 			}
 			return;
 		}
 		if (t === "polyline") {
-			let e = pt.current;
+			let e = mt.current;
 			if (e.length >= 2) {
-				let t = ft.current, n = applyEntityConfig({
+				let t = pt.current, n = applyEntityConfig({
 					...t,
-					id: t?.id ?? jt(),
+					id: t?.id ?? Mt(),
 					type: "polyline",
 					coordinates: [...e]
-				}, O);
-				en();
-				let r = L.current;
-				if (r && !R.current.has(n.id)) {
-					let e = new PolylineRenderer(r, n, k, A, N);
-					R.current.set(n.id, e);
+				}, D);
+				tn();
+				let r = I.current;
+				if (r && !L.current.has(n.id)) {
+					let e = new PolylineRenderer(r, n, O, k, M);
+					L.current.set(n.id, e);
 				}
-				$.current.onPolylineAdd?.(n), pt.current = [], ft.current = null, W.current && (W.current = !1, U(null), r && (r.getCanvas().style.cursor = ""));
-			} else if (e.length > 0) pt.current = [], en();
+				Q.current.onPolylineAdd?.(n), mt.current = [], pt.current = null, U.current && (U.current = !1, H(null), r && (r.getCanvas().style.cursor = ""));
+			} else if (e.length > 0) mt.current = [], tn();
 			else {
-				U(null);
-				let e = L.current;
+				H(null);
+				let e = I.current;
 				e && (e.getCanvas().style.cursor = "");
 			}
 			return;
@@ -7390,45 +7393,45 @@ const Mapbox = forwardRef((e, c) => {
 		let n = [e.lngLat.lng, e.lngLat.lat], r = {
 			x: e.point.x,
 			y: e.point.y
-		}, i = Tn.current, a = yn(e.originalEvent.target);
+		}, i = En.current, a = bn(e.originalEvent.target);
 		if (a) {
 			let e = i.find((e) => String(e.id) === a);
 			if (e) {
-				Cn(e, r, n);
+				wn(e, r, n);
 				return;
 			}
 		}
-		for (let [t, a] of R.current) {
+		for (let [t, a] of L.current) {
 			let o = a.getLabelLayerId();
-			if (o && L.current?.getLayer(o) && L.current.queryRenderedFeatures(e.point, { layers: [o] }).length > 0) {
+			if (o && I.current?.getLayer(o) && I.current.queryRenderedFeatures(e.point, { layers: [o] }).length > 0) {
 				let e = i.find((e) => e.id === t);
 				if (e) {
-					Cn(e, r, n);
+					wn(e, r, n);
 					return;
 				}
 			}
 		}
-		for (let [e, t] of R.current) if (t.isPointInEntity(n)) {
+		for (let [e, t] of L.current) if (t.isPointInEntity(n)) {
 			let t = i.find((t) => t.id === e);
 			if (t) {
-				Cn(t, r, n);
+				wn(t, r, n);
 				return;
 			}
 		}
 	}, [
-		yn,
-		X,
-		It,
-		Vt,
-		Gt,
-		Xt,
-		en
-	]), Cn = useCallback((e, t, n) => {
-		let r = Ve.current?.getBoundingClientRect(), i = r ? {
+		bn,
+		Y,
+		Lt,
+		Ht,
+		Kt,
+		Zt,
+		tn
+	]), wn = useCallback((e, t, n) => {
+		let r = He.current?.getBoundingClientRect(), i = r ? {
 			x: t.x + r.left,
 			y: t.y + r.top
 		} : t;
-		Ye({
+		Xe({
 			position: i,
 			lngLat: n,
 			items: [{
@@ -7444,12 +7447,12 @@ const Mapbox = forwardRef((e, c) => {
 				}),
 				danger: !0,
 				onClick: () => {
-					$.current.onEntityDelete?.(e);
+					Q.current.onEntityDelete?.(e);
 				}
 			}]
 		});
-	}, []), wn = useCallback(() => {
-		Ye(null);
+	}, []), Tn = useCallback(() => {
+		Xe(null);
 	}, []);
 	useEffect(() => {
 		let e = document.createElement("div");
@@ -7460,11 +7463,11 @@ const Mapbox = forwardRef((e, c) => {
 			width: 100%;
 			pointer-events: none;
 			height: 100%;
-			z-index: ${I?.zIndex ?? 1e3};
-		`, document.body.appendChild(e), Ge.current = e, () => {
+			z-index: ${F?.zIndex ?? 1e3};
+		`, document.body.appendChild(e), Ke.current = e, () => {
 			document.body.contains(e) && document.body.removeChild(e);
 		};
-	}, [I?.zIndex]), useEffect(() => {
+	}, [F?.zIndex]), useEffect(() => {
 		let e = document.createElement("div");
 		return e.id = `mapbox-context-menu-container-${Date.now()}`, e.style.cssText = `
 			position: fixed;
@@ -7473,65 +7476,65 @@ const Mapbox = forwardRef((e, c) => {
 			width: 100%;
 			pointer-events: none;
 			height: 100%;
-			z-index: ${(I?.zIndex ?? 1e3) + 100};
-		`, document.body.appendChild(e), Xe.current = e, () => {
+			z-index: ${(F?.zIndex ?? 1e3) + 100};
+		`, document.body.appendChild(e), Ze.current = e, () => {
 			document.body.contains(e) && document.body.removeChild(e);
 		};
-	}, [I?.zIndex]);
-	let Tn = useRef(E);
-	Tn.current = E;
-	let En = useRef(Ie);
-	En.current = Ie;
-	let Dn = useRef(Ct);
-	Dn.current = Ct;
-	let On = useRef($e);
-	On.current = $e;
-	let kn = useRef(b);
-	kn.current = b;
-	let An = useRef(it);
-	An.current = it;
+	}, [F?.zIndex]);
+	let En = useRef(T);
+	En.current = T;
+	let Dn = useRef(Le);
+	Dn.current = Le;
+	let On = useRef(wt);
+	On.current = wt;
+	let kn = useRef(et);
+	kn.current = et;
+	let An = useRef(b);
+	An.current = b;
 	let jn = useRef(at);
 	jn.current = at;
 	let Mn = useRef(ot);
 	Mn.current = ot;
-	let $ = useRef(v);
-	$.current = v;
-	let Nn = useRef(O);
-	Nn.current = O, useEffect(() => {
+	let Nn = useRef(st);
+	Nn.current = st;
+	let Q = useRef(v);
+	Q.current = v;
+	let Pn = useRef(D);
+	Pn.current = D, useEffect(() => {
 		let e = (e) => {
-			if (e.key === "Escape" && Y.current) {
-				R.current.get(Y.current.entityId)?.cancelEditPreview?.(), Y.current = null;
+			if (e.key === "Escape" && J.current) {
+				L.current.get(J.current.entityId)?.cancelEditPreview?.(), J.current = null;
 				return;
 			}
-			if (e.key === "Escape" && $e === "edit") {
-				if (it && (H(null), U(null), X()), at === "rectangle") if (ot) st(null), It();
+			if (e.key === "Escape" && et === "edit") {
+				if (at && (V(null), H(null), Y()), ot === "rectangle") if (st) ct(null), Lt();
 				else {
-					U(null);
-					let e = L.current;
+					H(null);
+					let e = I.current;
 					e && (e.getCanvas().style.cursor = "");
 				}
-				if (at === "circle") if (lt.current) lt.current = null, Vt();
+				if (ot === "circle") if (ut.current) ut.current = null, Ht();
 				else {
-					U(null);
-					let e = L.current;
+					H(null);
+					let e = I.current;
 					e && (e.getCanvas().style.cursor = "");
 				}
-				if (at === "polygon") if (ut.current.length > 0) ut.current = [], Gt();
+				if (ot === "polygon") if (dt.current.length > 0) dt.current = [], Kt();
 				else {
-					U(null);
-					let e = L.current;
+					H(null);
+					let e = I.current;
 					e && (e.getCanvas().style.cursor = "");
 				}
-				if (at === "square") if (dt.current) dt.current = null, Xt();
+				if (ot === "square") if (ft.current) ft.current = null, Zt();
 				else {
-					U(null);
-					let e = L.current;
+					H(null);
+					let e = I.current;
 					e && (e.getCanvas().style.cursor = "");
 				}
-				if (at === "polyline") if (pt.current.length > 0) pt.current = [], en();
+				if (ot === "polyline") if (mt.current.length > 0) mt.current = [], tn();
 				else {
-					U(null);
-					let e = L.current;
+					H(null);
+					let e = I.current;
 					e && (e.getCanvas().style.cursor = "");
 				}
 			}
@@ -7540,56 +7543,56 @@ const Mapbox = forwardRef((e, c) => {
 			document.removeEventListener("keydown", e);
 		};
 	}, [
-		$e,
-		it,
+		et,
 		at,
 		ot,
-		X,
-		It,
-		Vt,
-		Gt,
-		Xt,
-		en
+		st,
+		Y,
+		Lt,
+		Ht,
+		Kt,
+		Zt,
+		tn
 	]), useEffect(() => {
-		let e = L.current;
-		if (!e || !B) return;
-		let t = B.entityId, n = B.config, r = () => {
-			let r = Tn.current.find((e) => e.id === t);
+		let e = I.current;
+		if (!e || !z) return;
+		let t = z.entityId, n = z.config, r = () => {
+			let r = En.current.find((e) => e.id === t);
 			if (!r) {
-				Tt();
+				Et();
 				return;
 			}
-			let { position: i } = calculatePopupPosition(r, n, e, void 0, Ke.current);
-			Ke.current && (Ke.current.style.left = `${i.x}px`, Ke.current.style.top = `${i.y}px`);
+			let { position: i } = calculatePopupPosition(r, n, e, void 0, qe.current);
+			qe.current && (qe.current.style.left = `${i.x}px`, qe.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);
 		};
-	}, [B?.entityId, Tt]), useEffect(() => {
-		let e = L.current, t = Ve.current;
-		if (!e || !Je || !t) return;
-		let n = Je.lngLat, r = () => {
+	}, [z?.entityId, Et]), useEffect(() => {
+		let e = I.current, t = He.current;
+		if (!e || !Ye || !t) return;
+		let n = Ye.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) {
-				wn();
+				Tn();
 				return;
 			}
 			let o = t.getBoundingClientRect(), s = r.x + o.left, c = r.y + o.top;
-			Ze.current && (Ze.current.style.left = `${s}px`, Ze.current.style.top = `${c}px`);
+			Qe.current && (Qe.current.style.left = `${s}px`, Qe.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);
 		};
-	}, [Je?.lngLat, wn]), useEffect(() => {
-		if (!Ve.current) return;
+	}, [Ye?.lngLat, Tn]), useEffect(() => {
+		if (!He.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: p = !0, boxZoom: m = !0 } = x, _ = new mapboxgl.Map({
-			container: Ve.current,
+			container: He.current,
 			style: h || e,
 			center: l,
 			zoom: u,
@@ -7616,98 +7619,98 @@ const Mapbox = forwardRef((e, c) => {
 				return { url: e };
 			}
 		});
-		return L.current = _, _.on("load", () => {
+		return I.current = _, _.on("load", () => {
 			if (!_.getStyle().glyphs) {
 				let e = _.style, t = "/gis-fonts/{fontstack}/{range}.pbf";
 				e.glyphs = t, e.stylesheet && (e.stylesheet.glyphs = t);
 			}
-			z.current.clear(), E.forEach((e) => {
-				z.current.set(e.id, e);
-			}), vn(S), un(), Pt(), Lt(), Ut(), qt(), Qt(), Qe(_), Fe?.(_);
-		}), _.on("click", bn), _.on("mousemove", xn), _.on("contextmenu", Sn), () => {
-			_.off("click", bn), _.off("mousemove", xn), _.off("contextmenu", Sn), dn(), At(), X(), Z(), Q(), _.remove(), L.current = null;
+			R.current.clear(), T.forEach((e) => {
+				R.current.set(e.id, e);
+			}), yn(S), dn(), Ft(), Rt(), Wt(), Jt(), $t(), $e(_), Ie?.(_);
+		}), _.on("click", xn), _.on("mousemove", Sn), _.on("contextmenu", Cn), () => {
+			_.off("click", xn), _.off("mousemove", Sn), _.off("contextmenu", Cn), fn(), jt(), Y(), X(), Z(), _.remove(), I.current = null;
 		};
 	}, []), useEffect(() => {
-		if (L.current) {
-			if (!L.current.isStyleLoaded()) {
-				L.current.once("load", () => {
-					z.current.clear(), E.forEach((e) => {
-						z.current.set(e.id, e);
-					}), un();
+		if (I.current) {
+			if (!I.current.isStyleLoaded()) {
+				I.current.once("load", () => {
+					R.current.clear(), T.forEach((e) => {
+						R.current.set(e.id, e);
+					}), dn();
 				});
 				return;
 			}
-			z.current.clear(), E.forEach((e) => {
-				z.current.set(e.id, e);
-			}), un();
+			R.current.clear(), T.forEach((e) => {
+				R.current.set(e.id, e);
+			}), dn();
 		}
-	}, [E, un]), useEffect(() => {
-		!L.current || !L.current.isStyleLoaded() || (dn(), un());
+	}, [T, dn]), useEffect(() => {
+		!I.current || !I.current.isStyleLoaded() || (fn(), dn());
 	}, [
+		O,
 		k,
 		A,
 		j,
 		M,
-		N,
-		dn,
-		un
+		fn,
+		dn
 	]), useEffect(() => {
-		if (L.current) {
-			if (!L.current.isStyleLoaded()) {
-				L.current.once("load", () => {
-					vn(S);
+		if (I.current) {
+			if (!I.current.isStyleLoaded()) {
+				I.current.once("load", () => {
+					yn(S);
 				});
 				return;
 			}
-			vn(S);
-		}
-	}, [S, vn]);
-	let Pn = useRef(void 0), Fn = useRef(!0), In = useRef(S);
-	In.current = S;
-	let Ln = useRef(vn);
-	Ln.current = vn;
-	let Rn = useRef(dn);
-	Rn.current = dn;
-	let zn = useRef(un);
-	zn.current = un;
-	let Bn = useRef(Pt);
-	Bn.current = Pt;
-	let Vn = useRef(Lt);
-	Vn.current = Lt;
-	let Hn = useRef(Ut);
-	Hn.current = Ut;
-	let Un = useRef(qt);
-	Un.current = qt;
-	let Wn = useRef(Qt);
-	Wn.current = Qt, useEffect(() => {
-		let e = L.current;
+			yn(S);
+		}
+	}, [S, yn]);
+	let Fn = useRef(void 0), In = useRef(!0), Ln = useRef(S);
+	Ln.current = S;
+	let Rn = useRef(yn);
+	Rn.current = yn;
+	let zn = useRef(fn);
+	zn.current = fn;
+	let Bn = useRef(dn);
+	Bn.current = dn;
+	let Vn = useRef(Ft);
+	Vn.current = Ft;
+	let Hn = useRef(Rt);
+	Hn.current = Rt;
+	let Un = useRef(Wt);
+	Un.current = Wt;
+	let Wn = useRef(Jt);
+	Wn.current = Jt;
+	let Gn = useRef($t);
+	Gn.current = $t, useEffect(() => {
+		let e = I.current;
 		if (!e) return;
 		let t = h || {
 			version: 8,
 			sources: {},
 			layers: []
 		};
-		if (Fn.current) {
-			Fn.current = !1, Pn.current = h;
+		if (In.current) {
+			In.current = !1, Fn.current = h;
 			return;
 		}
-		Pn.current !== h && (Pn.current = h, e.setStyle(t), e.once("style.load", () => {
+		Fn.current !== h && (Fn.current = h, e.setStyle(t), e.once("style.load", () => {
 			if (!e.getStyle().glyphs) {
 				let t = e.style, n = "/gis-fonts/{fontstack}/{range}.pbf";
 				t.glyphs = n, t.stylesheet && (t.stylesheet.glyphs = n);
 			}
-			Ue.current.clear(), Ln.current(In.current), Rn.current(), zn.current(), Bn.current(), Vn.current(), Hn.current(), Un.current(), Wn.current();
+			We.current.clear(), Rn.current(Ln.current), zn.current(), Bn.current(), Vn.current(), Hn.current(), Un.current(), Wn.current(), Gn.current();
 		}));
 	}, [h]), useEffect(() => {
-		let e = new Set(D.map(String));
-		for (let [t, n] of R.current) n.setSelected(e.has(String(t)));
-	}, [D]);
-	let Gn = useRef({});
+		let e = new Set(E.map(String));
+		for (let [t, n] of L.current) n.setSelected(e.has(String(t)));
+	}, [E]);
+	let Kn = useRef({});
 	useEffect(() => {
-		let e = L.current;
+		let e = I.current;
 		if (!e) return;
-		let t = Gn.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 || (Gn.current = {
+		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 = {
 			center: l,
 			zoom: u,
 			pitch: d,
@@ -7724,49 +7727,51 @@ const Mapbox = forwardRef((e, c) => {
 		d,
 		f
 	]);
-	let Kn = (() => Ce === !1 ? null : Ce === !0 ? { enabled: !0 } : Ce)(), qn = (() => P === !1 ? null : P === !0 ? { enabled: !0 } : P)(), Jn = (() => we === !1 ? null : we === !0 ? { enabled: !0 } : we)(), Yn = (() => {
-		if (Te === !1) return null;
-		let e, t;
+	let qn = (() => we === !1 ? null : we === !0 ? { enabled: !0 } : we)(), Jn = (() => N === !1 ? null : N === !0 ? { enabled: !0 } : N)(), Yn = (() => Te === !1 ? null : Te === !0 ? { enabled: !0 } : Te)(), $ = (() => {
+		if (Ee === !1) return null;
+		let e, t, n;
 		if (S && S.length > 0) {
-			let n = S.find((e) => e.hasRoadNetwork === !0) || S[0];
-			if (n.type === "style") {
-				let t = L.current?.getStyle();
+			let r = S.find((e) => e.hasRoadNetwork === !0) || S[0];
+			if (r.type === "style") {
+				let t = I.current?.getStyle();
 				if (t?.sources) {
-					let r = `base-layer-source-${n.id}-`, i = Object.keys(t.sources).find((e) => e.startsWith(r));
+					let n = `base-layer-source-${r.id}-`, i = Object.keys(t.sources).find((e) => e.startsWith(n));
 					i && (e = i);
 				}
-			} else e = `base-layer-source-${n.id}`;
-			t = n.roadNetworkSourceLayer || "road";
+			} else e = `base-layer-source-${r.id}`;
+			t = r.roadNetworkSourceLayer || "road", n = r.roadNetworkClassField;
 		}
-		return Te === !0 ? {
+		return Ee === !0 ? {
 			enabled: !0,
 			source: e,
-			sourceLayer: t
+			sourceLayer: t,
+			classField: n
 		} : {
-			...Te,
-			source: Te.source || e,
-			sourceLayer: Te.sourceLayer || t
+			...Ee,
+			source: Ee.source || e,
+			sourceLayer: Ee.sourceLayer || t,
+			classField: Ee.classField || n
 		};
-	})(), Xn = (() => Ee ? Ee === !0 ? { enabled: !0 } : Ee : null)(), Zn = (() => Ae ? Ae === !0 ? { enabled: !0 } : Ae : null)(), Qn = (() => je || null)(), $n = useMemo(() => {
+	})(), Xn = (() => De ? De === !0 ? { enabled: !0 } : De : null)(), Zn = (() => je ? je === !0 ? { enabled: !0 } : je : null)(), Qn = (() => Me || null)(), $n = useMemo(() => {
 		let e = [];
 		for (let t of S) if (t.applyRasterPaint) if (t.type === "style") {
-			let n = L.current;
+			let n = I.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;
-	}, [S, V]);
+	}, [S, B]);
 	return /* @__PURE__ */ jsxs("div", {
-		className: `comp-mapbox ${$e === "picker" ? "comp-mapbox--picker-mode" : ""} ${ze}`,
-		style: Be,
+		className: `comp-mapbox ${et === "picker" ? "comp-mapbox--picker-mode" : ""} ${Be}`,
+		style: Ve,
 		children: [
 			/* @__PURE__ */ jsx("div", {
-				ref: Ve,
+				ref: He,
 				className: "comp-mapbox__map"
 			}),
-			$e === "picker" && y.showCrosshair === !0 && /* @__PURE__ */ jsxs("div", {
+			et === "picker" && y.showCrosshair === !0 && /* @__PURE__ */ jsxs("div", {
 				className: "comp-mapbox__crosshair",
 				children: [/* @__PURE__ */ jsx("div", {
 					className: "comp-mapbox__crosshair-h",
@@ -7776,34 +7781,35 @@ const Mapbox = forwardRef((e, c) => {
 					style: y.crosshairColor ? { backgroundColor: y.crosshairColor } : void 0
 				})]
 			}),
-			$e === "edit" && v.showEditTools !== !1 && (v.markerTemplates && v.markerTemplates.length > 0 || v.showRectangleTool || v.showCircleTool || v.showPolygonTool || v.showSquareTool || v.showPolylineTool) || Yn && Yn.enabled !== !1 || Qn && Qn.enabled !== !1 ? /* @__PURE__ */ jsxs("div", {
+			et === "edit" && v.showEditTools !== !1 && (v.markerTemplates && v.markerTemplates.length > 0 || v.showRectangleTool || v.showCircleTool || v.showPolygonTool || v.showSquareTool || v.showPolylineTool) || $ && $.enabled !== !1 || Qn && Qn.enabled !== !1 ? /* @__PURE__ */ jsxs("div", {
 				className: "comp-mapbox__edit-controls",
 				children: [
-					$e === "edit" && v.showEditTools !== !1 && (v.markerTemplates && v.markerTemplates.length > 0 || v.showRectangleTool || v.showCircleTool || v.showPolygonTool || v.showSquareTool || v.showPolylineTool) && /* @__PURE__ */ jsx(EditControl, {
+					et === "edit" && v.showEditTools !== !1 && (v.markerTemplates && v.markerTemplates.length > 0 || v.showRectangleTool || v.showCircleTool || v.showPolygonTool || v.showSquareTool || v.showPolylineTool) && /* @__PURE__ */ jsx(EditControl, {
 						markerTemplates: v.markerTemplates || [],
-						selectedTemplate: it,
-						onTemplateSelect: tn,
-						drawMode: at,
-						onDrawModeChange: nn,
+						selectedTemplate: at,
+						onTemplateSelect: nn,
+						drawMode: ot,
+						onDrawModeChange: rn,
 						showRectangleTool: v.showRectangleTool,
 						showCircleTool: v.showCircleTool,
 						showPolygonTool: v.showPolygonTool,
 						showSquareTool: v.showSquareTool,
 						showPolylineTool: v.showPolylineTool
 					}),
-					Yn && Yn.enabled !== !1 && /* @__PURE__ */ jsx(RoadHighlightControl, {
-						map: V,
-						highlightWidth: Yn.highlightWidth,
-						defaultRoadTypes: Yn.defaultRoadTypes,
-						defaultMinWidth: Yn.defaultMinWidth,
-						source: Yn.source,
-						sourceLayer: Yn.sourceLayer,
-						className: Yn.className,
-						style: Yn.style
+					$ && $.enabled !== !1 && /* @__PURE__ */ jsx(RoadHighlightControl, {
+						map: B,
+						highlightWidth: $.highlightWidth,
+						defaultRoadTypes: $.defaultRoadTypes,
+						defaultMinWidth: $.defaultMinWidth,
+						source: $.source,
+						sourceLayer: $.sourceLayer,
+						classField: $.classField,
+						className: $.className,
+						style: $.style
 					}),
 					Qn && Qn.enabled !== !1 && /* @__PURE__ */ jsx(RoutePlanningControl, {
-						ref: He,
-						map: V,
+						ref: Ue,
+						map: B,
 						pointCount: Qn.pointCount,
 						showPointCountInput: Qn.showPointCountInput,
 						visualType: Qn.visualType,
@@ -7811,67 +7817,67 @@ const Mapbox = forwardRef((e, c) => {
 					})
 				]
 			}) : null,
-			(Kn?.enabled !== !1 || qn?.enabled !== !1 || Jn?.enabled !== !1 || Xn && Xn.enabled !== !1 || Zn && Zn.enabled !== !1) && /* @__PURE__ */ jsxs("div", {
+			(qn?.enabled !== !1 || Jn?.enabled !== !1 || Yn?.enabled !== !1 || Xn && Xn.enabled !== !1 || Zn && Zn.enabled !== !1) && /* @__PURE__ */ jsxs("div", {
 				className: "comp-mapbox__controls",
 				children: [
-					Kn && Kn.enabled !== !1 && /* @__PURE__ */ jsx(CoordinateDisplay, {
-						map: V,
-						precision: Kn.precision,
-						className: Kn.className,
-						style: Kn.style
-					}),
-					qn && qn.enabled !== !1 && /* @__PURE__ */ jsx(ScaleControl, {
-						map: V,
-						maxWidth: qn.maxWidth,
-						unit: qn.unit,
+					qn && qn.enabled !== !1 && /* @__PURE__ */ jsx(CoordinateDisplay, {
+						map: B,
+						precision: qn.precision,
 						className: qn.className,
 						style: qn.style
 					}),
+					Jn && Jn.enabled !== !1 && /* @__PURE__ */ jsx(ScaleControl, {
+						map: B,
+						maxWidth: Jn.maxWidth,
+						unit: Jn.unit,
+						className: Jn.className,
+						style: Jn.style
+					}),
 					Xn && Xn.enabled !== !1 && /* @__PURE__ */ jsx(MeasureControl, {
-						map: V,
-						entityConfig: O,
+						map: B,
+						entityConfig: D,
 						onDrawModeChange: (e) => {
-							ht.current = e;
+							gt.current = e;
 						},
 						className: Xn.className,
 						style: Xn.style
 					}),
 					Zn && Zn.enabled !== !1 && /* @__PURE__ */ jsx(RasterPaintControl, {
-						map: V,
-						value: T,
-						onChange: Me,
+						map: B,
+						value: w,
+						onChange: Ne,
 						rasterPaintLayerIds: $n,
 						className: Zn.className,
 						style: Zn.style
 					}),
-					Jn && Jn.enabled !== !1 && /* @__PURE__ */ jsx(ResetViewControl, {
-						map: V,
+					Yn && Yn.enabled !== !1 && /* @__PURE__ */ jsx(ResetViewControl, {
+						map: B,
 						initialCenter: l,
 						initialZoom: u,
 						initialPitch: d,
 						initialBearing: f,
-						duration: Jn.duration,
-						className: Jn.className,
-						style: Jn.style
+						duration: Yn.duration,
+						className: Yn.className,
+						style: Yn.style
 					})
 				]
 			}),
 			!(Qn && Qn.enabled !== !1) && /* @__PURE__ */ jsx(RoutePlanningControl, {
-				ref: He,
-				map: V,
+				ref: Ue,
+				map: B,
 				showButton: !1
 			}),
-			B && Ge.current && /* @__PURE__ */ jsx(EntityPopup, {
-				popupState: B,
-				onClose: () => wt(B.entityId),
-				portalContainer: Ge.current,
-				popupRef: Ke
+			z && Ke.current && /* @__PURE__ */ jsx(EntityPopup, {
+				popupState: z,
+				onClose: () => Tt(z.entityId),
+				portalContainer: Ke.current,
+				popupRef: qe
 			}),
-			Je && Xe.current && /* @__PURE__ */ jsx(ContextMenu, {
-				menuState: Je,
-				onClose: wn,
-				portalContainer: Xe.current,
-				menuRef: Ze
+			Ye && Ze.current && /* @__PURE__ */ jsx(ContextMenu, {
+				menuState: Ye,
+				onClose: Tn,
+				portalContainer: Ze.current,
+				menuRef: Qe
 			})
 		]
 	});