@eturnity/eturnity_maths 7.48.2 → 7.51.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_maths",
-  "version": "7.48.2",
+  "version": "7.51.0",
   "author": "Eturnity Team",
   "main": "src/index.js",
   "private": false,

package/src/geometry.js

@@ -848,19 +848,19 @@ export function groupAdjacentObjects(objects) {
       if (visited.indexOf(currentObjectIndex) == -1) {
         //if next queued index hasn't been visited, we mark it as visited and we collect all neighbourg to queue
         visited.push(currentObjectIndex)
-        let x = objects[currentObjectIndex].index[0]
-        let y = objects[currentObjectIndex].index[1]
+        let x = objects[currentObjectIndex].row_index
+        let y = objects[currentObjectIndex].col_index
         const left = objects.findIndex(
-          (o) => o.index[0] == x - 1 && o.index[1] == y
+          (o) => o.row_index == x - 1 && o.col_index == y
         )
         const right = objects.findIndex(
-          (o) => o.index[0] == x + 1 && o.index[1] == y
+          (o) => o.row_index == x + 1 && o.col_index == y
         )
         const top = objects.findIndex(
-          (o) => o.index[0] == x && o.index[1] == y - 1
+          (o) => o.row_index == x && o.col_index == y - 1
         )
         const bottom = objects.findIndex(
-          (o) => o.index[0] == x && o.index[1] == y + 1
+          (o) => o.row_index == x && o.col_index == y + 1
         )
         if (left != -1 && visited.indexOf(left) == -1) queue.push(left)
         if (right != -1 && visited.indexOf(right) == -1) queue.push(right)
@@ -887,19 +887,19 @@ export function areAdjacent(objects) {
     if (visited.indexOf(currentObjectIndex) == -1) {
       //if next queued index hasn't been visited, we mark it as visited and we collect all neighbourg to queue
       visited.push(currentObjectIndex)
-      let x = objects[currentObjectIndex].index[0]
-      let y = objects[currentObjectIndex].index[1]
+      let x = objects[currentObjectIndex].row_index
+      let y = objects[currentObjectIndex].col_index
       const left = objects.findIndex(
-        (o) => o.index[0] == x - 1 && o.index[1] == y
+        (o) => o.row_index == x - 1 && o.col_index == y
       )
       const right = objects.findIndex(
-        (o) => o.index[0] == x + 1 && o.index[1] == y
+        (o) => o.row_index == x + 1 && o.col_index == y
       )
       const top = objects.findIndex(
-        (o) => o.index[0] == x && o.index[1] == y - 1
+        (o) => o.row_index == x && o.col_index == y - 1
       )
       const bottom = objects.findIndex(
-        (o) => o.index[0] == x && o.index[1] == y + 1
+        (o) => o.row_index == x && o.col_index == y + 1
       )
       if (left != -1 && visited.indexOf(left) == -1) queue.push(left)
       if (right != -1 && visited.indexOf(right) == -1) queue.push(right)

package/src/objects/Polygon.js

@@ -38,8 +38,7 @@ export class Polygon {
     this.angleOffset = 0
     if (this.layer == 'obstacle') {
       this.isParallel = true
-    }
-    if (this.layer == 'roof') {
+    } else if (this.layer == 'roof') {
       this.moduleFields = []
     }
   }
@@ -244,7 +243,8 @@ export class Polygon {
         this.panels.forEach((p) => {
           modules.push({
             id: p.id,
-            index: p.index,
+            row_index: p.row_index,
+            col_index: p.col_index,
             outline: p.outline,
             status: p.status || 'active',
             clipped: p.clipped || false,
@@ -255,7 +255,8 @@ export class Polygon {
         this.userDeactivatedPanels.forEach((p) => {
           modules.push({
             id: p.id,
-            index: p.index,
+            row_index: p.row_index,
+            col_index: p.col_index,
             outline: p.outline,
             status: p.status || 'user_deactivated',
             clipped: p.clipped || false,
@@ -275,10 +276,12 @@ export class Polygon {
       extraSerialization.needsOptimisation = this.needsOptimisation
       extraSerialization.priority = this.priority
     } else if (this.layer == 'panel') {
-      extraSerialization.index = this.index
+      extraSerialization.row_index = this.row_index
+      extraSerialization.col_index = this.col_index
       extraSerialization.moduleField = { id: this.moduleField.id }
     } else if (this.layer == 'user_deactivated_panel') {
-      extraSerialization.index = this.index
+      extraSerialization.row_index = this.row_index
+      extraSerialization.col_index = this.col_index
       extraSerialization.moduleField = { id: this.moduleField.id }
     }
     return JSON.parse(
@@ -348,7 +351,8 @@ export class Polygon {
     } else if (['panel', 'user_deactivated_panel'].includes(this.layer)) {
       return {
         id: this.id,
-        index: this.index,
+        row_index: this.row_index,
+        col_index: this.col_index,
         outline: this.outline.map((v) => [v.x, v.y, v.z]),
         moduleField: {
           id: this.moduleField.id,

package/src/objects/hydrate.js

@@ -16,10 +16,12 @@ export function hydratePolygon(serializedPolygon) {
     polygon.panels = []
     polygon.userDeactivatedPanels = []
   } else if (layer == 'panel') {
-    polygon.index = serializedPolygon.index
+    polygon.row_index = serializedPolygon.row_index
+    polygon.col_index = serializedPolygon.col_index
     polygon.moduleField = serializedPolygon.moduleField
   } else if (layer == 'user_deactivated_panel') {
-    polygon.index = serializedPolygon.index
+    polygon.row_index = serializedPolygon.row_index
+    polygon.col_index = serializedPolygon.col_index
     polygon.moduleField = serializedPolygon.moduleField
   }
   return polygon