@soonspacejs/plugin-cps-soonmanager 2.15.6 → 2.15.8

package/dist/index.esm.js

@@ -24789,7 +24789,7 @@ function gisPlotToAddOptions(v) {
   let q = null;
   switch (A) {
     case "point": {
-      q = { type: "point", ...e };
+      q = { type: "point", ...T };
       break;
     }
     case "line": {
@@ -24797,19 +24797,19 @@ function gisPlotToAddOptions(v) {
       break;
     }
     case "polygon": {
-      q = { type: "polygon", ...e };
+      q = { type: "polygon", ...T };
       break;
     }
     case "rectangle": {
-      q = { type: "rectangle", ...e };
+      q = { type: "rectangle", ...T };
       break;
     }
     case "sector": {
-      q = { type: "sector", ...e };
+      q = { type: "sector", ...T };
       break;
     }
     case "arrow": {
-      q = { type: "arrow", ...e };
+      q = { type: "arrow", ...T };
       break;
     }
     case "text": {
@@ -42693,7 +42693,11 @@ class UpdatePoi {
     });
   }
 }
-const randomColor = () => `hsl(${Math.random() * 360}, 100%, 50%)`;
+const { warn: warn$1 } = SoonSpace.utils, randomColor = () => `hsl(${Math.random() * 360}, 100%, 50%)`;
+function getValidPolygonShape(v, e, _) {
+  const A = v?.shape;
+  return !Array.isArray(A) || A.length < 4 || A.length % 2 !== 0 ? (warn$1(`语义对象 ${e}(${_}) 缺少有效 Polygon.shape，已跳过`), null) : A;
+}
 function convertToPlaneIVector2(v) {
   const e = [];
   for (let _ = 0; _ < v.length; _ += 2)
@@ -42709,12 +42713,14 @@ function loadSemanticObjects(v, e) {
         E && (R.Walls?.forEach((T) => {
           const q = e.Walls?.[T];
           if (!q) return;
-          const P = v.createCanvas3D({
+          const P = getValidPolygonShape(q.Polygon, "WALL", q.ID);
+          if (!P) return;
+          const B = v.createCanvas3D({
             id: q.ID,
             polygons: [
               {
                 id: `${q.ID}/polygon`,
-                points: convertToPlaneIVector2(q.Polygon.shape),
+                points: convertToPlaneIVector2(P),
                 yHeight: q.Elevation,
                 depth: q.Height,
                 color: randomColor(),
@@ -42725,16 +42731,18 @@ function loadSemanticObjects(v, e) {
               renderType: "WALL"
             }
           });
-          E.attach(P);
+          E.attach(B);
         }), R.Windows?.forEach((T) => {
           const q = e.Windows?.[T];
           if (!q) return;
-          const P = v.createCanvas3D({
+          const P = getValidPolygonShape(q.Polygon, "WINDOW", q.ID);
+          if (!P) return;
+          const B = v.createCanvas3D({
             id: q.ID,
             polygons: [
               {
                 id: `${q.ID}/polygon`,
-                points: convertToPlaneIVector2(q.Polygon.shape),
+                points: convertToPlaneIVector2(P),
                 yHeight: q.Elevation,
                 depth: q.Height,
                 color: randomColor(),
@@ -42745,16 +42753,18 @@ function loadSemanticObjects(v, e) {
               renderType: "WINDOW"
             }
           });
-          E.attach(P);
+          E.attach(B);
         }), R.Columns?.forEach((T) => {
           const q = e.Columns?.[T];
           if (!q) return;
-          const P = v.createCanvas3D({
+          const P = getValidPolygonShape(q.Polygon, "COLUMN", q.ID);
+          if (!P) return;
+          const B = v.createCanvas3D({
             id: q.ID,
             polygons: [
               {
                 id: `${q.ID}/polygon`,
-                points: convertToPlaneIVector2(q.Polygon.shape),
+                points: convertToPlaneIVector2(P),
                 yHeight: q.Elevation,
                 depth: q.Height,
                 color: randomColor(),
@@ -42765,7 +42775,7 @@ function loadSemanticObjects(v, e) {
               renderType: "COLUMN"
             }
           });
-          E.attach(P);
+          E.attach(B);
         }));
       }
     });

package/dist/semantic.types.d.ts

@@ -4,34 +4,28 @@ export interface Building {
     Stories: number[];
 }
 export interface Polygon {
-    shape: number[];
+    shape?: number[];
 }
 export interface Door {
     Elevation: number;
     Height: number;
     ID: string;
     Open: boolean;
-    Polygon: Polygon;
+    Polygon?: Polygon;
     Width: number;
 }
-export interface Polygon {
-    shape: number[];
-}
 export interface Column {
     ID: string;
     Elevation: number;
     Height: number;
-    Polygon: Polygon;
-}
-export interface Polygon {
-    shape: number[];
+    Polygon?: Polygon;
 }
 export interface Space {
     CeilingHeight: number;
     GroundHeight: number;
     ID: string;
     Name: string;
-    Polygon: Polygon;
+    Polygon?: Polygon;
 }
 export interface Staircase {
     Elevation: number;
@@ -39,9 +33,6 @@ export interface Staircase {
     Polyline: number[];
     Spaces: number[];
 }
-export interface Polygon {
-    shape: number[];
-}
 export interface Story {
     Columns?: any[];
     Doors?: number[];
@@ -57,29 +48,23 @@ export interface Story {
     Walls?: number[];
     Windows?: number[];
 }
-export interface Polygon {
-    shape: number[];
-}
 export interface Wall {
     Doors: any[];
     Elevation: number;
     Height: number;
     ID: string;
-    Polygon: Polygon;
+    Polygon?: Polygon;
     Spaces: number[];
     SubPolygons?: any;
     VirtualWall: boolean;
     Windows: any[];
 }
-export interface Polygon {
-    shape: number[];
-}
 export interface Window {
     Elevation: number;
     Height: number;
     ID: string;
     Open: boolean;
-    Polygon: Polygon;
+    Polygon?: Polygon;
     Width: number;
 }
 export interface Asset {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@soonspacejs/plugin-cps-soonmanager",
   "pluginName": "CpsSoonmanagerPlugin",
-  "version": "2.15.6",
+  "version": "2.15.8",
   "description": "Sync cps soonmanager data plugin for SoonSpace.js",
   "main": "dist/index.esm.js",
   "module": "dist/index.esm.js",
@@ -37,14 +37,14 @@
     "socket.io-client": "^4.7.2"
   },
   "peerDependencies": {
-    "@soonspacejs/plugin-atmosphere": "2.15.5",
-    "@soonspacejs/plugin-effect": "2.15.5",
-    "@soonspacejs/plugin-flow": "2.15.5",
-    "@soonspacejs/plugin-gs3d-loader": "2.15.5",
-    "@soonspacejs/plugin-poi-renderer": "2.15.5",
-    "@soonspacejs/plugin-tiles": "2.15.5",
-    "soonspacejs": "2.15.5",
+    "@soonspacejs/plugin-atmosphere": "2.15.8",
+    "@soonspacejs/plugin-effect": "2.15.8",
+    "@soonspacejs/plugin-flow": "2.15.8",
+    "@soonspacejs/plugin-gs3d-loader": "2.15.8",
+    "@soonspacejs/plugin-poi-renderer": "2.15.8",
+    "@soonspacejs/plugin-tiles": "2.15.8",
+    "soonspacejs": "2.15.8",
     "umanager-animation-parser": "^0.0.6",
-    "@soonspacejs/plugin-fds": "2.15.5"
+    "@soonspacejs/plugin-fds": "2.15.8"
   }
 }