@blueharford/scrypted-spatial-awareness 0.6.4 → 0.6.5

package/out/main.nodejs.js

@@ -36602,7 +36602,9 @@ class TopologyDiscoveryEngine {
                         type: landmark.type,
                         description: landmark.description,
                         visibleFromCameras: [analysis.cameraId],
-                    },
+                        // Include bounding box for positioning (will be used by applyDiscoverySuggestion)
+                        boundingBox: landmark.boundingBox,
+                    }, // boundingBox is extra metadata not in Landmark interface
                 };
                 this.suggestions.set(suggestion.id, suggestion);
             }
@@ -40305,24 +40307,46 @@ class SpatialAwarenessPlugin extends sdk_1.ScryptedDeviceBase {
                     const direction = fov.direction || 0;
                     const range = fov.range || 80;
                     const fovAngle = fov.angle || 90;
-                    // Count existing landmarks from this camera to spread them out
-                    const cameraDeviceId = camera.deviceId;
-                    const existingFromCamera = (topology.landmarks || []).filter(l => l.visibleFromCameras?.includes(cameraDeviceId) ||
-                        l.visibleFromCameras?.includes(camera.name)).length;
                     // Calculate position in front of camera within its FOV
                     // Convert direction to radians (0 = up/north, 90 = right/east)
                     const dirRad = (direction - 90) * Math.PI / 180;
                     const halfFov = (fovAngle / 2) * Math.PI / 180;
-                    // Spread landmarks across the FOV cone at varying distances
-                    const angleOffset = (existingFromCamera % 3 - 1) * halfFov * 0.6; // -0.6, 0, +0.6 of half FOV
-                    const distanceMultiplier = 0.5 + (existingFromCamera % 2) * 0.3; // 50% or 80% of range
+                    // Use bounding box if available to position landmark accurately within FOV
+                    // boundingBox format: [x, y, width, height] normalized 0-1
+                    const bbox = suggestion.landmark.boundingBox;
+                    let angleOffset;
+                    let distanceMultiplier;
+                    if (bbox && bbox.length >= 2) {
+                        // Use bounding box center to determine position in FOV
+                        const bboxCenterX = bbox[0] + (bbox[2] || 0) / 2; // 0 = left edge, 1 = right edge
+                        const bboxCenterY = bbox[1] + (bbox[3] || 0) / 2; // 0 = top (far), 1 = bottom (close)
+                        // Map X position to angle within FOV
+                        // bboxCenterX 0 → left side of FOV (-halfFov)
+                        // bboxCenterX 0.5 → center of FOV (0)
+                        // bboxCenterX 1 → right side of FOV (+halfFov)
+                        angleOffset = (bboxCenterX - 0.5) * 2 * halfFov;
+                        // Map Y position to distance from camera
+                        // bboxCenterY 0 (top of frame) → far from camera (90% of range)
+                        // bboxCenterY 1 (bottom of frame) → close to camera (30% of range)
+                        distanceMultiplier = 0.9 - (bboxCenterY * 0.6);
+                        this.console.log(`[Discovery] Using bounding box [${bbox.join(',')}] → center (${bboxCenterX.toFixed(2)}, ${bboxCenterY.toFixed(2)})`);
+                    }
+                    else {
+                        // Fallback: spread landmarks across FOV if no bounding box
+                        const cameraDeviceId = camera.deviceId;
+                        const existingFromCamera = (topology.landmarks || []).filter(l => l.visibleFromCameras?.includes(cameraDeviceId) ||
+                            l.visibleFromCameras?.includes(camera.name)).length;
+                        angleOffset = (existingFromCamera % 3 - 1) * halfFov * 0.6;
+                        distanceMultiplier = 0.5 + (existingFromCamera % 2) * 0.3;
+                        this.console.log(`[Discovery] No bounding box, using fallback spread (existing: ${existingFromCamera})`);
+                    }
                     const finalAngle = dirRad + angleOffset;
                     const distance = range * distanceMultiplier;
                     position = {
                         x: camera.floorPlanPosition.x + Math.cos(finalAngle) * distance,
                         y: camera.floorPlanPosition.y + Math.sin(finalAngle) * distance,
                     };
-                    this.console.log(`[Discovery] Placing landmark "${suggestion.landmark.name}" in ${camera.name}'s FOV: dir=${direction}°, dist=${distance.toFixed(0)}px`);
+                    this.console.log(`[Discovery] Placing landmark "${suggestion.landmark.name}" in ${camera.name}'s FOV: dir=${direction}°, angle=${(angleOffset * 180 / Math.PI).toFixed(1)}°, dist=${distance.toFixed(0)}px`);
                 }
                 else {
                     // Position in a grid pattern starting from center
@@ -40383,29 +40407,54 @@ class SpatialAwarenessPlugin extends sdk_1.ScryptedDeviceBase {
                 // Convert direction to radians (0 = up/north, 90 = right/east)
                 const dirRad = (direction - 90) * Math.PI / 180;
                 const halfFov = (fovAngle / 2) * Math.PI / 180;
-                // Count existing zones from this camera to offset new ones
-                const existingFromCamera = (topology.drawnZones || []).filter((z) => z.linkedCameras?.includes(sourceCameras[0])).length;
-                // Create a wedge-shaped zone within the camera's FOV
-                // Offset based on existing zones to avoid overlap
-                const innerRadius = range * 0.3 + existingFromCamera * 20;
-                const outerRadius = range * 0.8 + existingFromCamera * 20;
-                // Use a portion of the FOV for each zone
-                const zoneSpread = halfFov * 0.7; // 70% of half FOV
                 const camX = camera.floorPlanPosition.x;
                 const camY = camera.floorPlanPosition.y;
-                // Create arc polygon (wedge shape)
+                // Use bounding box if available to position zone accurately within FOV
+                const bbox = zone.boundingBox; // [x, y, width, height] normalized 0-1
+                let innerRadius;
+                let outerRadius;
+                let angleStart;
+                let angleEnd;
+                if (bbox && bbox.length >= 4) {
+                    // Map bounding box to position within FOV
+                    const bboxLeft = bbox[0];
+                    const bboxRight = bbox[0] + bbox[2];
+                    const bboxTop = bbox[1];
+                    const bboxBottom = bbox[1] + bbox[3];
+                    // Map X to angle within FOV (0 = left edge, 1 = right edge)
+                    angleStart = dirRad + (bboxLeft - 0.5) * 2 * halfFov;
+                    angleEnd = dirRad + (bboxRight - 0.5) * 2 * halfFov;
+                    // Map Y to distance (0 = far, 1 = close)
+                    innerRadius = range * (0.9 - bboxBottom * 0.6);
+                    outerRadius = range * (0.9 - bboxTop * 0.6);
+                    // Ensure min size
+                    if (outerRadius - innerRadius < 20) {
+                        outerRadius = innerRadius + 20;
+                    }
+                    this.console.log(`[Discovery] Zone "${zone.name}" using bbox [${bbox.join(',')}] → angles ${(angleStart * 180 / Math.PI).toFixed(1)}° to ${(angleEnd * 180 / Math.PI).toFixed(1)}°`);
+                }
+                else {
+                    // Fallback: wedge-shaped zone offset by existing count
+                    const existingFromCamera = (topology.drawnZones || []).filter((z) => z.linkedCameras?.includes(sourceCameras[0])).length;
+                    innerRadius = range * 0.3 + existingFromCamera * 20;
+                    outerRadius = range * 0.8 + existingFromCamera * 20;
+                    angleStart = dirRad - halfFov * 0.7;
+                    angleEnd = dirRad + halfFov * 0.7;
+                    this.console.log(`[Discovery] Zone "${zone.name}" using fallback spread (existing: ${existingFromCamera})`);
+                }
+                // Create arc polygon
                 const steps = 8;
-                // Inner arc (from left to right)
+                // Inner arc (from start angle to end angle)
                 for (let i = 0; i <= steps; i++) {
-                    const angle = dirRad - zoneSpread + (zoneSpread * 2 * i / steps);
+                    const angle = angleStart + (angleEnd - angleStart) * i / steps;
                     polygon.push({
                         x: camX + Math.cos(angle) * innerRadius,
                         y: camY + Math.sin(angle) * innerRadius,
                     });
                 }
-                // Outer arc (from right to left)
+                // Outer arc (from end angle to start angle)
                 for (let i = steps; i >= 0; i--) {
-                    const angle = dirRad - zoneSpread + (zoneSpread * 2 * i / steps);
+                    const angle = angleStart + (angleEnd - angleStart) * i / steps;
                     polygon.push({
                         x: camX + Math.cos(angle) * outerRadius,
                         y: camY + Math.sin(angle) * outerRadius,