@eturnity/eturnity_3d 9.37.0 → 9.40.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eturnity/eturnity_3d",
   "private": false,
-  "version": "9.37.0",
+  "version": "9.40.0",
   "files": [
     "dist",
     "src"
@@ -17,7 +17,7 @@
     "merge-remote-master": "node scripts/merge-remote-master.js"
   },
   "dependencies": {
-    "@eturnity/eturnity_maths": "9.37.0",
+    "@eturnity/eturnity_maths": "9.40.0",
     "@originjs/vite-plugin-commonjs": "1.0.3",
     "core-js": "3.30.2",
     "cors": "2.8.5",

package/src/helper/UpdateRoofModuleFieldRelations.js

@@ -120,6 +120,47 @@ export function updateModuleFieldFittingPanels(moduleField) {
   }
 }
 
+// Guarded variant of updateModuleFieldFittingPanels used by the new panel
+// placement engine: preserves the current visibility, tolerates fields without
+// panels/roof/margins, and skips the fitting_panel_area_m2 check.
+export function clipModuleFieldFittingPanels(moduleField) {
+  const prevVisible = moduleField?.fittingPanels?.visible
+  delete moduleField.fittingPanels
+  if (!moduleField?.panels?.length) return
+  if (!moduleField?.roof || !moduleField.data?.has_fitting_panels) return
+  const innerOutline = moduleField.roof.margins?.innerOutline
+  if (!innerOutline?.length) return
+
+  const outlines = getModuleFieldRoofIntersections(moduleField, innerOutline)
+  if (!outlines?.length) return
+  const holes = getModuleFieldHoleOutlines(moduleField)
+  const polygons = []
+
+  outlines.forEach((outline) => {
+    polygons.push({
+      outline,
+      // Clean up holes outside of the outline
+      holes: holes
+        .flatMap((hole) => intersectOutlines(hole, outline))
+        .filter(Boolean),
+    })
+  })
+  if (!polygons.length) return
+
+  const hasCustomTexture = !!moduleField.pvData?.texture_img_url
+  const defaultTextureIndex = moduleField.pvData?.module_texture_version_id || 0
+  const color = hasCustomTexture
+    ? moduleField.pvData?.backsheet_color
+    : defaultTextureColorMap[defaultTextureIndex]
+  const mappedColor = fittingPanelsColorMap[color || 'default']
+
+  moduleField.fittingPanels = {
+    polygons,
+    visible: prevVisible !== false,
+    color: mappedColor,
+  }
+}
+
 export function getRoofInnerMarginOutline({
   roof,
   moduleField,

package/src/helper/clipModuleFieldFittingPanels.spec.js

@@ -0,0 +1,81 @@
+import {
+  clipModuleFieldFittingPanels,
+  updateModuleFieldFittingPanels,
+} from './UpdateRoofModuleFieldRelations'
+
+function rect(x, y, width, height) {
+  return [
+    { x, y, z: 0 },
+    { x: x + width, y, z: 0 },
+    { x: x + width, y: y + height, z: 0 },
+    { x, y: y + height, z: 0 },
+  ]
+}
+
+function buildModuleField({ data = { has_fitting_panels: true } } = {}) {
+  const roof = {
+    id: 'roof-1',
+    normalVector: { x: 0, y: 0, z: 1 },
+    flatOutline: [{ x: 0, y: 0, z: 0 }],
+    margins: { innerOutline: rect(0, 0, 10000, 10000) },
+    holes: [],
+    moduleFields: [],
+  }
+  return {
+    id: 'mf-1',
+    layer: 'moduleField',
+    outline: rect(1000, 1000, 4000, 4000),
+    roof,
+    panels: [{ id: 'panel-1' }],
+    data,
+    pvData: {},
+    priority: 0,
+  }
+}
+
+describe('clipModuleFieldFittingPanels', () => {
+  test('builds fitting panels clipped to the roof inner outline', () => {
+    const moduleField = buildModuleField()
+    clipModuleFieldFittingPanels(moduleField)
+    expect(moduleField.fittingPanels).toBeDefined()
+    expect(moduleField.fittingPanels.polygons.length).toBeGreaterThan(0)
+    expect(moduleField.fittingPanels.visible).toBe(true)
+  })
+
+  test('preserves an explicitly hidden visibility across rebuilds', () => {
+    const moduleField = buildModuleField()
+    clipModuleFieldFittingPanels(moduleField)
+    moduleField.fittingPanels.visible = false
+    clipModuleFieldFittingPanels(moduleField)
+    expect(moduleField.fittingPanels.visible).toBe(false)
+  })
+
+  test('removes fitting panels for a field without panels', () => {
+    const moduleField = buildModuleField()
+    moduleField.fittingPanels = { polygons: [], visible: true }
+    moduleField.panels = []
+    clipModuleFieldFittingPanels(moduleField)
+    expect(moduleField.fittingPanels).toBeUndefined()
+  })
+
+  test('tolerates a field without roof or fitting-panel data', () => {
+    const noRoof = buildModuleField()
+    noRoof.roof = null
+    expect(() => clipModuleFieldFittingPanels(noRoof)).not.toThrow()
+    expect(noRoof.fittingPanels).toBeUndefined()
+
+    const noData = buildModuleField({ data: { has_fitting_panels: false } })
+    clipModuleFieldFittingPanels(noData)
+    expect(noData.fittingPanels).toBeUndefined()
+  })
+
+  test('does not require fitting_panel_area_m2, unlike the legacy builder', () => {
+    const clipped = buildModuleField()
+    clipModuleFieldFittingPanels(clipped)
+    expect(clipped.fittingPanels).toBeDefined()
+
+    const legacy = buildModuleField()
+    updateModuleFieldFittingPanels(legacy)
+    expect(legacy.fittingPanels).toBeUndefined()
+  })
+})