From cd298f7d76ef24afbb96c254eacb23004cc7f97a Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Thu, 7 Dec 2023 12:33:58 -0800
Subject: [PATCH] common: shuffle some polygon code

---
 plugins/objectdetector/src/main.ts    | 16 ++--------------
 plugins/objectdetector/src/polygon.ts | 12 ++++++++++++
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/plugins/objectdetector/src/main.ts b/plugins/objectdetector/src/main.ts
index 0a1bc8b26..0a01f7c71 100644
--- a/plugins/objectdetector/src/main.ts
+++ b/plugins/objectdetector/src/main.ts
@@ -7,7 +7,7 @@ import { AutoenableMixinProvider } from "../../../common/src/autoenable-mixin-pr
 import { SettingsMixinDeviceBase } from "../../../common/src/settings-mixin";
 import { FFmpegVideoFrameGenerator } from './ffmpeg-videoframes';
 import { getMaxConcurrentObjectDetectionSessions } from './performance-profile';
-import { insidePolygon, polygonOverlap } from './polygon';
+import { insidePolygon, normalizeBox, polygonOverlap } from './polygon';
 import { serverSupportsMixinEventMasking } from './server-version';
 import { SMART_MOTIONSENSOR_PREFIX, SmartMotionSensor, createObjectDetectorStorageSetting } from './smart-motionsensor';
 import { getAllDevices, safeParseJson } from './util';
@@ -461,18 +461,6 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
     }
   }
 
-  normalizeBox(boundingBox: [number, number, number, number], inputDimensions: [number, number]): [Point, Point, Point, Point] {
-    let [x, y, width, height] = boundingBox;
-    let x2 = x + width;
-    let y2 = y + height;
-    // the zones are point paths in percentage format
-    x = x * 100 / inputDimensions[0];
-    y = y * 100 / inputDimensions[1];
-    x2 = x2 * 100 / inputDimensions[0];
-    y2 = y2 * 100 / inputDimensions[1];
-    return [[x, y], [x2, y], [x2, y2], [x, y2]];
-  }
-
   applyZones(detection: ObjectsDetected) {
     // determine zones of the objects, if configured.
     if (!detection.detections)
@@ -483,7 +471,7 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
         continue;
 
       o.zones = []
-      const box = this.normalizeBox(o.boundingBox, detection.inputDimensions);
+      const box = normalizeBox(o.boundingBox, detection.inputDimensions);
 
       let included: boolean;
       for (const [zone, zoneValue] of Object.entries(this.zones)) {
diff --git a/plugins/objectdetector/src/polygon.ts b/plugins/objectdetector/src/polygon.ts
index 7a20ec4ac..ebd5165dd 100644
--- a/plugins/objectdetector/src/polygon.ts
+++ b/plugins/objectdetector/src/polygon.ts
@@ -13,3 +13,15 @@ export function insidePolygon(point: Point, polygon: Point[]) {
     const intersect = polygonClipping.intersection([polygon], [[point, [point[0] + 1, point[1]], [point[0] + 1, point[1] + 1]]]);
     return !!intersect.length;
 }
+
+export function normalizeBox(boundingBox: [number, number, number, number], inputDimensions: [number, number]): [Point, Point, Point, Point] {
+    let [x, y, width, height] = boundingBox;
+    let x2 = x + width;
+    let y2 = y + height;
+    // the zones are point paths in percentage format
+    x = x * 100 / inputDimensions[0];
+    y = y * 100 / inputDimensions[1];
+    x2 = x2 * 100 / inputDimensions[0];
+    y2 = y2 * 100 / inputDimensions[1];
+    return [[x, y], [x2, y], [x2, y2], [x, y2]];
+}