floor-editor-ts 1.4.7 → 1.4.8

package/dist/floor-editor.es.js

@@ -11309,10 +11309,9 @@ function drawZoneShape(cs, zone, selected) {
 		ctx.fillStyle = color;
 		ctx.fillText(zone.name, bx + 6, by + 4);
 	}
-	const r = selected ? 9 : 7;
-	for (let i = 0; i < pts.length; i++) {
+	if (selected) for (let i = 0; i < pts.length; i++) {
 		const s = wts(cs, pts[i].x, pts[i].y);
-		drawVertexIndexBadge(ctx, s.x, s.y, i, color, r);
+		drawVertexIndexBadge(ctx, s.x, s.y, i, color, 9);
 	}
 	ctx.restore();
 }
@@ -63830,7 +63829,7 @@ function CameraFovEditor($$anchor, $$props) {
 				ctx.setLineDash([]);
 				ctx.globalAlpha = 1;
 			}
-			for (let i = 0; i < placed.length; i++) drawVertexIndexBadge(ctx, placed[i].x * s, placed[i].y * s, i, color, 10);
+			if (get(editing) || get(polySelected)) for (let i = 0; i < placed.length; i++) drawVertexIndexBadge(ctx, placed[i].x * s, placed[i].y * s, i, color, 10);
 			ctx.restore();
 		}
 	}
@@ -67241,18 +67240,18 @@ function FloorPlanCanvas($$anchor, $$props) {
 		for (const fi of get(currentFloor).furniture) {
 			var _fi$props2, _fi$props3;
 			if (fi.catalogId !== "camera" || !fi.serial) continue;
+			if (!(get(selectedFovSerial) === fi.serial || get(currentSelectedId) === fi.id)) continue;
 			const mapStr = (_fi$props2 = fi.props) === null || _fi$props2 === void 0 ? void 0 : _fi$props2.mapCoordinates;
 			if (!mapStr) continue;
 			const pts = mapCoordinatesToWorldPoints(mapStr, bounds);
 			if (pts.length < 2) continue;
-			const isActive = get(selectedFovSerial) === fi.serial || (active === null || active === void 0 ? void 0 : active.id) === fi.id;
 			const color = ((_fi$props3 = fi.props) === null || _fi$props3 === void 0 ? void 0 : _fi$props3.zoneColor) || fi.color || "#22c55e";
 			ctx.save();
 			ctx.strokeStyle = color;
 			ctx.fillStyle = color;
-			ctx.globalAlpha = isActive ? .22 : .12;
-			ctx.lineWidth = isActive ? 2.5 : 1.5;
-			ctx.setLineDash(isActive ? [] : [6, 4]);
+			ctx.globalAlpha = .22;
+			ctx.lineWidth = 2.5;
+			ctx.setLineDash([]);
 			ctx.beginPath();
 			const first = worldToScreen(pts[0].x, pts[0].y);
 			ctx.moveTo(first.x, first.y);
@@ -67264,10 +67263,9 @@ function FloorPlanCanvas($$anchor, $$props) {
 			ctx.fill();
 			ctx.globalAlpha = 1;
 			ctx.stroke();
-			ctx.setLineDash([]);
 			for (let i = 0; i < pts.length; i++) {
 				const s = worldToScreen(pts[i].x, pts[i].y);
-				drawVertexIndexBadge(ctx, s.x, s.y, i, color, isActive ? 9 : 7);
+				drawVertexIndexBadge(ctx, s.x, s.y, i, color, 9);
 			}
 			ctx.restore();
 		}
@@ -69091,9 +69089,26 @@ function FloorPlanCanvas($$anchor, $$props) {
 			return;
 		}
 		if (tool === "select") {
-			const objectAboveZone = get(showFurniture) && (!!findFurnitureAt$1(wp) || !!findHandleAt$1(wp)) || get(layerVis).columns && !!findColumnAt$1(wp) || get(showStairs) && !!findStairAt$1(wp);
-			if (!objectAboveZone) {
+			const objectAbove = get(showFurniture) && (!!findFurnitureAt$1(wp) || !!findHandleAt$1(wp)) || get(layerVis).columns && !!findColumnAt$1(wp) || get(showStairs) && !!findStairAt$1(wp);
+			if (!objectAbove) {
 				var _$$get9;
+				const fovHit = findFovCameraAt(wp);
+				if (fovHit === null || fovHit === void 0 ? void 0 : fovHit.serial) {
+					var _fovHit$props;
+					const bounds = getInteriorFloorBounds(get(currentFloor));
+					const pts = bounds ? mapCoordinatesToWorldPoints((_fovHit$props = fovHit.props) === null || _fovHit$props === void 0 ? void 0 : _fovHit$props.mapCoordinates, bounds) : [];
+					const vIdx = pts.length ? findFovVertexAt(wp, pts) : -1;
+					set(selectedFovSerial, fovHit.serial, true);
+					set(fovSelectionOnly, true);
+					set(draggingFovVertex, vIdx >= 0 ? vIdx : null, true);
+					set(selectedZoneId, null);
+					selectedElementId.set(fovHit.id);
+					set(selectedTextAnnotationId, null);
+					set(selectedAnnotationId, null);
+					set(selectedMeasurementId, null);
+					if (vIdx >= 0) beginUndoGroup();
+					return;
+				}
 				if (((_$$get9 = get(currentFloor)) === null || _$$get9 === void 0 || (_$$get9 = _$$get9.zones) === null || _$$get9 === void 0 ? void 0 : _$$get9.length) && get(layerVis).zones) {
 					const zHit = findZoneAt(wp, get(currentFloor).zones, get(zoom));
 					if (zHit) {
@@ -69120,26 +69135,9 @@ function FloorPlanCanvas($$anchor, $$props) {
 						return;
 					}
 				}
-				const fovHit = findFovCameraAt(wp);
-				if (fovHit === null || fovHit === void 0 ? void 0 : fovHit.serial) {
-					var _fovHit$props;
-					const bounds = getInteriorFloorBounds(get(currentFloor));
-					const pts = bounds ? mapCoordinatesToWorldPoints((_fovHit$props = fovHit.props) === null || _fovHit$props === void 0 ? void 0 : _fovHit$props.mapCoordinates, bounds) : [];
-					const vIdx = pts.length ? findFovVertexAt(wp, pts) : -1;
-					set(selectedFovSerial, fovHit.serial, true);
-					set(fovSelectionOnly, true);
-					set(draggingFovVertex, vIdx >= 0 ? vIdx : null, true);
-					set(selectedZoneId, null);
-					selectedElementId.set(fovHit.id);
-					set(selectedTextAnnotationId, null);
-					set(selectedAnnotationId, null);
-					set(selectedMeasurementId, null);
-					if (vIdx >= 0) beginUndoGroup();
-					return;
-				}
 			}
 			set(selectedZoneId, null);
-			if (!objectAboveZone) {
+			if (!objectAbove) {
 				set(selectedFovSerial, null);
 				set(fovSelectionOnly, false);
 			}