bbl-mapbox-react 0.0.28 → 0.0.29

package/dist/index.mjs

@@ -4015,7 +4015,9 @@ function CoordinateDisplay({ map: e, precision: r = 6, className: i = "", style:
 	}, [r]);
 	useEffect(() => {
 		if (e) return e.on("mousemove", g), () => {
-			e.off("mousemove", g);
+			if (e) try {
+				e.off("mousemove", g);
+			} catch {}
 		};
 	}, [e, g]), useEffect(() => () => {
 		f.current && clearTimeout(f.current);
@@ -4107,7 +4109,9 @@ function ScaleControl({ map: e, maxWidth: r = 100, unit: i = "metric", className
 	]);
 	return useEffect(() => {
 		if (e) return u(), e.on("move", u), e.on("zoom", u), () => {
-			e.off("move", u), e.off("zoom", u);
+			if (e) try {
+				e.off("move", u), e.off("zoom", u);
+			} catch {}
 		};
 	}, [e, u]), /* @__PURE__ */ jsxs("div", {
 		className: `mapbox-scale-control ${a}`,
@@ -4183,7 +4187,7 @@ function detectVectorSource(e) {
 	return null;
 }
 const RoadHighlightControl = forwardRef(({ map: e, highlightWidth: i = 3, defaultRoadTypes: c = [], defaultMinWidth: l = 0, source: u, sourceLayer: d, classField: _ = "class", className: v = "", style: y, showButton: b = !0 }, x) => {
-	let [S, C] = useState(!1), [w, ve] = useState(c), [T, E] = useState(!1), [D, ye] = useState(null), be = useRef(!1), k = useRef(null), A = useRef(null), j = useRef(null), xe = useCallback((e, t, n) => {
+	let [S, C] = useState(!1), [w, ve] = useState(c), [T, E] = useState(!1), [D, ye] = useState(null), be = useRef(!1), k = useRef(null), xe = useRef(null), A = useRef(null), Se = useCallback((e, t, n) => {
 		if (!e.isStyleLoaded() || !e.getSource(t)) return !1;
 		let r = !0;
 		return ROAD_TYPE_OPTIONS.forEach((a) => {
@@ -4219,7 +4223,7 @@ const RoadHighlightControl = forwardRef(({ map: e, highlightWidth: i = 3, defaul
 				let r = detectVectorSource(e);
 				r && (console.log("Auto-detected vector source:", r), t ||= r.source, n ||= r.sourceLayer);
 			}
-			t && n ? xe(e, t, n) && (be.current = !0, E(!0)) : console.warn("No vector source found for road highlighting");
+			t && n ? Se(e, t, n) && (be.current = !0, E(!0)) : console.warn("No vector source found for road highlighting");
 		};
 		e.isStyleLoaded() ? t() : e.once("load", t);
 		let n = () => {
@@ -4228,13 +4232,15 @@ const RoadHighlightControl = forwardRef(({ map: e, highlightWidth: i = 3, defaul
 			be.current || t();
 		};
 		return e.on("styledata", n), e.on("sourcedata", r), () => {
-			e.off("styledata", n), e.off("sourcedata", r);
+			if (e) try {
+				e.off("styledata", n), e.off("sourcedata", r);
+			} catch {}
 		};
 	}, [
 		e,
 		u,
 		d,
-		xe
+		Se
 	]), useEffect(() => {
 		!e || !T || ROAD_TYPE_OPTIONS.forEach((t) => {
 			let n = `${LAYER_ID_PREFIX}${t.class}`;
@@ -4252,7 +4258,7 @@ const RoadHighlightControl = forwardRef(({ map: e, highlightWidth: i = 3, defaul
 	]), useEffect(() => {
 		if (!S) return;
 		let e = (e) => {
-			k.current && !k.current.contains(e.target) && A.current && !A.current.contains(e.target) && C(!1);
+			k.current && !k.current.contains(e.target) && xe.current && !xe.current.contains(e.target) && C(!1);
 		}, t = setTimeout(() => {
 			document.addEventListener("mousedown", e);
 		}, 0);
@@ -4265,11 +4271,11 @@ const RoadHighlightControl = forwardRef(({ map: e, highlightWidth: i = 3, defaul
 			if (e.getLayer(n)) try {
 				e.removeLayer(n);
 			} catch {}
-		}), j.current &&= (j.current.remove(), null);
+		}), A.current &&= (A.current.remove(), null);
 	}, [e]);
-	let M = useCallback((e) => ROAD_TYPE_OPTIONS.find((t) => t.class === e)?.label || e, []), N = useCallback((t) => {
+	let j = useCallback((e) => ROAD_TYPE_OPTIONS.find((t) => t.class === e)?.label || e, []), M = useCallback((t) => {
 		if (!e || w.length === 0) {
-			j.current && j.current.remove(), e?.getCanvas().style.cursor && (e.getCanvas().style.cursor = "");
+			A.current && A.current.remove(), e?.getCanvas().style.cursor && (e.getCanvas().style.cursor = "");
 			return;
 		}
 		let n = w.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)) });
@@ -4278,7 +4284,7 @@ const RoadHighlightControl = forwardRef(({ map: e, highlightWidth: i = 3, defaul
 			m(o) && h.push(`
 						<div class="road-highlight-popup__row">
 							<span>道路类型:</span>
-							<span class="road-highlight-popup__value">${M(o)}</span>
+							<span class="road-highlight-popup__value">${j(o)}</span>
 						</div>
 					`), h.push(`
 					<div class="road-highlight-popup__row">
@@ -4327,33 +4333,35 @@ const RoadHighlightControl = forwardRef(({ map: e, highlightWidth: i = 3, defaul
 						<div class="road-highlight-popup__info">${h.join("")}</div>
 					</div>
 				`;
-			j.current ||= new mapboxgl.Popup({
+			A.current ||= new mapboxgl.Popup({
 				closeButton: !1,
 				closeOnClick: !1,
 				offset: 15,
 				className: "road-highlight-popup"
-			}), j.current.setLngLat(r).setHTML(g).addTo(e), e.getCanvas().style.cursor = "pointer";
-		} else j.current && j.current.remove(), e.getCanvas().style.cursor = "";
+			}), A.current.setLngLat(r).setHTML(g).addTo(e), e.getCanvas().style.cursor = "pointer";
+		} else A.current && A.current.remove(), e.getCanvas().style.cursor = "";
 	}, [
 		e,
 		w,
-		M,
+		j,
 		_
 	]);
 	useEffect(() => {
-		if (!(!e || !T)) return e.on("mousemove", N), () => {
-			e.off("mousemove", N), j.current && j.current.remove(), e.getCanvas().style.cursor = "";
+		if (!(!e || !T)) return e.on("mousemove", M), () => {
+			if (e) try {
+				e.off("mousemove", M), A.current && A.current.remove(), e.getCanvas().style.cursor = "";
+			} catch {}
 		};
 	}, [
 		e,
 		T,
-		N
+		M
 	]);
-	let P = (e, t) => {
+	let N = (e, t) => {
 		ve((n) => t ? [...n, e] : n.filter((t) => t !== e));
-	}, Se = (e) => {
+	}, Ce = (e) => {
 		ve(e ? ROAD_TYPE_OPTIONS.map((e) => e.class) : []);
-	}, F = w.length > 0, Ce = () => /* @__PURE__ */ jsxs(Fragment, { children: [
+	}, P = w.length > 0, we = () => /* @__PURE__ */ jsxs(Fragment, { children: [
 		/* @__PURE__ */ jsxs("div", {
 			className: "mapbox-road-highlight-control__panel-header",
 			children: [/* @__PURE__ */ jsx("span", {
@@ -4362,7 +4370,7 @@ const RoadHighlightControl = forwardRef(({ map: e, highlightWidth: i = 3, defaul
 			}), /* @__PURE__ */ jsx(Checkbox, {
 				checked: w.length === ROAD_TYPE_OPTIONS.length,
 				indeterminate: w.length > 0 && w.length < ROAD_TYPE_OPTIONS.length,
-				onChange: Se,
+				onChange: Ce,
 				style: {
 					"--color-text-1": "#fff",
 					"--color-border-2": "rgba(255, 255, 255, 0.3)"
@@ -4379,11 +4387,11 @@ const RoadHighlightControl = forwardRef(({ map: e, highlightWidth: i = 3, defaul
 				className: "mapbox-road-highlight-control__type-list",
 				children: ROAD_TYPE_OPTIONS.map((e) => /* @__PURE__ */ jsxs("div", {
 					className: "mapbox-road-highlight-control__type-item",
-					onClick: () => P(e.class, !w.includes(e.class)),
+					onClick: () => N(e.class, !w.includes(e.class)),
 					children: [
 						/* @__PURE__ */ jsx(Checkbox, {
 							checked: w.includes(e.class),
-							onChange: (t) => P(e.class, t),
+							onChange: (t) => N(e.class, t),
 							onClick: (e) => e.stopPropagation(),
 							style: {
 								"--color-text-1": "#fff",
@@ -4417,8 +4425,8 @@ const RoadHighlightControl = forwardRef(({ map: e, highlightWidth: i = 3, defaul
 		className: `mapbox-road-highlight-control ${v}`,
 		style: y,
 		children: [/* @__PURE__ */ jsxs("button", {
-			ref: A,
-			className: `mapbox-control-btn mapbox-road-highlight-control__btn ${F ? "mapbox-road-highlight-control__btn--active" : ""}`,
+			ref: xe,
+			className: `mapbox-control-btn mapbox-road-highlight-control__btn ${P ? "mapbox-road-highlight-control__btn--active" : ""}`,
 			onClick: () => C(!S),
 			title: `路网高亮${w.length > 0 ? ` (已选 ${w.length})` : ""}`,
 			children: [/* @__PURE__ */ jsx("img", {
@@ -4429,9 +4437,9 @@ const RoadHighlightControl = forwardRef(({ map: e, highlightWidth: i = 3, defaul
 		}), S && /* @__PURE__ */ jsx("div", {
 			ref: k,
 			className: "mapbox-road-highlight-control__panel",
-			children: Ce()
+			children: we()
 		})]
-	}), D && createPortal(Ce(), D)] });
+	}), D && createPortal(we(), D)] });
 });
 RoadHighlightControl.displayName = "RoadHighlightControl";
 var measure_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='1773733446763'%20class='icon'%20viewBox='0%200%201024%201024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20p-id='1802'%20xmlns:xlink='http://www.w3.org/1999/xlink'%20width='128'%20height='128'%3e%3cpath%20d='M110.34624%20352.01024a30.72%2030.72%200%201%200%2061.44%200v-38.46144h680.42752v38.5024a30.72%2030.72%200%200%200%2061.44%200V213.72928a30.72%2030.72%200%200%200-61.44%200v38.33856H171.78624v-38.33856a30.72%2030.72%200%200%200-61.44%200v138.28096z%20m34.816%20127.22176a34.816%2034.816%200%200%200-34.816%2034.816v312.60672c0%2019.2512%2015.5648%2034.816%2034.816%2034.816h733.5936c19.2512%200%2034.816-15.5648%2034.816-34.816V514.048a34.816%2034.816%200%200%200-34.816-34.816H145.2032z%20m26.624%20320.79872V540.672h680.3456v259.35872H171.8272z'%20fill='white'%20p-id='1804'%3e%3c/path%3e%3c/svg%3e", square_default = "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3csvg%20viewBox='0%200%201024%201024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20width='128'%20height='128'%3e%3crect%20x='192'%20y='192'%20width='640'%20height='640'%20rx='32'%20ry='32'%20fill='none'%20stroke='%23ffffff'%20stroke-width='64'/%3e%3c/svg%3e", rectangle_default = "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3csvg%20viewBox='0%200%201024%201024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20width='128'%20height='128'%3e%3crect%20x='160'%20y='240'%20width='704'%20height='544'%20rx='32'%20ry='32'%20fill='none'%20stroke='%23ffffff'%20stroke-width='64'/%3e%3c/svg%3e", circle_default = "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3csvg%20viewBox='0%200%201024%201024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20width='128'%20height='128'%3e%3ccircle%20cx='512'%20cy='512'%20r='384'%20fill='none'%20stroke='%23ffffff'%20stroke-width='64'/%3e%3c/svg%3e", polygon_default = "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3csvg%20viewBox='0%200%201024%201024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20width='128'%20height='128'%3e%3cpolygon%20points='512,128%20864,384%20736,800%20288,800%20160,384'%20fill='none'%20stroke='%23ffffff'%20stroke-width='64'%20stroke-linejoin='round'/%3e%3c/svg%3e", polyline_default = "data:image/svg+xml,%3c?xml%20version='1.0'%20standalone='no'?%3e%3csvg%20viewBox='0%200%201024%201024'%20version='1.1'%20xmlns='http://www.w3.org/2000/svg'%20width='128'%20height='128'%3e%3cpolyline%20points='160,768%20384,256%20640,576%20864,192'%20fill='none'%20stroke='%23ffffff'%20stroke-width='64'%20stroke-linejoin='round'%20stroke-linecap='round'/%3e%3c/svg%3e", delete_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='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", SHAPE_LABELS = {
@@ -4683,28 +4691,30 @@ 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()), w = useRef(0), T = useRef(null), E = useRef(null), D = useRef(null), O = useRef(null), k = useRef(null), M = useRef([]), N = useRef([]), P = useRef(b);
-	P.current = b;
-	let Se = useRef(f);
-	Se.current = f;
-	let F = useCallback(() => `measure-${++w.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), j = useRef([]), M = useRef([]), N = useRef(b);
+	N.current = b;
+	let Ce = useRef(f);
+	Ce.current = f;
+	let P = useCallback(() => `measure-${++w.current}`, []);
 	useEffect(() => {
 		s?.(f !== null);
 	}, [f, s]);
-	let Ce = useRef(!1), we = useCallback(() => {
-		!e || !e.isStyleLoaded() || (initAllPreviewLayers(e), Ce.current = !0);
+	let we = useRef(!1), Te = useCallback(() => {
+		!e || !e.isStyleLoaded() || (initAllPreviewLayers(e), we.current = !0);
 	}, [e]);
 	useEffect(() => {
 		if (!e) return;
 		let t = () => {
-			initAllPreviewLayers(e), Ce.current = !0;
+			initAllPreviewLayers(e), we.current = !0;
 		};
 		e.isStyleLoaded() ? t() : e.once("load", t);
 		let n = () => {
-			Ce.current = !1;
+			we.current = !1;
 		};
 		return e.on("style.load", n), () => {
-			e.off("style.load", n);
+			if (e) try {
+				e.off("style.load", n);
+			} catch {}
 		};
 	}, [e]), useEffect(() => {
 		let e = (e) => {
@@ -4712,9 +4722,9 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 		};
 		return document.addEventListener("mousedown", e), () => document.removeEventListener("mousedown", e);
 	}, []);
-	let I = useCallback((t) => {
+	let F = useCallback((t) => {
 		if (!e) return;
-		let n = applyEntityConfig(t, P.current), r = null;
+		let n = applyEntityConfig(t, N.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 = {
@@ -4725,12 +4735,12 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 			};
 			S((t) => [...t, e]);
 		}
-	}, [e]), Te = useCallback((e) => {
+	}, [e]), Ee = useCallback((e) => {
 		let t = C.current.get(e);
 		t && (t.destroy(), C.current.delete(e)), S((t) => t.filter((t) => t.entity.id !== e));
-	}, []), Ee = useCallback(() => {
+	}, []), De = useCallback(() => {
 		C.current.forEach((e) => e.destroy()), C.current.clear(), S([]);
-	}, []), De = useCallback((t) => {
+	}, []), Oe = useCallback((t) => {
 		if (!e) return;
 		let n = C.current.get(t);
 		if (!n) return;
@@ -4740,9 +4750,9 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 			maxZoom: 18,
 			duration: 1e3
 		});
-	}, [e]), Oe = useCallback((e, t) => {
+	}, [e]), ke = useCallback((e, t) => {
 		let n = {
-			...P.current,
+			...N.current,
 			[e]: t
 		};
 		y ? i?.({ ...n }) : v(n), S((t) => t.map((t) => {
@@ -4754,7 +4764,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 				entity: i
 			};
 		}));
-	}, [y, i]), ke = useCallback((t, n) => {
+	}, [y, i]), Ae = useCallback((t, n) => {
 		if (!e) return;
 		let [r, i] = t, [a, o] = n, s = [
 			[Math.min(r, a), Math.max(i, o)],
@@ -4773,7 +4783,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 		});
 		let l = e.getSource(`${PREVIEW_PREFIX}rect-preview-measure-source`);
 		if (l) {
-			let e = P.current, t = [], n = s[0], r = s[1], i = s[2];
+			let e = N.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({
@@ -4804,7 +4814,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 				features: t
 			});
 		}
-	}, [e]), Ae = useCallback((t, n) => {
+	}, [e]), je = 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({
@@ -4815,7 +4825,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 			},
 			properties: {}
 		});
-		let o = P.current, s = [], c = [];
+		let o = N.current, s = [], c = [];
 		if (o?.showArea && s.push({
 			type: "Feature",
 			geometry: {
@@ -4851,7 +4861,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 			type: "FeatureCollection",
 			features: c
 		});
-	}, [e]), je = useCallback((t, n) => {
+	}, [e]), Me = 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({
@@ -4864,7 +4874,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 		});
 		let o = e.getSource(`${PREVIEW_PREFIX}square-preview-measure-source`);
 		if (o) {
-			let e = P.current, n = [];
+			let e = N.current, n = [];
 			if (e?.showArea && n.push({
 				type: "Feature",
 				geometry: {
@@ -4888,7 +4898,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 				features: n
 			});
 		}
-	}, [e]), L = useCallback((t, n) => {
+	}, [e]), I = useCallback((t, n) => {
 		if (!e) return;
 		let r = [...t, n], i = e.getSource(`${PREVIEW_PREFIX}polygon-preview-source`);
 		i && (r.length >= 3 ? i.setData({
@@ -4923,7 +4933,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 		});
 		let o = e.getSource(`${PREVIEW_PREFIX}polygon-preview-measure-source`);
 		if (o) {
-			let e = P.current, t = [];
+			let e = N.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];
@@ -4965,7 +4975,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 				features: t
 			});
 		}
-	}, [e]), Me = useCallback((t, n) => {
+	}, [e]), Ne = useCallback((t, n) => {
 		if (!e) return;
 		let r = [...t, n], i = e.getSource(`${PREVIEW_PREFIX}polyline-preview-source`);
 		i && (r.length >= 2 ? i.setData({
@@ -4993,7 +5003,7 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 		});
 		let o = e.getSource(`${PREVIEW_PREFIX}polyline-preview-measure-source`);
 		if (o) {
-			let e = P.current, t = [];
+			let e = N.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({
@@ -5013,139 +5023,141 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 	}, [e]);
 	useEffect(() => {
 		if (!e || !f) return;
-		we(), e.getCanvas().style.cursor = "crosshair";
+		Te(), e.getCanvas().style.cursor = "crosshair";
 		let t = (t) => {
-			let n = [t.lngLat.lng, t.lngLat.lat], r = Se.current;
+			let n = [t.lngLat.lng, t.lngLat.lat], r = Ce.current;
 			if (r === "rectangle") {
 				let t = D.current;
 				if (!t) D.current = n;
 				else {
 					let r = {
-						id: F(),
+						id: P(),
 						type: "rectangle",
 						bounds: [t, n]
 					};
-					I(r), D.current = null, clearAllPreviewSources(e), p(null);
+					F(r), D.current = null, clearAllPreviewSources(e), p(null);
 				}
 			} else if (r === "circle") {
 				let t = O.current;
 				if (!t) O.current = { center: n };
 				else {
 					let r = calculateDistance(t.center, n), i = {
-						id: F(),
+						id: P(),
 						type: "circle",
 						center: t.center,
 						radius: r
 					};
-					I(i), O.current = null, clearAllPreviewSources(e), p(null);
+					F(i), O.current = null, clearAllPreviewSources(e), p(null);
 				}
 			} else if (r === "square") {
 				let t = k.current;
 				if (!t) k.current = { center: n };
 				else {
 					let r = calculateDistance(t.center, n) * 2, i = {
-						id: F(),
+						id: P(),
 						type: "square",
 						center: t.center,
 						length: r
 					};
-					I(i), k.current = null, clearAllPreviewSources(e), p(null);
+					F(i), k.current = null, clearAllPreviewSources(e), p(null);
 				}
 			} else if (r === "polygon") {
-				let t = M.current;
+				let t = j.current;
 				if (t.length >= 3 && calculateDistance(t[0], n) < 20) {
 					let n = {
-						id: F(),
+						id: P(),
 						type: "polygon",
 						coordinates: [...t]
 					};
-					I(n), M.current = [], clearAllPreviewSources(e), p(null);
+					F(n), j.current = [], clearAllPreviewSources(e), p(null);
 					return;
 				}
-				M.current = [...t, n];
-			} else r === "polyline" && (N.current = [...N.current, n]);
+				j.current = [...t, n];
+			} else r === "polyline" && (M.current = [...M.current, n]);
 		}, n = (e) => {
-			let t = [e.lngLat.lng, e.lngLat.lat], n = Se.current;
-			if (n === "rectangle" && D.current) ke(D.current, t);
-			else if (n === "circle" && O.current) Ae(O.current.center, t);
-			else if (n === "square" && k.current) je(k.current.center, t);
+			let t = [e.lngLat.lng, e.lngLat.lat], n = Ce.current;
+			if (n === "rectangle" && D.current) Ae(D.current, t);
+			else if (n === "circle" && O.current) je(O.current.center, t);
+			else if (n === "square" && k.current) Me(k.current.center, t);
 			else if (n === "polygon") {
-				let e = M.current;
-				e.length > 0 && L(e, t);
+				let e = j.current;
+				e.length > 0 && I(e, t);
 			} else if (n === "polyline") {
-				let e = N.current;
-				e.length > 0 && Me(e, t);
+				let e = M.current;
+				e.length > 0 && Ne(e, t);
 			}
 		}, r = (t) => {
 			t.preventDefault();
-			let n = Se.current;
+			let n = Ce.current;
 			if (n === "polygon") {
-				let t = M.current;
+				let t = j.current;
 				if (t.length >= 3) {
 					let n = {
-						id: F(),
+						id: P(),
 						type: "polygon",
 						coordinates: [...t]
 					};
-					I(n), M.current = [], clearAllPreviewSources(e), p(null);
-				} else M.current = [], clearAllPreviewSources(e);
+					F(n), j.current = [], clearAllPreviewSources(e), p(null);
+				} else j.current = [], clearAllPreviewSources(e);
 			} else if (n === "polyline") {
-				let t = N.current;
+				let t = M.current;
 				if (t.length >= 2) {
 					let n = {
-						id: F(),
+						id: P(),
 						type: "polyline",
 						coordinates: [...t]
 					};
-					I(n), N.current = [], clearAllPreviewSources(e), p(null);
-				} else N.current = [], clearAllPreviewSources(e);
+					F(n), M.current = [], clearAllPreviewSources(e), p(null);
+				} else M.current = [], clearAllPreviewSources(e);
 			}
 		}, i = (t) => {
-			t.key === "Escape" && (D.current = null, O.current = null, k.current = null, M.current = [], N.current = [], clearAllPreviewSources(e), p(null));
+			t.key === "Escape" && (D.current = null, O.current = null, k.current = null, j.current = [], M.current = [], clearAllPreviewSources(e), p(null));
 		}, a = (t) => {
 			t.preventDefault();
-			let n = Se.current;
+			let n = Ce.current;
 			if (n === "polygon") {
-				let t = M.current;
+				let t = j.current;
 				if (t.length >= 3) {
 					let n = {
-						id: F(),
+						id: P(),
 						type: "polygon",
 						coordinates: [...t]
 					};
-					I(n), M.current = [], clearAllPreviewSources(e), p(null);
+					F(n), j.current = [], clearAllPreviewSources(e), p(null);
 				}
 			} else if (n === "polyline") {
-				let t = N.current;
+				let t = M.current;
 				if (t.length >= 2) {
 					let n = {
-						id: F(),
+						id: P(),
 						type: "polyline",
 						coordinates: [...t]
 					};
-					I(n), N.current = [], clearAllPreviewSources(e), p(null);
+					F(n), M.current = [], clearAllPreviewSources(e), p(null);
 				}
 			}
 		};
 		return e.doubleClickZoom.disable(), e.on("click", t), e.on("mousemove", n), e.on("contextmenu", r), e.on("dblclick", a), document.addEventListener("keydown", i), () => {
-			e.off("click", t), e.off("mousemove", n), e.off("contextmenu", r), e.off("dblclick", a), document.removeEventListener("keydown", i), e.getCanvas().style.cursor = "", e.doubleClickZoom.enable(), clearAllPreviewSources(e);
+			if (document.removeEventListener("keydown", i), e) try {
+				e.off("click", t), e.off("mousemove", n), e.off("contextmenu", r), e.off("dblclick", a), e.getCanvas().style.cursor = "", e.doubleClickZoom.enable(), clearAllPreviewSources(e);
+			} catch {}
 		};
 	}, [
 		e,
 		f,
+		P,
 		F,
-		I,
-		we,
-		ke,
+		Te,
 		Ae,
 		je,
-		L,
-		Me
+		Me,
+		I,
+		Ne
 	]), useEffect(() => () => {
 		C.current.forEach((e) => e.destroy()), C.current.clear();
 	}, []);
-	let Ne = useCallback((t) => {
-		p((e) => e === t ? null : t), D.current = null, O.current = null, k.current = null, M.current = [], N.current = [], e && clearAllPreviewSources(e);
+	let Pe = useCallback((t) => {
+		p((e) => e === t ? null : t), D.current = null, O.current = null, k.current = null, j.current = [], M.current = [], e && clearAllPreviewSources(e);
 	}, [e]);
 	return e ? /* @__PURE__ */ jsxs("div", {
 		className: `mapbox-measure-control ${c}`,
@@ -5181,17 +5193,17 @@ function MeasureControl({ map: e, entityConfig: r, onEntityConfigChange: i, onDr
 					children: [
 						/* @__PURE__ */ jsx(Checkbox, {
 							checked: b.showArea,
-							onChange: (e) => Oe("showArea", e),
+							onChange: (e) => ke("showArea", e),
 							children: "面积"
 						}),
 						/* @__PURE__ */ jsx(Checkbox, {
 							checked: b.showLength,
-							onChange: (e) => Oe("showLength", e),
+							onChange: (e) => ke("showLength", e),
 							children: "长度"
 						}),
 						/* @__PURE__ */ jsx(Checkbox, {
 							checked: b.showRadius,
-							onChange: (e) => Oe("showRadius", e),
+							onChange: (e) => ke("showRadius", e),
 							children: "半径"
 						})
 					]
@@ -5204,7 +5216,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: () => Ne(e.mode),
+						onClick: () => Pe(e.mode),
 						title: e.label,
 						children: /* @__PURE__ */ jsx("img", {
 							src: e.icon,
@@ -5212,7 +5224,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: Ee,
+						onClick: De,
 						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",
@@ -5232,7 +5244,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: () => De(e.entity.id),
+							onClick: () => Oe(e.entity.id),
 							children: [
 								/* @__PURE__ */ jsx("td", { children: e.shapeLabel }),
 								/* @__PURE__ */ jsx("td", { children: String(e.entity.id) }),
@@ -5241,7 +5253,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(), Te(e.entity.id);
+										t.stopPropagation(), Ee(e.entity.id);
 									},
 									title: "删除",
 									children: /* @__PURE__ */ jsx("img", {
@@ -5659,12 +5671,14 @@ const RoutePlanningControl = forwardRef(({ map: e, pointCount: i = 2, showPointC
 			let r = new mapboxgl.Marker({ element: n }).setLngLat(t).addTo(e);
 			T.current.push(r);
 		} else be();
-	}, [e, be]), A = useCallback(() => {
-		ye(), ve.current = [], D.current = null, v(0), g("idle"), e && (e.getCanvas().style.cursor = O.current);
-	}, [ye, e]), j = useCallback(async () => {
+	}, [e, be]), xe = useCallback(() => {
+		if (ye(), ve.current = [], D.current = null, v(0), g("idle"), e) try {
+			e.getCanvas().style.cursor = O.current;
+		} catch {}
+	}, [ye, e]), A = useCallback(async () => {
 		let e = D.current, t = [...ve.current];
 		if (!e || t.length < 2) {
-			A();
+			xe();
 			return;
 		}
 		g("planning");
@@ -5673,30 +5687,32 @@ const RoutePlanningControl = forwardRef(({ map: e, pointCount: i = 2, showPointC
 		} catch (e) {
 			console.error("Route planning onSelectFinished failed:", e);
 		} finally {
-			A();
+			xe();
 		}
-	}, [A]), xe = useCallback((e) => {
+	}, [xe]), Se = useCallback((e) => {
 		if (E.current !== "selecting" || !D.current) return;
 		let t = [e.lngLat.lng, e.lngLat.lat];
 		ve.current.push(t);
 		let n = ve.current.length;
-		v(n), k(t), n >= D.current.pointCount && j();
-	}, [k, j]), M = useCallback((e) => {
-		E.current === "selecting" && (e.preventDefault(), A());
-	}, [A]);
+		v(n), k(t), n >= D.current.pointCount && A();
+	}, [k, A]), j = useCallback((e) => {
+		E.current === "selecting" && (e.preventDefault(), xe());
+	}, [xe]);
 	useEffect(() => {
-		if (e && p === "selecting") return e.on("click", xe), e.on("contextmenu", M), () => {
-			e.off("click", xe), e.off("contextmenu", M);
+		if (e && p === "selecting") return e.on("click", Se), e.on("contextmenu", j), () => {
+			if (e) try {
+				e.off("click", Se), e.off("contextmenu", j);
+			} catch {}
 		};
 	}, [
 		e,
 		p,
-		xe,
-		M
+		Se,
+		j
 	]);
-	let N = useCallback((t) => {
+	let M = useCallback((t) => {
 		if (!e) return;
-		E.current !== "idle" && A();
+		E.current !== "idle" && xe();
 		let n = Math.max(2, t.pointCount ?? i), r = t.visualType ?? l;
 		D.current = {
 			pointCount: n,
@@ -5707,21 +5723,21 @@ const RoutePlanningControl = forwardRef(({ map: e, pointCount: i = 2, showPointC
 		e,
 		i,
 		l,
-		A
+		xe
 	]);
-	useImperativeHandle(f, () => ({ startPlanning: N }), [N]);
-	let P = () => {
-		p === "idle" ? S((e) => !e) : p === "selecting" && A();
-	}, Se = () => {
-		u && N({
+	useImperativeHandle(f, () => ({ startPlanning: M }), [M]);
+	let N = () => {
+		p === "idle" ? S((e) => !e) : p === "selecting" && xe();
+	}, Ce = () => {
+		u && M({
 			pointCount: Math.max(2, y),
 			visualType: l,
 			onSelectFinished: u
 		});
-	}, F = (e) => {
+	}, P = (e) => {
 		let t = parseInt(e.target.value, 10);
 		!isNaN(t) && t >= 2 ? b(t) : e.target.value === "" && b(2);
-	}, Ce = () => {
+	}, we = () => {
 		if (p === "planning") return /* @__PURE__ */ jsx("span", { children: "规划中..." });
 		if (p === "selecting") {
 			let e = D.current?.pointCount ?? y;
@@ -5732,20 +5748,20 @@ const RoutePlanningControl = forwardRef(({ map: e, pointCount: i = 2, showPointC
 			] });
 		}
 		return "路径规划";
-	}, we = p === "selecting", I = p === "planning";
+	}, Te = p === "selecting", F = p === "planning";
 	return !d && p === "idle" ? null : /* @__PURE__ */ jsxs("div", {
 		className: `mapbox-route-planning-control${d ? "" : " mapbox-route-planning-control--floating"}`,
 		children: [/* @__PURE__ */ jsxs("button", {
 			ref: C,
-			className: `mapbox-control-btn mapbox-route-planning-control__btn${we ? " mapbox-route-planning-control__btn--active" : ""}${I ? " mapbox-route-planning-control__btn--planning" : ""}${x ? " mapbox-route-planning-control__btn--active" : ""}`,
-			onClick: P,
-			disabled: I,
+			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,
 			title: p === "idle" ? "路径规划" : p === "selecting" ? "取消选点" : "规划中...",
 			children: [/* @__PURE__ */ jsx("img", {
 				src: route_planning_default,
 				alt: "route",
 				className: "mapbox-route-planning-control__btn-icon"
-			}), Ce()]
+			}), we()]
 		}), x && p === "idle" && /* @__PURE__ */ jsxs("div", {
 			ref: w,
 			className: "mapbox-route-planning-control__panel",
@@ -5768,7 +5784,7 @@ const RoutePlanningControl = forwardRef(({ map: e, pointCount: i = 2, showPointC
 							className: "mapbox-route-planning-control__panel-input",
 							value: y,
 							min: 2,
-							onChange: F
+							onChange: P
 						}) : /* @__PURE__ */ jsx("span", {
 							className: "mapbox-route-planning-control__panel-value",
 							children: y
@@ -5780,7 +5796,7 @@ const RoutePlanningControl = forwardRef(({ map: e, pointCount: i = 2, showPointC
 					}),
 					/* @__PURE__ */ jsx("button", {
 						className: "mapbox-route-planning-control__panel-start",
-						onClick: Se,
+						onClick: Ce,
 						disabled: !u,
 						children: "开始规划"
 					})
@@ -5937,53 +5953,53 @@ function adjustPopupForBounds(e, t) {
 	return r.x + t.width + 10 > n.width && (r.x = n.width - t.width - 10), r.x < 10 && (r.x = 10), r.y + t.height + 10 > n.height && (r.y = n.height - t.height - 10), r.y < 10 && (r.y = 10), r;
 }
 const Mapbox = forwardRef((e, c) => {
-	let { center: l = [116.4074, 39.9042], zoom: u = 12, pitch: d = 0, bearing: f = 0, style: p = "mapbox://styles/mapbox/dark-v11", maxBounds: g, mode: _ = "display", editConfig: v = {}, pickerConfig: y = {}, onPick: b, interactive: x = {}, layers: S = [], rasterPaint: C, entities: T = [], selectedIds: E = [], entityConfig: D, nameConfig: O, selectNameConfig: k, areaConfig: M, circleConfig: N, lengthConfig: P, showCoordinates: Se = !0, showScale: F = !0, showResetView: Ce = !0, showRoadHighlight: we = !1, showMeasure: I = !1, showRasterPaint: Ee = !1, showRoutePlanning: Ae, onRasterPaintChange: je, popupDefaults: L, renderPopup: Ne, onMapLoad: Pe, onEntityClick: Fe, onPopupOpen: Ie, onPopupClose: Le, className: Re = "", containerStyle: ze } = e, Be = useRef(null), Ve = useRef(null), He = useRef(null), R = useRef(null), z = useRef(/* @__PURE__ */ new Map()), B = useRef(/* @__PURE__ */ new Map()), Ue = useRef(/* @__PURE__ */ new Set()), [V, We] = useState(null), Ge = useRef(null), Ke = useRef(null), qe = useRef(null), [Je, Ye] = useState(null), Xe = useRef(null), Ze = useRef(null), [Qe, $e] = useState(null), [et, tt] = useState(_), [nt, rt] = useState(null), it = useRef(null), [at, H] = useState(null), [ot, U] = useState(null), [st, ct] = useState(null), W = useRef(!1), G = useRef(null), lt = useRef(null), K = useRef(null), ut = useRef(null), q = useRef(null), dt = useRef([]), ft = useRef(null), pt = useRef(null), mt = useRef(null), ht = useRef([]), gt = useRef(null), _t = useRef(!1), [vt, yt] = useState([]), bt = useRef([]);
-	bt.current = vt;
-	let J = useRef(null);
+	let { center: l = [116.4074, 39.9042], zoom: u = 12, pitch: d = 0, bearing: f = 0, style: p = "mapbox://styles/mapbox/dark-v11", maxBounds: g, mode: _ = "display", editConfig: v = {}, pickerConfig: y = {}, onPick: b, interactive: x = {}, layers: S = [], rasterPaint: C, entities: T = [], selectedIds: E = [], entityConfig: D, nameConfig: O, selectNameConfig: k, areaConfig: j, circleConfig: M, lengthConfig: N, showCoordinates: Ce = !0, showScale: P = !0, showResetView: we = !0, showRoadHighlight: Te = !1, showMeasure: F = !1, showRasterPaint: De = !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), Ue = useRef(null), L = useRef(null), R = useRef(/* @__PURE__ */ new Map()), z = useRef(/* @__PURE__ */ new Map()), We = useRef(/* @__PURE__ */ new Set()), [B, Ge] = useState(null), Ke = useRef(null), qe = useRef(null), Je = useRef(null), [Ye, Xe] = useState(null), Ze = useRef(null), Qe = useRef(null), [$e, et] = useState(null), [V, tt] = useState(_), [nt, rt] = useState(null), it = useRef(null), [at, H] = useState(null), [ot, U] = useState(null), [st, ct] = useState(null), W = useRef(!1), lt = useRef(null), ut = useRef(null), G = useRef(null), dt = useRef(null), K = useRef(null), ft = useRef([]), pt = useRef(null), mt = useRef(null), ht = useRef(null), gt = useRef([]), _t = useRef(null), vt = useRef(!1), [yt, bt] = useState([]), xt = useRef([]);
+	xt.current = yt;
+	let q = useRef(null);
 	useEffect(() => {
 		tt(_);
 	}, [_]);
-	let xt = useCallback((e) => {
-		let t = z.current.get(e), n = B.current.get(e);
+	let St = useCallback((e) => {
+		let t = R.current.get(e), n = z.current.get(e);
 		if (t && n) {
 			if (n.type === "radar" && t instanceof CanvasRadarRenderer) {
 				let r = {
 					...n,
 					isAnimating: !0
 				};
-				B.current.set(e, r), t.startAnimation();
+				z.current.set(e, r), t.startAnimation();
 			} else if (n.type === "circle" && t instanceof CanvasCircleRenderer) {
 				let r = {
 					...n,
 					isAnimating: !0
 				};
-				B.current.set(e, r), t.startAnimation();
+				z.current.set(e, r), t.startAnimation();
 			}
 		}
-	}, []), St = useCallback((e) => {
-		let t = z.current.get(e), n = B.current.get(e);
+	}, []), Ct = useCallback((e) => {
+		let t = R.current.get(e), n = z.current.get(e);
 		if (t && n) {
 			if (n.type === "radar" && t instanceof CanvasRadarRenderer) {
 				let r = {
 					...n,
 					isAnimating: !1
 				};
-				B.current.set(e, r), t.stopAnimation();
+				z.current.set(e, r), t.stopAnimation();
 			} else if (n.type === "circle" && t instanceof CanvasCircleRenderer) {
 				let r = {
 					...n,
 					isAnimating: !1
 				};
-				B.current.set(e, r), t.stopAnimation();
+				z.current.set(e, r), t.stopAnimation();
 			}
 		}
-	}, []), Ct = useCallback((e) => {
-		let t = B.current.get(e);
-		t && (t.type === "radar" || t.type === "circle") && (t.type, t.isAnimating ? St(e) : xt(e));
-	}, [xt, St]), wt = useCallback((e) => {
+	}, []), wt = useCallback((e) => {
+		let t = z.current.get(e);
+		t && (t.type === "radar" || t.type === "circle") && (t.type, t.isAnimating ? Ct(e) : St(e));
+	}, [St, Ct]), Tt = useCallback((e) => {
 		if (e === void 0) {
 			let e = !1;
-			for (let [, t] of z.current) if (t instanceof UnitRenderer) {
+			for (let [, t] of R.current) if (t instanceof UnitRenderer) {
 				let n = t.getShowTrajectory();
 				if (n === "all" || typeof n == "number" && n > 0) {
 					e = !0;
@@ -5991,46 +6007,46 @@ const Mapbox = forwardRef((e, c) => {
 				}
 			}
 			let t = e ? 0 : "all";
-			for (let [, e] of z.current) e instanceof UnitRenderer && e.setShowTrajectory(t);
+			for (let [, e] of R.current) e instanceof UnitRenderer && e.setShowTrajectory(t);
 		} else {
 			let t = new Set(e.map(String));
-			for (let [e, n] of z.current) n instanceof UnitRenderer && n.setShowTrajectory(t.has(String(e)) ? "all" : 0);
+			for (let [e, n] of R.current) n instanceof UnitRenderer && n.setShowTrajectory(t.has(String(e)) ? "all" : 0);
 		}
-	}, []), Tt = useCallback((e, t, n) => {
+	}, []), Et = useCallback((e, t, n) => {
 		let r = T.find((t) => String(t.id) === String(e));
-		if (!r?.popup || !R.current) return;
-		let i = r.popup.content ?? Ne?.(r);
+		if (!r?.popup || !L.current) return;
+		let i = r.popup.content ?? Pe?.(r);
 		if (!i) return;
-		let a = mergePopupConfig(r.popup, L, i), { position: o, actualPosition: s } = calculatePopupPosition(r, a, R.current, n);
-		We({
+		let a = mergePopupConfig(r.popup, I, i), { position: o, actualPosition: s } = calculatePopupPosition(r, a, L.current, n);
+		Ge({
 			entityId: e,
 			position: o,
 			config: a,
 			openedBy: t,
 			actualPosition: s
-		}), Ie?.(e);
+		}), Le?.(e);
 	}, [
 		T,
-		L,
-		Ne,
-		Ie
-	]), Et = useCallback((e) => {
-		V?.entityId === e && (We(null), Le?.(e));
-	}, [V, Le]), Dt = useCallback(() => {
-		We((e) => (e && Le?.(e.entityId), null));
-	}, [Le]), Ot = useCallback((e) => V?.entityId === e, [V]), kt = useCallback((e, t, n) => {
-		let r = R.current;
+		I,
+		Pe,
+		Le
+	]), Dt = useCallback((e) => {
+		B?.entityId === e && (Ge(null), Re?.(e));
+	}, [B, Re]), Ot = useCallback(() => {
+		Ge((e) => (e && Re?.(e.entityId), null));
+	}, [Re]), kt = useCallback((e) => B?.entityId === e, [B]), At = useCallback((e, t, n) => {
+		let r = L.current;
 		r && r.flyTo({
 			center: e,
 			zoom: t ?? r.getZoom(),
 			...n
 		});
-	}, []), At = useCallback((e, t, n) => {
-		let r = R.current;
+	}, []), jt = useCallback((e, t, n) => {
+		let r = L.current;
 		if (!r || e.length === 0) return;
 		let i = [];
 		for (let t of e) {
-			let e = z.current.get(t);
+			let e = R.current.get(t);
 			e && i.push(e.getBounds());
 		}
 		if (i.length === 0) return;
@@ -6052,10 +6068,13 @@ 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);
-	}, []), jt = useCallback((e) => {
-		let t = R.current;
+	}, []), Mt = useRef(null), Nt = useRef("display"), [Pt, Ft] = useState({}), J = useMemo(() => ({
+		...y,
+		...Pt
+	}), [y, Pt]), It = useCallback((e) => {
+		let t = L.current;
 		if (!t || !t.getContainer()) return;
-		let { showMarker: n = !0, markerColor: r = "#3388ff", name: i, nameConfig: a } = y;
+		let { showMarker: n = !0, markerColor: r = "#3388ff", name: i, nameConfig: a } = J;
 		if (!n) {
 			it.current &&= (it.current.remove(), null);
 			return;
@@ -6084,33 +6103,33 @@ const Mapbox = forwardRef((e, c) => {
 				anchor: "bottom"
 			}).setLngLat(e).addTo(t);
 		}
-	}, [y, O]), Mt = useCallback(() => {
+	}, [J, O]), Lt = useCallback(() => {
 		it.current &&= (it.current.remove(), null);
-	}, []), Nt = useCallback(() => `marker-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`, []), Pt = useCallback((e) => {
-		let t = R.current;
-		if (Be.current) if (gt.current &&= (gt.current.remove(), null), e && t) {
+	}, []), Rt = useCallback(() => `marker-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`, []), zt = useCallback((e) => {
+		let t = L.current;
+		if (Ve.current) if (_t.current &&= (_t.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), gt.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), _t.current = n;
 			let a = (e) => {
-				gt.current && (gt.current.style.left = `${e.clientX}px`, gt.current.style.top = `${e.clientY}px`);
+				_t.current && (_t.current.style.left = `${e.clientX}px`, _t.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 = "");
 	}, []), Y = useCallback(() => {
-		if (gt.current) {
-			let e = gt.current._cleanup;
-			e && e(), gt.current.remove(), gt.current = null;
+		if (_t.current) {
+			let e = _t.current._cleanup;
+			e && e(), _t.current.remove(), _t.current = null;
 		}
-		let e = R.current;
+		let e = L.current;
 		e && (e.getCanvas().style.cursor = "");
-	}, []), Ft = useCallback((e, t, n) => {
+	}, []), Bt = useCallback((e, t, n) => {
 		if (!e.getSource(t)) {
 			if (!e.getStyle().glyphs) {
 				let t = e.style, n = "/gis-fonts/{fontstack}/{range}.pbf";
@@ -6146,8 +6165,8 @@ const Mapbox = forwardRef((e, c) => {
 				}
 			});
 		}
-	}, []), It = useCallback(() => {
-		let e = R.current;
+	}, []), Vt = useCallback(() => {
+		let e = L.current;
 		e && (e.getSource("rect-preview-source") || (e.addSource("rect-preview-source", {
 			type: "geojson",
 			data: {
@@ -6171,9 +6190,9 @@ const Mapbox = forwardRef((e, c) => {
 				"line-width": 2,
 				"line-dasharray": [4, 4]
 			}
-		}), Ft(e, "rect-preview-measure-source", "rect-preview-measure-label")));
-	}, [Ft]), Lt = useCallback((e, t) => {
-		let n = R.current;
+		}), Bt(e, "rect-preview-measure-source", "rect-preview-measure-label")));
+	}, [Bt]), Ht = useCallback((e, t) => {
+		let n = L.current;
 		if (!n) return;
 		let r = n.getSource("rect-preview-source");
 		if (!r) return;
@@ -6192,11 +6211,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 = lt.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 = zn.current, t = [], n = c[0], r = c[1], i = c[2];
+			let e = Vn.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({
@@ -6233,8 +6252,8 @@ const Mapbox = forwardRef((e, c) => {
 				features: t
 			});
 		}
-	}, []), Rt = useCallback(() => {
-		let e = R.current;
+	}, []), Ut = useCallback(() => {
+		let e = L.current;
 		if (!e) return;
 		let t = e.getSource("rect-preview-source");
 		t && t.setData({
@@ -6247,9 +6266,9 @@ const Mapbox = forwardRef((e, c) => {
 			features: []
 		});
 	}, []), X = useCallback(() => {
-		ct(null), Rt();
-	}, [Rt]), zt = useCallback(() => {
-		let e = R.current;
+		ct(null), Ut();
+	}, [Ut]), Wt = useCallback(() => {
+		let e = L.current;
 		e && (e.getSource("circle-preview-source") || (e.addSource("circle-preview-source", {
 			type: "geojson",
 			data: {
@@ -6273,7 +6292,7 @@ const Mapbox = forwardRef((e, c) => {
 				"line-width": 2,
 				"line-dasharray": [4, 4]
 			}
-		}), Ft(e, "circle-preview-measure-source", "circle-preview-measure-label"), e.getSource("circle-preview-radius-source") || (e.addSource("circle-preview-radius-source", {
+		}), Bt(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",
@@ -6290,22 +6309,22 @@ const Mapbox = forwardRef((e, c) => {
 				"line-dasharray": [4, 4]
 			}
 		}))));
-	}, [Ft]), Bt = useCallback((e, t, n = 64) => {
+	}, [Bt]), Gt = 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;
-	}, []), Vt = useCallback((e, t) => {
+	}, []), Kt = 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)));
-	}, []), Ht = useCallback((e, t) => {
-		let n = R.current;
+	}, []), qt = useCallback((e, t) => {
+		let n = L.current;
 		if (!n) return;
 		let r = n.getSource("circle-preview-source");
 		if (!r) return;
-		let i = Vt(e, t), a = Bt(e, i);
+		let i = Kt(e, t), a = Gt(e, i);
 		r.setData({
 			type: "Feature",
 			geometry: {
@@ -6314,9 +6333,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 = zn.current, f = [], p = [];
+		let d = Vn.current, f = [], p = [];
 		if (d?.showArea) {
 			let t = Math.PI * i * i;
 			f.push({
@@ -6329,7 +6348,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: {
@@ -6356,8 +6375,8 @@ const Mapbox = forwardRef((e, c) => {
 			type: "FeatureCollection",
 			features: p
 		});
-	}, [Vt, Bt]), Ut = useCallback(() => {
-		let e = R.current;
+	}, [Kt, Gt]), Jt = useCallback(() => {
+		let e = L.current;
 		if (!e) return;
 		let t = e.getSource("circle-preview-source");
 		t && t.setData({
@@ -6374,10 +6393,10 @@ const Mapbox = forwardRef((e, c) => {
 			type: "FeatureCollection",
 			features: []
 		});
-	}, []), Wt = useCallback(() => {
-		ut.current = null, Ut();
-	}, [Ut]), Gt = useCallback(() => {
-		let e = R.current;
+	}, []), Yt = useCallback(() => {
+		dt.current = null, Jt();
+	}, [Jt]), Xt = useCallback(() => {
+		let e = L.current;
 		e && (e.getSource("polygon-preview-source") || (e.addSource("polygon-preview-source", {
 			type: "geojson",
 			data: {
@@ -6417,9 +6436,9 @@ const Mapbox = forwardRef((e, c) => {
 				"circle-stroke-color": "#ffffff",
 				"circle-stroke-width": 2
 			}
-		}), Ft(e, "polygon-preview-measure-source", "polygon-preview-measure-label")));
-	}, [Ft]), Kt = useCallback((e, t) => {
-		let n = R.current;
+		}), Bt(e, "polygon-preview-measure-source", "polygon-preview-measure-label")));
+	}, [Bt]), Zt = useCallback((e, t) => {
+		let n = L.current;
 		if (!n) return;
 		let r = n.getSource("polygon-preview-source"), i = n.getSource("polygon-vertices-source");
 		if (!r || !i) return;
@@ -6456,11 +6475,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 = zn.current, t = [];
+			let e = Vn.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];
@@ -6502,8 +6521,8 @@ const Mapbox = forwardRef((e, c) => {
 				features: t
 			});
 		}
-	}, []), qt = useCallback(() => {
-		let e = R.current;
+	}, []), Qt = useCallback(() => {
+		let e = L.current;
 		if (!e) return;
 		let t = e.getSource("polygon-preview-source");
 		t && t.setData({
@@ -6520,10 +6539,10 @@ const Mapbox = forwardRef((e, c) => {
 			type: "FeatureCollection",
 			features: []
 		});
-	}, []), Jt = useCallback(() => {
-		dt.current = [], qt();
-	}, [qt]), Yt = useCallback(() => {
-		let e = R.current;
+	}, []), $t = useCallback(() => {
+		ft.current = [], Qt();
+	}, [Qt]), en = useCallback(() => {
+		let e = L.current;
 		e && (e.getSource("square-preview-source") || (e.addSource("square-preview-source", {
 			type: "geojson",
 			data: {
@@ -6547,8 +6566,8 @@ const Mapbox = forwardRef((e, c) => {
 				"line-width": 2,
 				"line-dasharray": [4, 4]
 			}
-		}), Ft(e, "square-preview-measure-source", "square-preview-measure-label")));
-	}, [Ft]), Xt = useCallback((e, t) => {
+		}), Bt(e, "square-preview-measure-source", "square-preview-measure-label")));
+	}, [Bt]), tn = 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],
@@ -6557,12 +6576,12 @@ const Mapbox = forwardRef((e, c) => {
 			[n - s, r - o],
 			[n - s, r + o]
 		];
-	}, []), Zt = useCallback((e, t) => {
-		let n = R.current;
+	}, []), nn = useCallback((e, t) => {
+		let n = L.current;
 		if (!n) return;
 		let r = n.getSource("square-preview-source");
 		if (!r) return;
-		let i = Vt(e, t) * 2, a = Xt(e, i);
+		let i = Kt(e, t) * 2, a = tn(e, i);
 		r.setData({
 			type: "Feature",
 			geometry: {
@@ -6571,11 +6590,11 @@ const Mapbox = forwardRef((e, c) => {
 			},
 			properties: {}
 		});
-		let o = ft.current, s = o?.strokeColor ?? "#3388ff", c = o?.strokeWidth ?? 2, l = o?.fillColor ?? "#3388ff", u = o?.fillOpacity ?? .1;
+		let o = pt.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 = zn.current, n = [];
+			let t = Vn.current, n = [];
 			if (t?.showArea && n.push({
 				type: "Feature",
 				geometry: {
@@ -6599,8 +6618,8 @@ const Mapbox = forwardRef((e, c) => {
 				features: n
 			});
 		}
-	}, [Vt, Xt]), Qt = useCallback(() => {
-		let e = R.current;
+	}, [Kt, tn]), rn = useCallback(() => {
+		let e = L.current;
 		if (!e) return;
 		let t = e.getSource("square-preview-source");
 		t && t.setData({
@@ -6612,10 +6631,10 @@ const Mapbox = forwardRef((e, c) => {
 			type: "FeatureCollection",
 			features: []
 		});
-	}, []), $t = useCallback(() => {
-		pt.current = null, Qt();
-	}, [Qt]), en = useCallback(() => {
-		let e = R.current;
+	}, []), an = useCallback(() => {
+		mt.current = null, rn();
+	}, [rn]), on = useCallback(() => {
+		let e = L.current;
 		e && (e.getSource("polyline-preview-source") || (e.addSource("polyline-preview-source", {
 			type: "geojson",
 			data: {
@@ -6647,9 +6666,9 @@ const Mapbox = forwardRef((e, c) => {
 				"circle-stroke-color": "#ffffff",
 				"circle-stroke-width": 2
 			}
-		}), Ft(e, "polyline-preview-measure-source", "polyline-preview-measure-label")));
-	}, [Ft]), tn = useCallback((e, t) => {
-		let n = R.current;
+		}), Bt(e, "polyline-preview-measure-source", "polyline-preview-measure-label")));
+	}, [Bt]), sn = useCallback((e, t) => {
+		let n = L.current;
 		if (!n) return;
 		let r = n.getSource("polyline-preview-source"), i = n.getSource("polyline-vertices-source");
 		if (!r || !i) return;
@@ -6675,11 +6694,11 @@ const Mapbox = forwardRef((e, c) => {
 				properties: {}
 			}))
 		});
-		let o = mt.current, s = o?.strokeColor ?? "#3388ff", c = o?.strokeWidth ?? 2;
+		let o = ht.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 = zn.current, t = [];
+			let e = Vn.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({
@@ -6696,8 +6715,8 @@ const Mapbox = forwardRef((e, c) => {
 				features: t
 			});
 		}
-	}, []), nn = useCallback(() => {
-		let e = R.current;
+	}, []), cn = useCallback(() => {
+		let e = L.current;
 		if (!e) return;
 		let t = e.getSource("polyline-preview-source");
 		t && t.setData({
@@ -6715,163 +6734,163 @@ const Mapbox = forwardRef((e, c) => {
 			features: []
 		});
 	}, []), Z = useCallback(() => {
-		ht.current = [], nn();
-	}, [nn]), rn = useCallback((e) => {
-		H(e), Pt(e), e ? (U("marker"), X(), Wt(), Jt(), $t(), Z()) : U(null);
+		gt.current = [], cn();
+	}, [cn]), ln = useCallback((e) => {
+		H(e), zt(e), e ? (U("marker"), X(), Yt(), $t(), an(), Z()) : U(null);
 	}, [
-		Pt,
+		zt,
 		X,
-		Wt,
-		Jt,
+		Yt,
 		$t,
+		an,
 		Z
-	]), an = useCallback((e) => {
+	]), un = useCallback((e) => {
 		if (U(e), e === "rectangle") {
-			H(null), Y(), Wt(), Jt(), $t(), Z();
-			let e = R.current;
+			H(null), Y(), Yt(), $t(), an(), Z();
+			let e = L.current;
 			e && (e.getCanvas().style.cursor = "crosshair");
 		} else if (e === "circle") {
-			H(null), Y(), X(), Jt(), $t(), Z();
-			let e = R.current;
+			H(null), Y(), X(), $t(), an(), Z();
+			let e = L.current;
 			e && (e.getCanvas().style.cursor = "crosshair");
 		} else if (e === "polygon") {
-			H(null), Y(), X(), Wt(), $t(), Z();
-			let e = R.current;
+			H(null), Y(), X(), Yt(), an(), Z();
+			let e = L.current;
 			e && (e.getCanvas().style.cursor = "crosshair");
 		} else if (e === "square") {
-			H(null), Y(), X(), Wt(), Jt(), Z();
-			let e = R.current;
+			H(null), Y(), X(), Yt(), $t(), Z();
+			let e = L.current;
 			e && (e.getCanvas().style.cursor = "crosshair");
 		} else if (e === "polyline") {
-			H(null), Y(), X(), Wt(), Jt(), $t();
-			let e = R.current;
+			H(null), Y(), X(), Yt(), $t(), an();
+			let e = L.current;
 			e && (e.getCanvas().style.cursor = "crosshair");
-		} else e === "marker" ? (X(), Wt(), Jt(), $t(), Z()) : (H(null), Y(), X(), Wt(), Jt(), $t(), Z());
+		} else e === "marker" ? (X(), Yt(), $t(), an(), Z()) : (H(null), Y(), X(), Yt(), $t(), an(), Z());
 	}, [
 		Y,
 		X,
-		Wt,
-		Jt,
+		Yt,
 		$t,
+		an,
 		Z
-	]), on = useCallback((e) => {
+	]), dn = useCallback((e) => {
 		if (e !== "picker") {
-			let e = y.value && isFinite(y.value.lng) && isFinite(y.value.lat), t = y.showMarker !== !1;
-			(!e || !t) && Mt(), rt(null);
+			let e = J.value && isFinite(J.value.lng) && isFinite(J.value.lat), t = J.showMarker !== !1;
+			(!e || !t) && Lt(), rt(null);
 		}
 		e !== "edit" && (H(null), U(null), X(), Z(), Y()), tt(e);
 	}, [
-		Mt,
+		Lt,
 		Y,
 		X,
 		Z
-	]), sn = useCallback(() => et, [et]), cn = useCallback(() => nt, [nt]), ln = useCallback(() => {
-		Mt(), rt(null);
-	}, [Mt]), un = useRef(null), dn = useRef("display"), fn = useRef({}), pn = useCallback((e = {}) => (un.current &&= (un.current(null), null), new Promise((t) => {
-		un.current = t, dn.current = Pn.current, fn.current = e, on("picker");
-	})), [on]);
+	]), fn = useCallback(() => V, [V]), pn = useCallback(() => nt, [nt]), mn = useCallback(() => {
+		Lt(), rt(null);
+	}, [Lt]), hn = useCallback((e = {}) => (Mt.current &&= (Mt.current(null), null), new Promise((t) => {
+		Mt.current = t, Nt.current = In.current, Ft(e), dn("picker");
+	})), [dn]);
 	useEffect(() => {
-		if (!Qe) return;
-		let e = y.value;
+		if (!$e) return;
+		let e = J.value;
 		if (e && isFinite(e.lng) && isFinite(e.lat)) {
 			let t = [e.lng, e.lat];
-			rt(e), jt(t);
+			rt(e), It(t);
 		}
 	}, [
-		y.value,
-		jt,
-		Qe
+		J.value,
+		It,
+		$e
 	]);
-	let mn = (e) => "mode" in e, hn = useCallback((e, t = !0) => {
-		if (tt("edit"), t && (Mt(), rt(null)), W.current = !0, mn(e)) {
-			if (e.mode === "marker") e.markerStyle ? (lt.current = e.markerStyle, G.current = null, K.current = null, q.current = null, ft.current = null, mt.current = null, H(null), U("marker"), e.markerStyle.src && e.markerStyle.width ? Pt({
+	let gn = (e) => "mode" in e, _n = useCallback((e, t = !0) => {
+		if (tt("edit"), t && (Lt(), rt(null)), W.current = !0, gn(e)) {
+			if (e.mode === "marker") e.markerStyle ? (ut.current = e.markerStyle, lt.current = null, G.current = null, K.current = null, pt.current = null, ht.current = null, H(null), U("marker"), e.markerStyle.src && e.markerStyle.width ? zt({
 				id: "custom",
 				name: e.markerStyle.name || "Marker",
 				icon: e.markerStyle.src,
 				width: e.markerStyle.width
-			}) : Y()) : e.template && (lt.current = null, G.current = null, K.current = null, q.current = null, ft.current = null, mt.current = null, H(e.template), U("marker"), Pt(e.template));
+			}) : Y()) : e.template && (ut.current = null, lt.current = null, G.current = null, K.current = null, pt.current = null, ht.current = null, H(e.template), U("marker"), zt(e.template));
 			else if (e.mode === "rectangle") {
-				G.current = e.rectangleStyle || null, lt.current = null, K.current = null, q.current = null, ft.current = null, mt.current = null, H(null), U("rectangle"), Y();
-				let t = R.current;
+				lt.current = e.rectangleStyle || null, ut.current = null, G.current = null, K.current = null, pt.current = null, ht.current = null, H(null), U("rectangle"), Y();
+				let t = L.current;
 				t && (t.getCanvas().style.cursor = "crosshair");
 			} else if (e.mode === "circle") {
-				K.current = e.circleStyle || null, G.current = null, lt.current = null, q.current = null, ft.current = null, mt.current = null, H(null), U("circle"), Y();
-				let t = R.current;
+				G.current = e.circleStyle || null, lt.current = null, ut.current = null, K.current = null, pt.current = null, ht.current = null, H(null), U("circle"), Y();
+				let t = L.current;
 				t && (t.getCanvas().style.cursor = "crosshair");
 			} else if (e.mode === "polygon") {
-				q.current = e.polygonStyle || null, G.current = null, lt.current = null, K.current = null, ft.current = null, mt.current = null, H(null), U("polygon"), Y();
-				let t = R.current;
+				K.current = e.polygonStyle || null, lt.current = null, ut.current = null, G.current = null, pt.current = null, ht.current = null, H(null), U("polygon"), Y();
+				let t = L.current;
 				t && (t.getCanvas().style.cursor = "crosshair");
 			} else if (e.mode === "square") {
-				ft.current = e.squareStyle || null, G.current = null, lt.current = null, K.current = null, q.current = null, mt.current = null, H(null), U("square"), Y();
-				let t = R.current;
+				pt.current = e.squareStyle || null, lt.current = null, ut.current = null, G.current = null, K.current = null, ht.current = null, H(null), U("square"), Y();
+				let t = L.current;
 				t && (t.getCanvas().style.cursor = "crosshair");
 			} else if (e.mode === "polyline") {
-				mt.current = e.polylineStyle || null, G.current = null, lt.current = null, K.current = null, q.current = null, ft.current = null, H(null), U("polyline"), Y();
-				let t = R.current;
+				ht.current = e.polylineStyle || null, lt.current = null, ut.current = null, G.current = null, K.current = null, pt.current = null, H(null), U("polyline"), Y();
+				let t = L.current;
 				t && (t.getCanvas().style.cursor = "crosshair");
 			}
-		} else H(e), U("marker"), Pt(e), G.current = null, lt.current = null, K.current = null, q.current = null, ft.current = null, mt.current = null;
+		} else H(e), U("marker"), zt(e), lt.current = null, ut.current = null, G.current = null, K.current = null, pt.current = null, ht.current = null;
 	}, [
-		Mt,
-		Pt,
+		Lt,
+		zt,
 		Y
 	]);
 	useImperativeHandle(c, () => ({
-		startAnimation: xt,
-		stopAnimation: St,
-		toggleAnimation: Ct,
-		getMap: () => R.current,
-		openPopup: (e) => Tt(e, "programmatic"),
-		closePopup: Et,
-		closeAllPopups: Dt,
-		isPopupOpen: Ot,
-		toggleUnitTrajectory: wt,
-		flyTo: kt,
-		flyToEntities: At,
-		getMode: sn,
-		setMode: on,
-		getPickedLocation: cn,
-		clearPickedLocation: ln,
-		startDrawing: hn,
-		getRenderer: (e) => z.current.get(e),
+		startAnimation: St,
+		stopAnimation: Ct,
+		toggleAnimation: wt,
+		getMap: () => L.current,
+		openPopup: (e) => Et(e, "programmatic"),
+		closePopup: Dt,
+		closeAllPopups: Ot,
+		isPopupOpen: kt,
+		toggleUnitTrajectory: Tt,
+		flyTo: At,
+		flyToEntities: jt,
+		getMode: fn,
+		setMode: dn,
+		getPickedLocation: pn,
+		clearPickedLocation: mn,
+		startDrawing: _n,
+		getRenderer: (e) => R.current.get(e),
 		setEditingEntities: (e) => {
-			for (let t of bt.current) e.map(String).includes(String(t)) || z.current.get(t)?.setEditing?.(!1);
-			for (let t of e) z.current.get(t)?.setEditing?.(!0);
-			J.current &&= (z.current.get(J.current.entityId)?.cancelEditPreview?.(), null), yt(e);
+			for (let t of xt.current) e.map(String).includes(String(t)) || R.current.get(t)?.setEditing?.(!1);
+			for (let t of e) R.current.get(t)?.setEditing?.(!0);
+			q.current &&= (R.current.get(q.current.entityId)?.cancelEditPreview?.(), null), bt(e);
 		},
-		getEditingEntities: () => bt.current,
-		startPicking: pn,
+		getEditingEntities: () => xt.current,
+		startPicking: hn,
 		startRoutePlanning: (e) => {
-			Ve.current?.startPlanning(e);
+			He.current?.startPlanning(e);
 		},
-		getRoadHighlightControl: () => He.current
+		getRoadHighlightControl: () => Ue.current
 	}), [
-		xt,
 		St,
 		Ct,
-		Tt,
+		wt,
 		Et,
 		Dt,
 		Ot,
-		wt,
 		kt,
+		Tt,
 		At,
-		sn,
-		on,
-		cn,
-		ln,
-		hn,
-		pn
+		jt,
+		fn,
+		dn,
+		pn,
+		mn,
+		_n,
+		hn
 	]);
-	let gn = useCallback(() => {
-		let e = R.current;
+	let vn = useCallback(() => {
+		let e = L.current;
 		if (!e) return;
-		let t = new Set(T.map((e) => e.id)), n = new Set(z.current.keys());
-		for (let e of n) t.has(e) || (z.current.get(e)?.destroy(), z.current.delete(e));
+		let t = new Set(T.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(E.map(String));
 		for (let t of T) {
-			let n = applyEntityConfig(t, D), i = z.current.get(n.id);
+			let n = applyEntityConfig(t, D), i = R.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);
@@ -6880,23 +6899,23 @@ 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, O, k, M, N);
-				z.current.set(n.id, t), t.setSelected(r.has(String(n.id)));
+				let t = new CanvasCircleRenderer(e, n, O, k, j, M);
+				R.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, O, k, M, N);
-				z.current.set(n.id, t), t.setSelected(r.has(String(n.id)));
+				let t = new CircleRenderer(e, n, O, k, j, M);
+				R.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, 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, M, P) : n.type === "circle" ? t = n.fillType === "radial-gradient" ? new CanvasCircleRenderer(e, n, O, k, M, N) : new CircleRenderer(e, n, O, k, M, N) : n.type === "square" ? t = new SquareRenderer(e, n, O, k, M, P) : n.type === "rectangle" ? t = new RectangleRenderer(e, n, O, k, M, P) : n.type === "polyline" && (t = new PolylineRenderer(e, n, O, k, P)), t && (z.current.set(n.id, t), t.setSelected(r.has(String(n.id))), bt.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, j, N) : n.type === "circle" ? t = n.fillType === "radial-gradient" ? new CanvasCircleRenderer(e, n, O, k, j, M) : new CircleRenderer(e, n, O, k, j, M) : n.type === "square" ? t = new SquareRenderer(e, n, O, k, j, N) : n.type === "rectangle" ? t = new RectangleRenderer(e, n, O, k, j, N) : n.type === "polyline" && (t = new PolylineRenderer(e, n, O, k, N)), t && (R.current.set(n.id, t), t.setSelected(r.has(String(n.id))), xt.current.map(String).includes(String(n.id)) && t.setEditing?.(!0));
 			}
 		}
-		for (let e of bt.current) {
-			let t = z.current.get(e);
+		for (let e of xt.current) {
+			let t = R.current.get(e);
 			t && t.setEditing?.(!0);
 		}
 	}, [
@@ -6905,13 +6924,13 @@ const Mapbox = forwardRef((e, c) => {
 		D,
 		O,
 		k,
+		j,
 		M,
-		N,
-		P
-	]), _n = useCallback(() => {
-		for (let e of z.current.values()) e.destroy();
-		z.current.clear();
-	}, []), vn = useCallback((e) => {
+		N
+	]), yn = useCallback(() => {
+		for (let e of R.current.values()) e.destroy();
+		R.current.clear();
+	}, []), bn = useCallback((e) => {
 		let t = e.getStyle();
 		if (!t?.layers) return;
 		let n = [
@@ -6926,10 +6945,10 @@ const Mapbox = forwardRef((e, c) => {
 			"marker-"
 		];
 		for (let e of t.layers) if (n.some((t) => e.id.startsWith(t))) return e.id;
-	}, []), yn = useCallback((e) => {
+	}, []), xn = useCallback((e) => {
 		let t = C, 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;
-	}, [C]), bn = useCallback((e, t) => {
+	}, [C]), Sn = useCallback((e, t) => {
 		let n = `base-layer-source-${t.id}`, r = `base-layer-${t.id}`, i = {
 			type: "raster",
 			tiles: [t.url],
@@ -6939,19 +6958,19 @@ 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 = vn(e);
+		let a = bn(e);
 		e.addLayer({
 			id: r,
 			type: "raster",
 			source: n,
-			paint: yn(t),
+			paint: xn(t),
 			layout: { visibility: t.visible === !1 ? "none" : "visible" }
 		}, a);
-	}, [vn, yn]), xn = useCallback(async (e, t) => {
+	}, [bn, xn]), Cn = 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 = vn(e);
+			if (!We.current.has(t.id)) return;
+			let a = n.format === "pbf" || n.vector_layers, o = bn(e);
 			if (a) {
 				let t = {
 					type: "vector",
@@ -6972,21 +6991,21 @@ const Mapbox = forwardRef((e, c) => {
 				id: i,
 				type: "raster",
 				source: r,
-				paint: yn(t),
+				paint: xn(t),
 				layout: { visibility: t.visible === !1 ? "none" : "visible" }
 			}, o);
 		} catch (e) {
 			console.error(`Failed to load TileJSON from ${t.url}:`, e);
 		}
-	}, [vn, yn]), Sn = useCallback(async (e, t) => {
+	}, [bn, xn]), wn = 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 = vn(e);
+			let r = bn(e);
 			if (n.layers) for (let i of n.layers) {
 				let n = `base-layer-${t.id}-${i.id}`;
 				if (e.getLayer(n)) continue;
@@ -6997,7 +7016,7 @@ const Mapbox = forwardRef((e, c) => {
 				};
 				i.type === "raster" && (a.paint = {
 					...a.paint,
-					...yn(t)
+					...xn(t)
 				}), t.visible === !1 && (a.layout = {
 					...a.layout,
 					visibility: "none"
@@ -7010,50 +7029,50 @@ const Mapbox = forwardRef((e, c) => {
 		} catch (e) {
 			console.error(`Failed to load Style JSON from ${t.url}:`, e);
 		}
-	}, [vn, yn]), Cn = useCallback((e, t) => {
+	}, [bn, xn]), Tn = 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);
-	}, []), wn = useCallback((e) => {
-		let t = R.current;
+	}, []), En = useCallback((e) => {
+		let t = L.current;
 		if (!t) return;
-		let n = new Set(e.map((e) => e.id)), r = Ue.current;
-		for (let e of r) n.has(e) || (Cn(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) || (Tn(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 = yn(n);
+				let r = xn(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":
-				bn(t, n);
+				Sn(t, n);
 				break;
 			case "tilejson":
-				xn(t, n);
+				Cn(t, n);
 				break;
 			case "style":
-				Sn(t, n);
+				wn(t, n);
 				break;
 			default: {
 				let e = n;
-				e.url && bn(t, {
+				e.url && Sn(t, {
 					...e,
 					type: "raster"
 				});
 			}
 		}
 	}, [
-		bn,
-		xn,
 		Sn,
 		Cn,
-		yn
-	]), Tn = useCallback((e) => {
+		wn,
+		Tn,
+		xn
+	]), Dn = useCallback((e) => {
 		let t = e;
 		for (; t;) {
 			let e = t.getAttribute?.("data-entity-id");
@@ -7061,129 +7080,129 @@ const Mapbox = forwardRef((e, c) => {
 			t = t.parentElement;
 		}
 		return null;
-	}, []), En = useCallback((e) => {
+	}, []), On = useCallback((e) => {
 		let t = [e.lngLat.lng, e.lngLat.lat], n = {
 			x: e.point.x,
 			y: e.point.y
-		}, r = Pn.current;
+		}, r = In.current;
 		if (r === "picker") {
 			let e = {
 				lng: t[0],
 				lat: t[1]
 			};
-			rt(e), jt(t), Fn.current?.(e), un.current && (un.current(e), un.current = null, Mt(), rt(null), on(dn.current));
+			rt(e), It(t), Ln.current?.(e), Mt.current && (Mt.current(e), Mt.current = null, Ft({}), Lt(), rt(null), dn(Nt.current));
 			return;
 		}
-		if (_t.current) return;
+		if (vt.current) return;
 		if (r === "edit") {
-			let e = Ln.current;
+			let e = zn.current;
 			if (e === "rectangle") {
-				let e = Rn.current;
+				let e = Bn.current;
 				if (!e) ct(t);
 				else {
-					let n = G.current, r = applyEntityConfig({
+					let n = lt.current, r = applyEntityConfig({
 						...n,
-						id: n?.id ?? Nt(),
+						id: n?.id ?? Rt(),
 						type: "rectangle",
 						bounds: [e, t]
 					}, D);
-					Rt();
-					let i = R.current;
-					if (i && !z.current.has(r.id)) {
-						let e = new RectangleRenderer(i, r, O, k, M, P);
-						z.current.set(r.id, e);
+					Ut();
+					let i = L.current;
+					if (i && !R.current.has(r.id)) {
+						let e = new RectangleRenderer(i, r, O, k, j, N);
+						R.current.set(r.id, e);
 					}
-					Q.current.onRectangleAdd?.(r), ct(null), G.current = null, W.current && (W.current = !1, U(null), i && (i.getCanvas().style.cursor = ""));
+					Q.current.onRectangleAdd?.(r), ct(null), lt.current = null, W.current && (W.current = !1, U(null), i && (i.getCanvas().style.cursor = ""));
 				}
 				return;
 			}
 			if (e === "circle") {
-				let e = ut.current;
-				if (!e) ut.current = { center: t };
+				let e = dt.current;
+				if (!e) dt.current = { center: t };
 				else {
-					let n = Vt(e.center, t), r = K.current, i = applyEntityConfig({
+					let n = Kt(e.center, t), r = G.current, i = applyEntityConfig({
 						...r,
-						id: r?.id ?? Nt(),
+						id: r?.id ?? Rt(),
 						type: "circle",
 						center: e.center,
 						radius: n
 					}, D);
-					Ut();
-					let a = R.current;
-					if (a && !z.current.has(i.id)) {
-						let e = new CircleRenderer(a, i, O, k, M, N);
-						z.current.set(i.id, e);
+					Jt();
+					let a = L.current;
+					if (a && !R.current.has(i.id)) {
+						let e = new CircleRenderer(a, i, O, k, j, M);
+						R.current.set(i.id, e);
 					}
-					Q.current.onCircleAdd?.(i), ut.current = null, K.current = null, W.current && (W.current = !1, U(null), a && (a.getCanvas().style.cursor = ""));
+					Q.current.onCircleAdd?.(i), dt.current = null, G.current = null, W.current && (W.current = !1, U(null), a && (a.getCanvas().style.cursor = ""));
 				}
 				return;
 			}
 			if (e === "polygon") {
-				let e = dt.current;
+				let e = ft.current;
 				if (e.length >= 3) {
 					let n = e[0];
-					if (Vt(n, t) < 20) {
-						let t = q.current, n = applyEntityConfig({
+					if (Kt(n, t) < 20) {
+						let t = K.current, n = applyEntityConfig({
 							...t,
-							id: t?.id ?? Nt(),
+							id: t?.id ?? Rt(),
 							type: "polygon",
 							coordinates: [...e]
 						}, D);
-						qt();
-						let r = R.current;
-						if (r && !z.current.has(n.id)) {
-							let e = new PolygonRenderer(r, n, O, k, M, P);
-							z.current.set(n.id, e);
+						Qt();
+						let r = L.current;
+						if (r && !R.current.has(n.id)) {
+							let e = new PolygonRenderer(r, n, O, k, j, N);
+							R.current.set(n.id, e);
 						}
-						Q.current.onPolygonAdd?.(n), dt.current = [], q.current = null, W.current && (W.current = !1, U(null), r && (r.getCanvas().style.cursor = ""));
+						Q.current.onPolygonAdd?.(n), ft.current = [], K.current = null, W.current && (W.current = !1, U(null), r && (r.getCanvas().style.cursor = ""));
 						return;
 					}
 				}
-				dt.current = [...e, t];
+				ft.current = [...e, t];
 				return;
 			}
 			if (e === "square") {
-				let e = pt.current;
-				if (!e) pt.current = { center: t };
+				let e = mt.current;
+				if (!e) mt.current = { center: t };
 				else {
-					let n = Vt(e.center, t) * 2, r = ft.current, i = applyEntityConfig({
+					let n = Kt(e.center, t) * 2, r = pt.current, i = applyEntityConfig({
 						...r,
-						id: r?.id ?? Nt(),
+						id: r?.id ?? Rt(),
 						type: "square",
 						center: e.center,
 						length: n
 					}, D);
-					Qt();
-					let a = R.current;
-					if (a && !z.current.has(i.id)) {
-						let e = new SquareRenderer(a, i, O, k, M, P);
-						z.current.set(i.id, e);
+					rn();
+					let a = L.current;
+					if (a && !R.current.has(i.id)) {
+						let e = new SquareRenderer(a, i, O, k, j, N);
+						R.current.set(i.id, e);
 					}
-					Q.current.onSquareAdd?.(i), pt.current = null, ft.current = null, W.current && (W.current = !1, U(null), a && (a.getCanvas().style.cursor = ""));
+					Q.current.onSquareAdd?.(i), mt.current = null, pt.current = null, W.current && (W.current = !1, U(null), a && (a.getCanvas().style.cursor = ""));
 				}
 				return;
 			}
 			if (e === "polyline") {
-				ht.current = [...ht.current, t];
+				gt.current = [...gt.current, t];
 				return;
 			}
-			let n = lt.current;
+			let n = ut.current;
 			if (n && n.src && n.width) {
 				let e = {
 					...n,
-					id: n.id ?? Nt(),
+					id: n.id ?? Rt(),
 					type: "marker",
 					center: t,
 					src: n.src,
 					width: n.width
 				};
-				Q.current.onMarkerAdd?.(e), H(null), U(null), Y(), lt.current = null, W.current = !1;
+				Q.current.onMarkerAdd?.(e), H(null), U(null), Y(), ut.current = null, W.current = !1;
 				return;
 			}
-			let r = In.current;
+			let r = Rn.current;
 			if (r) {
 				let e = {
-					id: Nt(),
+					id: Rt(),
 					type: "marker",
 					name: r.name,
 					center: t,
@@ -7194,25 +7213,25 @@ const Mapbox = forwardRef((e, c) => {
 				return;
 			}
 		}
-		if (bt.current.length > 0) {
-			let e = R.current?.getZoom() ?? 12;
-			if (J.current) {
-				let { entityId: e, activeHandle: n } = J.current, r = z.current.get(e);
+		if (xt.current.length > 0) {
+			let e = L.current?.getZoom() ?? 12;
+			if (q.current) {
+				let { entityId: e, activeHandle: n } = q.current, r = R.current.get(e);
 				if (r?.applyHandleMove) {
 					let e = r.applyHandleMove(n, t);
 					Q.current.onEntityEdit?.(e);
 				}
-				J.current = null;
+				q.current = null;
 				return;
 			}
-			for (let n of bt.current) {
-				let r = z.current.get(n);
+			for (let n of xt.current) {
+				let r = R.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);
-						Q.current.onEntityEdit?.(e), J.current = {
+						Q.current.onEntityEdit?.(e), q.current = {
 							entityId: n,
 							activeHandle: {
 								type: "vertex",
@@ -7220,7 +7239,7 @@ const Mapbox = forwardRef((e, c) => {
 								position: i.position
 							}
 						};
-					} else J.current = {
+					} else q.current = {
 						entityId: n,
 						activeHandle: i
 					};
@@ -7228,104 +7247,104 @@ const Mapbox = forwardRef((e, c) => {
 				}
 			}
 		}
-		let i = jn.current, a = Mn.current, o = Nn.current, s = Tn(e.originalEvent.target);
+		let i = Nn.current, a = Pn.current, o = Fn.current, s = Dn(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 ?? Ne?.(e);
-					t && mergePopupConfig(e.popup, L, t).trigger === "click" && o(s, "click", n);
+					let t = e.popup.content ?? Pe?.(e);
+					t && mergePopupConfig(e.popup, I, t).trigger === "click" && o(s, "click", n);
 				}
 				return;
 			}
 		}
-		for (let [t, r] of z.current) {
+		for (let [t, r] of R.current) {
 			let s = r.getLabelLayerId();
-			if (s && R.current?.getLayer(s) && R.current.queryRenderedFeatures(e.point, { layers: [s] }).length > 0) {
+			if (s && L.current?.getLayer(s) && L.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 ?? Ne?.(e);
-						r && mergePopupConfig(e.popup, L, r).trigger === "click" && o(t, "click", n);
+						let r = e.popup.content ?? Pe?.(e);
+						r && mergePopupConfig(e.popup, I, r).trigger === "click" && o(t, "click", n);
 					}
 					return;
 				}
 			}
 		}
-		for (let [e, r] of z.current) if (r.isPointInEntity(t)) {
+		for (let [e, r] of R.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 ?? Ne?.(t);
-					r && mergePopupConfig(t.popup, L, r).trigger === "click" && o(e, "click", n);
+					let r = t.popup.content ?? Pe?.(t);
+					r && mergePopupConfig(t.popup, I, r).trigger === "click" && o(e, "click", n);
 				}
 				return;
 			}
 		}
 	}, [
-		L,
-		Ne,
-		Tn
-	]), Dn = useCallback((e) => {
+		I,
+		Pe,
+		Dn
+	]), kn = useCallback((e) => {
 		let t = [e.lngLat.lng, e.lngLat.lat];
-		if (J.current) {
-			let { entityId: e, activeHandle: n } = J.current;
-			z.current.get(e)?.updateEditPreview?.(n, t);
+		if (q.current) {
+			let { entityId: e, activeHandle: n } = q.current;
+			R.current.get(e)?.updateEditPreview?.(n, t);
 			return;
 		}
-		let n = Ln.current, r = Rn.current;
-		n === "rectangle" && r && Lt(r, t);
-		let i = ut.current;
-		n === "circle" && i && Ht(i.center, t);
-		let a = dt.current;
-		n === "polygon" && a.length > 0 && Kt(a, t);
-		let o = pt.current;
-		n === "square" && o && Zt(o.center, t);
-		let s = ht.current;
-		n === "polyline" && s.length > 0 && tn(s, t);
-		let c = jn.current, l = Nn.current;
-		for (let [e, n] of z.current) if (n.isPointInEntity(t)) {
+		let n = zn.current, r = Bn.current;
+		n === "rectangle" && r && Ht(r, t);
+		let i = dt.current;
+		n === "circle" && i && qt(i.center, t);
+		let a = ft.current;
+		n === "polygon" && a.length > 0 && Zt(a, t);
+		let o = mt.current;
+		n === "square" && o && nn(o.center, t);
+		let s = gt.current;
+		n === "polyline" && s.length > 0 && sn(s, t);
+		let c = Nn.current, l = Fn.current;
+		for (let [e, n] of R.current) if (n.isPointInEntity(t)) {
 			let t = c.find((t) => t.id === e);
 			if (!t?.popup) continue;
-			let n = t.popup.content ?? Ne?.(t);
+			let n = t.popup.content ?? Pe?.(t);
 			if (!n) continue;
-			let r = mergePopupConfig(t.popup, L, n);
+			let r = mergePopupConfig(t.popup, I, 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), V?.openedBy === "hover") {
-			let e = z.current.get(V.entityId);
-			e && !e.isPointInEntity(t) && Et(V.entityId);
+		if (Je.current &&= (clearTimeout(Je.current), null), B?.openedBy === "hover") {
+			let e = R.current.get(B.entityId);
+			e && !e.isPointInEntity(t) && Dt(B.entityId);
 		}
 	}, [
-		L,
-		Ne,
-		V,
-		Et,
-		Lt,
+		I,
+		Pe,
+		B,
+		Dt,
 		Ht,
-		Kt,
+		qt,
 		Zt,
-		tn
-	]), On = useCallback((e) => {
-		if (e.preventDefault(), un.current) {
-			un.current(null), un.current = null, Mt(), rt(null), on(dn.current);
+		nn,
+		sn
+	]), An = useCallback((e) => {
+		if (e.preventDefault(), Mt.current) {
+			Mt.current(null), Mt.current = null, Ft({}), Lt(), rt(null), dn(Nt.current);
 			return;
 		}
-		if (_t.current) return;
-		if (bt.current.length > 0) {
+		if (vt.current) return;
+		if (xt.current.length > 0) {
 			let t = [e.lngLat.lng, e.lngLat.lat];
-			if (J.current) {
-				z.current.get(J.current.entityId)?.cancelEditPreview?.(), J.current = null;
+			if (q.current) {
+				R.current.get(q.current.entityId)?.cancelEditPreview?.(), q.current = null;
 				return;
 			}
-			let n = R.current?.getZoom() ?? 12;
-			for (let e of bt.current) {
-				let r = z.current.get(e);
+			let n = L.current?.getZoom() ?? 12;
+			for (let e of xt.current) {
+				let r = R.current.get(e);
 				if (!r?.getEditHandleAt || !r.deleteVertex) continue;
 				let i = r.getEditHandleAt(t, n);
 				if (i && i.type === "vertex") {
@@ -7335,83 +7354,83 @@ const Mapbox = forwardRef((e, c) => {
 				}
 			}
 		}
-		if (Pn.current !== "edit") return;
-		if (In.current) {
+		if (In.current !== "edit") return;
+		if (Rn.current) {
 			H(null), U(null), Y();
 			return;
 		}
-		let t = Ln.current;
+		let t = zn.current;
 		if (t === "rectangle") {
-			if (Rn.current) ct(null), Rt();
+			if (Bn.current) ct(null), Ut();
 			else {
 				U(null);
-				let e = R.current;
+				let e = L.current;
 				e && (e.getCanvas().style.cursor = "");
 			}
 			return;
 		}
 		if (t === "circle") {
-			if (ut.current) ut.current = null, Ut();
+			if (dt.current) dt.current = null, Jt();
 			else {
 				U(null);
-				let e = R.current;
+				let e = L.current;
 				e && (e.getCanvas().style.cursor = "");
 			}
 			return;
 		}
 		if (t === "polygon") {
-			let e = dt.current;
+			let e = ft.current;
 			if (e.length >= 3) {
-				let t = q.current, n = applyEntityConfig({
+				let t = K.current, n = applyEntityConfig({
 					...t,
-					id: t?.id ?? Nt(),
+					id: t?.id ?? Rt(),
 					type: "polygon",
 					coordinates: [...e]
 				}, D);
-				qt();
-				let r = R.current;
-				if (r && !z.current.has(n.id)) {
-					let e = new PolygonRenderer(r, n, O, k, M, P);
-					z.current.set(n.id, e);
+				Qt();
+				let r = L.current;
+				if (r && !R.current.has(n.id)) {
+					let e = new PolygonRenderer(r, n, O, k, j, N);
+					R.current.set(n.id, e);
 				}
-				Q.current.onPolygonAdd?.(n), dt.current = [], q.current = null, W.current && (W.current = !1, U(null), r && (r.getCanvas().style.cursor = ""));
-			} else if (e.length > 0) dt.current = [], qt();
+				Q.current.onPolygonAdd?.(n), ft.current = [], K.current = null, W.current && (W.current = !1, U(null), r && (r.getCanvas().style.cursor = ""));
+			} else if (e.length > 0) ft.current = [], Qt();
 			else {
 				U(null);
-				let e = R.current;
+				let e = L.current;
 				e && (e.getCanvas().style.cursor = "");
 			}
 			return;
 		}
 		if (t === "square") {
-			if (pt.current) pt.current = null, Qt();
+			if (mt.current) mt.current = null, rn();
 			else {
 				U(null);
-				let e = R.current;
+				let e = L.current;
 				e && (e.getCanvas().style.cursor = "");
 			}
 			return;
 		}
 		if (t === "polyline") {
-			let e = ht.current;
+			let e = gt.current;
 			if (e.length >= 2) {
-				let t = mt.current, n = applyEntityConfig({
+				let t = ht.current, n = applyEntityConfig({
 					...t,
-					id: t?.id ?? Nt(),
+					id: t?.id ?? Rt(),
 					type: "polyline",
 					coordinates: [...e]
 				}, D);
-				nn();
-				let r = R.current;
-				if (r && !z.current.has(n.id)) {
-					let e = new PolylineRenderer(r, n, O, k, P);
-					z.current.set(n.id, e);
+				cn();
+				let r = L.current;
+				if (r && !R.current.has(n.id)) {
+					let e = new PolylineRenderer(r, n, O, k, N);
+					R.current.set(n.id, e);
 				}
-				Q.current.onPolylineAdd?.(n), ht.current = [], mt.current = null, W.current && (W.current = !1, U(null), r && (r.getCanvas().style.cursor = ""));
-			} else if (e.length > 0) ht.current = [], nn();
+				Q.current.onPolylineAdd?.(n), gt.current = [], ht.current = null, W.current && (W.current = !1, U(null), r && (r.getCanvas().style.cursor = ""));
+			} else if (e.length > 0) gt.current = [], cn();
 			else {
 				U(null);
-				let e = R.current;
+				let e = L.current;
 				e && (e.getCanvas().style.cursor = "");
 			}
 			return;
@@ -7419,45 +7438,45 @@ const Mapbox = forwardRef((e, c) => {
 		let n = [e.lngLat.lng, e.lngLat.lat], r = {
 			x: e.point.x,
 			y: e.point.y
-		}, i = jn.current, a = Tn(e.originalEvent.target);
+		}, i = Nn.current, a = Dn(e.originalEvent.target);
 		if (a) {
 			let e = i.find((e) => String(e.id) === a);
 			if (e) {
-				kn(e, r, n);
+				jn(e, r, n);
 				return;
 			}
 		}
-		for (let [t, a] of z.current) {
+		for (let [t, a] of R.current) {
 			let o = a.getLabelLayerId();
-			if (o && R.current?.getLayer(o) && R.current.queryRenderedFeatures(e.point, { layers: [o] }).length > 0) {
+			if (o && L.current?.getLayer(o) && L.current.queryRenderedFeatures(e.point, { layers: [o] }).length > 0) {
 				let e = i.find((e) => e.id === t);
 				if (e) {
-					kn(e, r, n);
+					jn(e, r, n);
 					return;
 				}
 			}
 		}
-		for (let [e, t] of z.current) if (t.isPointInEntity(n)) {
+		for (let [e, t] of R.current) if (t.isPointInEntity(n)) {
 			let t = i.find((t) => t.id === e);
 			if (t) {
-				kn(t, r, n);
+				jn(t, r, n);
 				return;
 			}
 		}
 	}, [
-		Tn,
+		Dn,
 		Y,
-		Rt,
 		Ut,
-		qt,
+		Jt,
 		Qt,
-		nn
-	]), kn = useCallback((e, t, n) => {
-		let r = Be.current?.getBoundingClientRect(), i = r ? {
+		rn,
+		cn
+	]), jn = useCallback((e, t, n) => {
+		let r = Ve.current?.getBoundingClientRect(), i = r ? {
 			x: t.x + r.left,
 			y: t.y + r.top
 		} : t;
-		Ye({
+		Xe({
 			position: i,
 			lngLat: n,
 			items: [{
@@ -7477,8 +7496,8 @@ const Mapbox = forwardRef((e, c) => {
 				}
 			}]
 		});
-	}, []), An = useCallback(() => {
-		Ye(null);
+	}, []), Mn = useCallback(() => {
+		Xe(null);
 	}, []);
 	useEffect(() => {
 		let e = document.createElement("div");
@@ -7489,11 +7508,11 @@ const Mapbox = forwardRef((e, c) => {
 			width: 100%;
 			pointer-events: none;
 			height: 100%;
-			z-index: ${L?.zIndex ?? 1e3};
-		`, document.body.appendChild(e), Ge.current = e, () => {
+			z-index: ${I?.zIndex ?? 1e3};
+		`, document.body.appendChild(e), Ke.current = e, () => {
 			document.body.contains(e) && document.body.removeChild(e);
 		};
-	}, [L?.zIndex]), useEffect(() => {
+	}, [I?.zIndex]), useEffect(() => {
 		let e = document.createElement("div");
 		return e.id = `mapbox-context-menu-container-${Date.now()}`, e.style.cssText = `
 			position: fixed;
@@ -7502,65 +7521,65 @@ const Mapbox = forwardRef((e, c) => {
 			width: 100%;
 			pointer-events: none;
 			height: 100%;
-			z-index: ${(L?.zIndex ?? 1e3) + 100};
-		`, document.body.appendChild(e), Xe.current = e, () => {
+			z-index: ${(I?.zIndex ?? 1e3) + 100};
+		`, document.body.appendChild(e), Ze.current = e, () => {
 			document.body.contains(e) && document.body.removeChild(e);
 		};
-	}, [L?.zIndex]);
-	let jn = useRef(T);
-	jn.current = T;
-	let Mn = useRef(Fe);
-	Mn.current = Fe;
-	let Nn = useRef(Tt);
-	Nn.current = Tt;
-	let Pn = useRef(et);
-	Pn.current = et;
-	let Fn = useRef(b);
-	Fn.current = b;
-	let In = useRef(at);
-	In.current = at;
-	let Ln = useRef(ot);
-	Ln.current = ot;
-	let Rn = useRef(st);
-	Rn.current = st;
+	}, [I?.zIndex]);
+	let Nn = useRef(T);
+	Nn.current = T;
+	let Pn = useRef(Ie);
+	Pn.current = Ie;
+	let Fn = useRef(Et);
+	Fn.current = Et;
+	let In = useRef(V);
+	In.current = V;
+	let Ln = useRef(b);
+	Ln.current = b;
+	let Rn = useRef(at);
+	Rn.current = at;
+	let zn = useRef(ot);
+	zn.current = ot;
+	let Bn = useRef(st);
+	Bn.current = st;
 	let Q = useRef(v);
 	Q.current = v;
-	let zn = useRef(D);
-	zn.current = D, useEffect(() => {
+	let Vn = useRef(D);
+	Vn.current = D, useEffect(() => {
 		let e = (e) => {
-			if (e.key === "Escape" && J.current) {
-				z.current.get(J.current.entityId)?.cancelEditPreview?.(), J.current = null;
+			if (e.key === "Escape" && q.current) {
+				R.current.get(q.current.entityId)?.cancelEditPreview?.(), q.current = null;
 				return;
 			}
-			if (e.key === "Escape" && et === "edit") {
-				if (at && (H(null), U(null), Y()), ot === "rectangle") if (st) ct(null), Rt();
+			if (e.key === "Escape" && V === "edit") {
+				if (at && (H(null), U(null), Y()), ot === "rectangle") if (st) ct(null), Ut();
 				else {
 					U(null);
-					let e = R.current;
+					let e = L.current;
 					e && (e.getCanvas().style.cursor = "");
 				}
-				if (ot === "circle") if (ut.current) ut.current = null, Ut();
+				if (ot === "circle") if (dt.current) dt.current = null, Jt();
 				else {
 					U(null);
-					let e = R.current;
+					let e = L.current;
 					e && (e.getCanvas().style.cursor = "");
 				}
-				if (ot === "polygon") if (dt.current.length > 0) dt.current = [], qt();
+				if (ot === "polygon") if (ft.current.length > 0) ft.current = [], Qt();
 				else {
 					U(null);
-					let e = R.current;
+					let e = L.current;
 					e && (e.getCanvas().style.cursor = "");
 				}
-				if (ot === "square") if (pt.current) pt.current = null, Qt();
+				if (ot === "square") if (mt.current) mt.current = null, rn();
 				else {
 					U(null);
-					let e = R.current;
+					let e = L.current;
 					e && (e.getCanvas().style.cursor = "");
 				}
-				if (ot === "polyline") if (ht.current.length > 0) ht.current = [], nn();
+				if (ot === "polyline") if (gt.current.length > 0) gt.current = [], cn();
 				else {
 					U(null);
-					let e = R.current;
+					let e = L.current;
 					e && (e.getCanvas().style.cursor = "");
 				}
 			}
@@ -7569,56 +7588,56 @@ const Mapbox = forwardRef((e, c) => {
 			document.removeEventListener("keydown", e);
 		};
 	}, [
-		et,
+		V,
 		at,
 		ot,
 		st,
 		Y,
-		Rt,
 		Ut,
-		qt,
+		Jt,
 		Qt,
-		nn
+		rn,
+		cn
 	]), useEffect(() => {
-		let e = R.current;
-		if (!e || !V) return;
-		let t = V.entityId, n = V.config, r = () => {
-			let r = jn.current.find((e) => e.id === t);
+		let e = L.current;
+		if (!e || !B) return;
+		let t = B.entityId, n = B.config, r = () => {
+			let r = Nn.current.find((e) => e.id === t);
 			if (!r) {
-				Dt();
+				Ot();
 				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);
 		};
-	}, [V?.entityId, Dt]), useEffect(() => {
-		let e = R.current, t = Be.current;
-		if (!e || !Je || !t) return;
-		let n = Je.lngLat, r = () => {
+	}, [B?.entityId, Ot]), useEffect(() => {
+		let e = L.current, t = Ve.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) {
-				An();
+				Mn();
 				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, An]), useEffect(() => {
-		if (!Be.current) return;
+	}, [Ye?.lngLat, Mn]), useEffect(() => {
+		if (!Ve.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: m = !0, boxZoom: h = !0 } = x, _ = new mapboxgl.Map({
-			container: Be.current,
+			container: Ve.current,
 			style: p || e,
 			center: l,
 			zoom: u,
@@ -7645,98 +7664,98 @@ const Mapbox = forwardRef((e, c) => {
 				return { url: e };
 			}
 		});
-		return R.current = _, _.on("load", () => {
+		return L.current = _, _.on("load", () => {
 			if (!_.getStyle().glyphs) {
 				let e = _.style, t = "/gis-fonts/{fontstack}/{range}.pbf";
 				e.glyphs = t, e.stylesheet && (e.stylesheet.glyphs = t);
 			}
-			B.current.clear(), T.forEach((e) => {
-				B.current.set(e.id, e);
-			}), wn(S), gn(), It(), zt(), Gt(), Yt(), en(), $e(_), Pe?.(_);
-		}), _.on("click", En), _.on("mousemove", Dn), _.on("contextmenu", On), () => {
-			_.off("click", En), _.off("mousemove", Dn), _.off("contextmenu", On), _n(), Mt(), Y(), X(), Z(), _.remove(), R.current = null;
+			z.current.clear(), T.forEach((e) => {
+				z.current.set(e.id, e);
+			}), En(S), vn(), Vt(), Wt(), Xt(), en(), on(), et(_), Fe?.(_);
+		}), _.on("click", On), _.on("mousemove", kn), _.on("contextmenu", An), () => {
+			_.off("click", On), _.off("mousemove", kn), _.off("contextmenu", An), yn(), Lt(), Y(), X(), Z(), _.remove(), L.current = null;
 		};
 	}, []), useEffect(() => {
-		if (R.current) {
-			if (!R.current.isStyleLoaded()) {
-				R.current.once("load", () => {
-					B.current.clear(), T.forEach((e) => {
-						B.current.set(e.id, e);
-					}), gn();
+		if (L.current) {
+			if (!L.current.isStyleLoaded()) {
+				L.current.once("load", () => {
+					z.current.clear(), T.forEach((e) => {
+						z.current.set(e.id, e);
+					}), vn();
 				});
 				return;
 			}
-			B.current.clear(), T.forEach((e) => {
-				B.current.set(e.id, e);
-			}), gn();
+			z.current.clear(), T.forEach((e) => {
+				z.current.set(e.id, e);
+			}), vn();
 		}
-	}, [T, gn]), useEffect(() => {
-		!R.current || !R.current.isStyleLoaded() || (_n(), gn());
+	}, [T, vn]), useEffect(() => {
+		!L.current || !L.current.isStyleLoaded() || (yn(), vn());
 	}, [
 		O,
 		k,
+		j,
 		M,
 		N,
-		P,
-		_n,
-		gn
+		yn,
+		vn
 	]), useEffect(() => {
-		if (R.current) {
-			if (!R.current.isStyleLoaded()) {
-				R.current.once("load", () => {
-					wn(S);
+		if (L.current) {
+			if (!L.current.isStyleLoaded()) {
+				L.current.once("load", () => {
+					En(S);
 				});
 				return;
 			}
-			wn(S);
-		}
-	}, [S, wn]);
-	let Bn = useRef(void 0), Vn = useRef(!0), Hn = useRef(S);
-	Hn.current = S;
-	let Un = useRef(wn);
-	Un.current = wn;
-	let Wn = useRef(_n);
-	Wn.current = _n;
-	let Gn = useRef(gn);
-	Gn.current = gn;
-	let Kn = useRef(It);
-	Kn.current = It;
-	let qn = useRef(zt);
-	qn.current = zt;
-	let Jn = useRef(Gt);
-	Jn.current = Gt;
-	let Yn = useRef(Yt);
-	Yn.current = Yt;
-	let Xn = useRef(en);
-	Xn.current = en, useEffect(() => {
-		let e = R.current;
+			En(S);
+		}
+	}, [S, En]);
+	let Hn = useRef(void 0), Un = useRef(!0), Wn = useRef(S);
+	Wn.current = S;
+	let Gn = useRef(En);
+	Gn.current = En;
+	let Kn = useRef(yn);
+	Kn.current = yn;
+	let qn = useRef(vn);
+	qn.current = vn;
+	let Jn = useRef(Vt);
+	Jn.current = Vt;
+	let Yn = useRef(Wt);
+	Yn.current = Wt;
+	let Xn = useRef(Xt);
+	Xn.current = Xt;
+	let Zn = useRef(en);
+	Zn.current = en;
+	let Qn = useRef(on);
+	Qn.current = on, useEffect(() => {
+		let e = L.current;
 		if (!e) return;
 		let t = p || {
 			version: 8,
 			sources: {},
 			layers: []
 		};
-		if (Vn.current) {
-			Vn.current = !1, Bn.current = p;
+		if (Un.current) {
+			Un.current = !1, Hn.current = p;
 			return;
 		}
-		Bn.current !== p && (Bn.current = p, e.setStyle(t), e.once("style.load", () => {
+		Hn.current !== p && (Hn.current = p, 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(), Un.current(Hn.current), Wn.current(), Gn.current(), Kn.current(), qn.current(), Jn.current(), Yn.current(), Xn.current();
+			We.current.clear(), Gn.current(Wn.current), Kn.current(), qn.current(), Jn.current(), Yn.current(), Xn.current(), Zn.current(), Qn.current();
 		}));
 	}, [p]), useEffect(() => {
 		let e = new Set(E.map(String));
-		for (let [t, n] of z.current) n.setSelected(e.has(String(t)));
+		for (let [t, n] of R.current) n.setSelected(e.has(String(t)));
 	}, [E]);
-	let Zn = useRef({});
+	let $n = useRef({});
 	useEffect(() => {
-		let e = R.current;
+		let e = L.current;
 		if (!e) return;
-		let t = Zn.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 || (Zn.current = {
+		let t = $n.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 || ($n.current = {
 			center: l,
 			zoom: u,
 			pitch: d,
@@ -7753,13 +7772,13 @@ const Mapbox = forwardRef((e, c) => {
 		d,
 		f
 	]);
-	let Qn = (() => Se === !1 ? null : Se === !0 ? { enabled: !0 } : Se)(), $n = (() => F === !1 ? null : F === !0 ? { enabled: !0 } : F)(), er = (() => Ce === !1 ? null : Ce === !0 ? { enabled: !0 } : Ce)(), $ = (() => {
-		if (we === !1) return null;
+	let er = (() => Ce === !1 ? null : Ce === !0 ? { enabled: !0 } : Ce)(), tr = (() => P === !1 ? null : P === !0 ? { enabled: !0 } : P)(), nr = (() => we === !1 ? null : we === !0 ? { enabled: !0 } : we)(), $ = (() => {
+		if (Te === !1) return null;
 		let e, t, n;
 		if (S && S.length > 0) {
 			let r = S.find((e) => e.hasRoadNetwork === !0) || S[0];
 			if (r.type === "style") {
-				let t = R.current?.getStyle();
+				let t = L.current?.getStyle();
 				if (t?.sources) {
 					let n = `base-layer-source-${r.id}-`, i = Object.keys(t.sources).find((e) => e.startsWith(n));
 					i && (e = i);
@@ -7767,55 +7786,93 @@ const Mapbox = forwardRef((e, c) => {
 			} else e = `base-layer-source-${r.id}`;
 			t = r.roadNetworkSourceLayer || "road", n = r.roadNetworkClassField;
 		}
-		return we === !0 ? {
+		return Te === !0 ? {
 			enabled: !0,
 			source: e,
 			sourceLayer: t,
 			classField: n
 		} : {
-			...we,
-			source: we.source || e,
-			sourceLayer: we.sourceLayer || t,
-			classField: we.classField || n
+			...Te,
+			source: Te.source || e,
+			sourceLayer: Te.sourceLayer || t,
+			classField: Te.classField || n
 		};
-	})(), tr = (() => I ? I === !0 ? { enabled: !0 } : I : null)(), nr = (() => Ee ? Ee === !0 ? { enabled: !0 } : Ee : null)(), rr = (() => Ae || null)(), ir = useMemo(() => {
+	})(), rr = (() => F ? F === !0 ? { enabled: !0 } : F : null)(), ir = (() => De ? De === !0 ? { enabled: !0 } : De : null)(), ar = (() => je || null)(), or = useMemo(() => {
 		let e = [];
 		for (let t of S) if (t.applyRasterPaint) if (t.type === "style") {
-			let n = R.current;
+			let n = L.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, Qe]);
+	}, [S, $e]), sr = useMemo(() => {
+		if (V !== "picker") return;
+		let e = J.cursorImage;
+		if (!e) return;
+		let t = e.width ?? 32, n = e.height ?? 32, r = e.anchor ?? "center", i = t / 2, a = n / 2;
+		switch (r) {
+			case "top-left":
+				i = 0, a = 0;
+				break;
+			case "top":
+				i = t / 2, a = 0;
+				break;
+			case "top-right":
+				i = t, a = 0;
+				break;
+			case "left":
+				i = 0, a = n / 2;
+				break;
+			case "center":
+				i = t / 2, a = n / 2;
+				break;
+			case "right":
+				i = t, a = n / 2;
+				break;
+			case "bottom-left":
+				i = 0, a = n;
+				break;
+			case "bottom":
+				i = t / 2, a = n;
+				break;
+			case "bottom-right":
+				i = t, a = n;
+				break;
+		}
+		return `url(${e.url}) ${i} ${a}, crosshair`;
+	}, [V, J.cursorImage]), cr = useMemo(() => sr ? {
+		...Be,
+		"--mapbox-picker-cursor": sr
+	} : Be, [Be, sr]);
 	return /* @__PURE__ */ jsxs("div", {
-		className: `comp-mapbox ${et === "picker" ? "comp-mapbox--picker-mode" : ""} ${Re}`,
-		style: ze,
+		className: `comp-mapbox ${V === "picker" ? "comp-mapbox--picker-mode" : ""} ${ze}`,
+		style: cr,
 		children: [
 			/* @__PURE__ */ jsx("div", {
-				ref: Be,
+				ref: Ve,
 				className: "comp-mapbox__map"
 			}),
-			et === "picker" && y.showCrosshair === !0 && /* @__PURE__ */ jsxs("div", {
+			V === "picker" && J.showCrosshair === !0 && /* @__PURE__ */ jsxs("div", {
 				className: "comp-mapbox__crosshair",
 				children: [/* @__PURE__ */ jsx("div", {
 					className: "comp-mapbox__crosshair-h",
-					style: y.crosshairColor ? { backgroundColor: y.crosshairColor } : void 0
+					style: J.crosshairColor ? { backgroundColor: J.crosshairColor } : void 0
 				}), /* @__PURE__ */ jsx("div", {
 					className: "comp-mapbox__crosshair-v",
-					style: y.crosshairColor ? { backgroundColor: y.crosshairColor } : void 0
+					style: J.crosshairColor ? { backgroundColor: J.crosshairColor } : void 0
 				})]
 			}),
 			/* @__PURE__ */ jsxs("div", {
-				className: `comp-mapbox__edit-controls${et === "edit" && v.showEditTools !== !1 && (v.markerTemplates && v.markerTemplates.length > 0 || v.showRectangleTool || v.showCircleTool || v.showPolygonTool || v.showSquareTool || v.showPolylineTool) || $ && $.enabled !== !1 || rr && rr.enabled !== !1 ? "" : " comp-mapbox__edit-controls--hidden"}`,
+				className: `comp-mapbox__edit-controls${V === "edit" && v.showEditTools !== !1 && (v.markerTemplates && v.markerTemplates.length > 0 || v.showRectangleTool || v.showCircleTool || v.showPolygonTool || v.showSquareTool || v.showPolylineTool) || $ && $.enabled !== !1 || ar && ar.enabled !== !1 ? "" : " comp-mapbox__edit-controls--hidden"}`,
 				children: [
-					et === "edit" && v.showEditTools !== !1 && (v.markerTemplates && v.markerTemplates.length > 0 || v.showRectangleTool || v.showCircleTool || v.showPolygonTool || v.showSquareTool || v.showPolylineTool) && /* @__PURE__ */ jsx(EditControl, {
+					V === "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: at,
-						onTemplateSelect: rn,
+						onTemplateSelect: ln,
 						drawMode: ot,
-						onDrawModeChange: an,
+						onDrawModeChange: un,
 						showRectangleTool: v.showRectangleTool,
 						showCircleTool: v.showCircleTool,
 						showPolygonTool: v.showPolygonTool,
@@ -7823,8 +7880,8 @@ const Mapbox = forwardRef((e, c) => {
 						showPolylineTool: v.showPolylineTool
 					}),
 					/* @__PURE__ */ jsx(RoadHighlightControl, {
-						ref: He,
-						map: Qe,
+						ref: Ue,
+						map: $e,
 						showButton: !!($ && $.enabled !== !1),
 						highlightWidth: $?.highlightWidth,
 						defaultRoadTypes: $?.defaultRoadTypes,
@@ -7835,77 +7892,77 @@ const Mapbox = forwardRef((e, c) => {
 						className: $?.className,
 						style: $?.style
 					}),
-					rr && rr.enabled !== !1 && /* @__PURE__ */ jsx(RoutePlanningControl, {
-						ref: Ve,
-						map: Qe,
-						pointCount: rr.pointCount,
-						showPointCountInput: rr.showPointCountInput,
-						visualType: rr.visualType,
-						onSelectFinished: rr.onSelectFinished
+					ar && ar.enabled !== !1 && /* @__PURE__ */ jsx(RoutePlanningControl, {
+						ref: He,
+						map: $e,
+						pointCount: ar.pointCount,
+						showPointCountInput: ar.showPointCountInput,
+						visualType: ar.visualType,
+						onSelectFinished: ar.onSelectFinished
 					})
 				]
 			}),
-			(Qn?.enabled !== !1 || $n?.enabled !== !1 || er?.enabled !== !1 || tr && tr.enabled !== !1 || nr && nr.enabled !== !1) && /* @__PURE__ */ jsxs("div", {
+			(er?.enabled !== !1 || tr?.enabled !== !1 || nr?.enabled !== !1 || rr && rr.enabled !== !1 || ir && ir.enabled !== !1) && /* @__PURE__ */ jsxs("div", {
 				className: "comp-mapbox__controls",
 				children: [
-					Qn && Qn.enabled !== !1 && /* @__PURE__ */ jsx(CoordinateDisplay, {
-						map: Qe,
-						precision: Qn.precision,
-						className: Qn.className,
-						style: Qn.style
+					er && er.enabled !== !1 && /* @__PURE__ */ jsx(CoordinateDisplay, {
+						map: $e,
+						precision: er.precision,
+						className: er.className,
+						style: er.style
 					}),
-					$n && $n.enabled !== !1 && /* @__PURE__ */ jsx(ScaleControl, {
-						map: Qe,
-						maxWidth: $n.maxWidth,
-						unit: $n.unit,
-						className: $n.className,
-						style: $n.style
+					tr && tr.enabled !== !1 && /* @__PURE__ */ jsx(ScaleControl, {
+						map: $e,
+						maxWidth: tr.maxWidth,
+						unit: tr.unit,
+						className: tr.className,
+						style: tr.style
 					}),
-					tr && tr.enabled !== !1 && /* @__PURE__ */ jsx(MeasureControl, {
-						map: Qe,
+					rr && rr.enabled !== !1 && /* @__PURE__ */ jsx(MeasureControl, {
+						map: $e,
 						entityConfig: D,
 						onDrawModeChange: (e) => {
-							_t.current = e;
+							vt.current = e;
 						},
-						className: tr.className,
-						style: tr.style
+						className: rr.className,
+						style: rr.style
 					}),
-					nr && nr.enabled !== !1 && /* @__PURE__ */ jsx(RasterPaintControl, {
-						map: Qe,
+					ir && ir.enabled !== !1 && /* @__PURE__ */ jsx(RasterPaintControl, {
+						map: $e,
 						value: C,
-						onChange: je,
-						rasterPaintLayerIds: ir,
-						className: nr.className,
-						style: nr.style
+						onChange: Me,
+						rasterPaintLayerIds: or,
+						className: ir.className,
+						style: ir.style
 					}),
-					er && er.enabled !== !1 && /* @__PURE__ */ jsx(ResetViewControl, {
-						map: Qe,
+					nr && nr.enabled !== !1 && /* @__PURE__ */ jsx(ResetViewControl, {
+						map: $e,
 						initialCenter: l,
 						initialZoom: u,
 						initialPitch: d,
 						initialBearing: f,
-						duration: er.duration,
-						className: er.className,
-						style: er.style
+						duration: nr.duration,
+						className: nr.className,
+						style: nr.style
 					})
 				]
 			}),
-			!(rr && rr.enabled !== !1) && /* @__PURE__ */ jsx(RoutePlanningControl, {
-				ref: Ve,
-				map: Qe,
+			!(ar && ar.enabled !== !1) && /* @__PURE__ */ jsx(RoutePlanningControl, {
+				ref: He,
+				map: $e,
 				showButton: !1
 			}),
-			V && Ge.current && /* @__PURE__ */ jsx(EntityPopup, {
-				popupState: V,
-				onClose: () => Et(V.entityId),
-				portalContainer: Ge.current,
-				popupRef: Ke
+			B && Ke.current && /* @__PURE__ */ jsx(EntityPopup, {
+				popupState: B,
+				onClose: () => Dt(B.entityId),
+				portalContainer: Ke.current,
+				popupRef: qe
 			}),
-			Je && Xe.current && /* @__PURE__ */ jsx(ContextMenu, {
-				menuState: Je,
-				onClose: An,
-				portalContainer: Xe.current,
-				menuRef: Ze
+			Ye && Ze.current && /* @__PURE__ */ jsx(ContextMenu, {
+				menuState: Ye,
+				onClose: Mn,
+				portalContainer: Ze.current,
+				menuRef: Qe
 			})
 		]
 	});