9e4225a338
Heinrich's-law play: the signals we already compute but used to throw away
become a spatial risk map of the workplace, drawn over the camera's own frame.
Edge:
- near_fall (INFO): a track that reached FALLING (sustained prone) but recovered
before the FALLEN confirm. Treated as a full event per product decision -
same ingest, snapshots, dedup, ack flow as incidents. Fix en route: prone_s
used a truthiness check that turned prone_since=0.0 into "no timer".
- Every per-track event (fall/no_motion/near_fall/immobility/zone hits) now
carries the foot point in the zones' normalized 0..1 space (reusing the zone
detector's own coordinate math); ghost's pixel-space loss point is normalized
at emit. to_payload omits the key when absent, so an old server ignores it.
Server:
- move_events.spatial_x/spatial_y (nullable DOUBLE) + validator: optional
[x, y] finite-number pair; range deliberately NOT enforced (an off-by-a-hair
foot must never reject a FALL alert - renderers clamp).
- MIGRATION FIX: chk_events_type would have REJECTED the previous commit's
lone_worker/overcapacity/overstay inserts on MySQL 8.0.16+ - the constraint
is rebuilt with all 13 types (incl. near_fall).
- GET /api/heatmap/{camera}?days=N (1..90, default 30, 5000-point cap):
spatial points with the same fail-closed site scoping as the event list.
UI (zone editor): "위험 히트맵" toggle + day window. Additive radial blots in
an offscreen layer under the zone polygons; severity weighs the alpha so a
cluster of near-misses reads lighter than one confirmed fall at the same spot.
Events console/detail label near_fall in Korean.
Verified: pytest 222 pass / PHPUnit 130 pass + Chrome real-render (blue
near-miss cluster + red incident hotspot inside the restricted zone, amber
cluster in the warning zone, zones drawn on top; no console errors).
43 lines
1.7 KiB
PHP
43 lines
1.7 KiB
PHP
<?php
|
|
declare(strict_types=1);
|
|
namespace App\Dashboard;
|
|
|
|
use App\Http\{Request, Response};
|
|
use App\Auth\SessionStore;
|
|
use App\Repository\EventRepository;
|
|
|
|
/**
|
|
* GET /api/heatmap/{camera}?days=N -> {points: [{x,y,severity,event_type,occurred_at}], days}
|
|
*
|
|
* Spatial density of everything the camera detected (incidents AND near-misses) in the
|
|
* window — the raw material the zone editor overlays on the camera frame. Points are
|
|
* normalized 0..1 of the image, the same space the zone polygons live in.
|
|
*/
|
|
final class HeatmapController
|
|
{
|
|
private const DEFAULT_DAYS = 30;
|
|
private const MAX_DAYS = 90;
|
|
private const MAX_POINTS = 5000;
|
|
|
|
public function __construct(private EventRepository $events, private SessionStore $sess) {}
|
|
|
|
public function json(Request $req, array $params): Response
|
|
{
|
|
if ($this->sess->get('user_id') === null) return Response::json(['error' => 'unauthorized'], 401);
|
|
$camera = (string)($params['camera'] ?? '');
|
|
if ($camera === '') return Response::json(['error' => 'missing_camera'], 400);
|
|
$days = self::clampDays($req->query('days'));
|
|
// Same fail-closed site scoping as the event list: a scoped operator sees only their
|
|
// site's points; only a genuinely null scope is global.
|
|
$scope = $this->sess->get('site_scope');
|
|
$site = is_string($scope) ? $scope : null;
|
|
$points = $this->events->heatmapPoints($camera, time() - $days * 86400, $site, self::MAX_POINTS);
|
|
return Response::json(['points' => $points, 'days' => $days], 200);
|
|
}
|
|
|
|
private static function clampDays(mixed $raw): int
|
|
{
|
|
if ($raw === null || $raw === '' || !is_numeric($raw)) return self::DEFAULT_DAYS;
|
|
return max(1, min(self::MAX_DAYS, (int)$raw));
|
|
}
|
|
}
|