feat v1.4.0 (phase 2): room markup editor — dot grid, two-click lines with snap, closed contour enables save with HA area dropdown, polygon rooms, tools add/erase-line/delete-room, shared wall segments in space.segments

custom_components/houseplan/const.py

@@ -8,7 +8,7 @@ FRONTEND_URL = "/houseplan_files/houseplan-card.js"
 PLANS_URL = "/houseplan_files/plans"
 PLANS_DIR = "houseplan/plans"  # относительно каталога конфигурации HA
 CONF_ADMIN_ONLY = "admin_only"
-VERSION = "1.3.0"
+VERSION = "1.4.0"
 
 DEFAULT_CONFIG: dict = {
     "spaces": [],

custom_components/houseplan/manifest.json

@@ -9,5 +9,5 @@
   "iot_class": "local_push",
   "issue_tracker": "https://github.com/justbusiness/houseplan-card/issues",
   "requirements": [],
-  "version": "1.3.0"
+  "version": "1.4.0"
 }

custom_components/houseplan/websocket_api.py

@@ -20,17 +20,25 @@ POS_SCHEMA = vol.Schema(
 )
 LAYOUT_SCHEMA = vol.Schema({str: POS_SCHEMA})
 
-ROOM_SCHEMA = vol.Schema(
-    {
-        vol.Required("id"): str,
-        vol.Required("name"): str,
-        vol.Optional("area"): vol.Any(str, None),
-        vol.Required("x"): vol.Coerce(float),
-        vol.Required("y"): vol.Coerce(float),
-        vol.Required("w"): vol.Coerce(float),
-        vol.Required("h"): vol.Coerce(float),
-    },
-    extra=vol.ALLOW_EXTRA,
+POINT = vol.All([vol.Coerce(float)], vol.Length(min=2, max=2))
+ROOM_SCHEMA = vol.All(
+    vol.Schema(
+        {
+            vol.Required("id"): str,
+            vol.Required("name"): str,
+            vol.Optional("area"): vol.Any(str, None),
+            # прямоугольная комната (legacy) …
+            vol.Optional("x"): vol.Coerce(float),
+            vol.Optional("y"): vol.Coerce(float),
+            vol.Optional("w"): vol.Coerce(float),
+            vol.Optional("h"): vol.Coerce(float),
+            # … или полигон (редактор разметки)
+            vol.Optional("poly"): vol.All([POINT], vol.Length(min=3)),
+        },
+        extra=vol.ALLOW_EXTRA,
+    ),
+    lambda r: r if ("poly" in r or all(k in r for k in ("x", "y", "w", "h")))
+    else (_ for _ in ()).throw(vol.Invalid("room: нужен poly или x/y/w/h")),
 )
 SPACE_SCHEMA = vol.Schema(
     {
@@ -40,6 +48,8 @@ SPACE_SCHEMA = vol.Schema(
         vol.Required("aspect"): vol.All(vol.Coerce(float), vol.Range(min=0.05, max=20)),
         vol.Required("view_box"): vol.All([vol.Coerce(float)], vol.Length(min=4, max=4)),
         vol.Required("rooms"): [ROOM_SCHEMA],
+        # сегменты-«стены» (разметочный каркас): [x1,y1,x2,y2], нормированные
+        vol.Optional("segments"): [vol.All([vol.Coerce(float)], vol.Length(min=4, max=4))],
     },
     extra=vol.ALLOW_EXTRA,
 )