@eturnity/eturnity_maths 7.16.0-qa-dev03.4 → 7.16.0-qa-09.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_maths",
-  "version": "7.16.0-qa-dev03.4",
+  "version": "7.16.0-qa-09.0",
   "author": "Eturnity Team",
   "main": "src/index.js",
   "private": false,

package/src/objects/Polygon.js

@@ -1,13 +1,13 @@
 
 import {
-  translate2D,
-  getDegree
+	translate2D,
+	getDegree
 } from '../geometry'
 import {
-  substractVector,
-  normalizeVector,
-  multiplyVector,
-  addVector
+	substractVector,
+	normalizeVector,
+	multiplyVector,
+	addVector
 } from '../vector'
 
 import { v4 as uuidv4 } from 'uuid'
@@ -55,8 +55,15 @@ export class Polygon {
         const secondPoint = this.outline[i % length]
         const thirdPoint = this.outline[(i + 1) % length]
         return getDegree(firstPoint, secondPoint, thirdPoint)
-  }
-  getDirectionSnapAngle(){
+	}
+	getAngleFromTop(i){
+		const length=this.outline.length
+		const firstPoint = {...this.outline[(i-1+length) % length],z:0}
+		const secondPoint = {...this.outline[i % length],z:0}
+		const thirdPoint = {...this.outline[(i + 1) % length],z:0}
+		return getDegree(firstPoint, secondPoint, thirdPoint)
+	}
+	getDirectionSnapAngle(){
     let angles=[]
     for(let k=0;k<this.outline.length;k++){
       let p_0=this.outline[k]
@@ -100,9 +107,74 @@ export class Polygon {
     const E=addVector(B,BE)
     const F=addVector(D,BE)
 
-    return [toCanvasRef(D),toCanvasRef(F),toCanvasRef(E)]
-  }
+		return [toCanvasRef(D),toCanvasRef(F),toCanvasRef(E)]
+	}
   
+<<<<<<< HEAD
+	translate(vectorInMm) {
+		this.version++
+		this.outline = this.outline.map((point) => {
+			return translate2D(point, vectorInMm)
+		})
+		updateComputedGeometryPolygon(this)
+	}
+	serialize() {
+		const baseSerialization = {
+			id: this.id,
+			version: this.version,
+			name: this.name,
+			type: this.type,
+			outline: this.outline.map(p=>{return {
+				x: p.x,
+				y: p.y,
+				z: p.z,
+				selected:p.selected,
+				open:p.open,
+			}
+			}),
+			holes: this.holes.map((p) => p.id),
+			layer: this.layer,
+			highlight: this.highlight,
+			visible: this.visible,
+			margins: {
+				isSameMargin:this.margins.isSameMargin,
+				sameMargin:this.margins.sameMargin,
+				distances:JSON.parse(JSON.stringify(this.margins.distances))
+			}
+		}
+		const extraSerialization = {}
+		if (this.layer == 'roof') {
+			extraSerialization.moduleFields = this.moduleFields.map((m) => {
+				return {
+					id: m.id
+				}
+			})
+		} else if (this.layer == 'obstacle') {
+			extraSerialization.isParallel = this.isParallel
+			extraSerialization.height = this.height
+			extraSerialization.roofs = this.roofs.map((roof) => {
+				return { id: roof.id }
+			})
+		} else if (this.layer == 'moduleField') {
+			const modules=[]
+			if(this.panels){
+				this.panels.forEach((p) => {
+					modules.push({ id: p.id, index: p.index, outline: p.outline, status: p.status || 'active',clipped:p.clipped || false })
+				})
+			}
+			if(this.userDeactivatedPanels){
+				this.userDeactivatedPanels.forEach((p) => {
+					modules.push({ id: p.id, index: p.index, outline: p.outline, status: p.status || 'user_deactivated',clipped:p.clipped || false })
+				})
+			}
+			extraSerialization.data = {...this.data,modules:[...this.data.modules]}
+			extraSerialization.roof = { id: this.roof.id }
+			extraSerialization.pvData = this.pvData?{...this.pvData}:null
+			extraSerialization.mountingData = this.mountingData?{...this.mountingData}:null
+			extraSerialization.modules = modules
+			extraSerialization.needsOptimisation = this.needsOptimisation
+			extraSerialization.priority = this.priority
+=======
   translate(vectorInMm) {
     this.version++
     this.outline = this.outline.map((point) => {
@@ -121,6 +193,7 @@ export class Polygon {
         y: p.y,
         z: p.z,
         selected:p.selected,
+        locked:p.locked,
         open:p.open,
         }
       }),
@@ -166,83 +239,84 @@ export class Polygon {
       extraSerialization.modules = modules
       extraSerialization.needsOptimisation = this.needsOptimisation
       extraSerialization.priority = this.priority
+>>>>>>> qa-dev03-7.16.0
 
-    } else if (this.layer == 'panel') {
-      extraSerialization.index = this.index
-      extraSerialization.moduleField = { id: this.moduleField.id }
-    } else if (this.layer == 'user_deactivated_panel') {
-      extraSerialization.index = this.index
-      extraSerialization.moduleField = { id: this.moduleField.id }
-    }
-    return JSON.parse(JSON.stringify({ ...baseSerialization, ...extraSerialization }))
-  }
-  serializeForBEStorage() {
-    if (this.layer == 'roof') {
-      const margins_roof_mm = this.margins.isSameMargin
-        ? Array(this.outline.length).fill(this.margins.sameMargin)
-        : this.margins.distances
-      return {
-        roof_uuid: this.id,
-        version: this.version,
-        roof_outline: this.outline.map((v) => [v.x, v.y, v.z]),
-        roof_margins_mm: margins_roof_mm,
-        roof_slope_degrees: this.incline,
-        roof_orientation_degrees: this.direction,
-        roof_name: this.name,
-        shading_data: this.shadingData ? this.shadingData : undefined
-      }
-    } else if (this.layer == 'obstacle') {
-      const margins_obstacle_mm = this.margins.isSameMargin
-        ? Array(this.outline.length).fill(this.margins.sameMargin)
-        : this.margins.distances
-      return {
-        obstacle_uuid: this.id,
-        version: this.version,
-        obstacle_outline: this.outline.map((v) => [v.x, v.y, v.z]),
-        obstacle_margins_mm: margins_obstacle_mm,
-        obstacle_height_above_ground_mm: this.height,
-        obstacle_slope_is_parallel_to_roof: this.isParallel
-      }
-    } else if (['moduleField', 'tmpModuleField'].includes(this.layer)) {
-      if (!this.panels) {
-        this.panels = []
-      }
-      if (!this.userDeactivatedPanels) {
-        this.userDeactivatedPanels = []
-      }
-      const modules = this.data.modules
-      return {
-        module_field_uuid: this.id,
-        roof_uuid: this.roof.id,
-        version: this.version,
-        module_field_outline: this.outline.map((v) => [v.x, v.y, v.z]),
-        col_spacing_mm: this.data.col_spacing_mm,
-        row_spacing_mm: this.data.row_spacing_mm,
-        offset_percent: this.data.offset_percent,
-        panel_orientation: this.data.panel_orientation,
-        panel_direction_degrees: this.data.panel_direction_degrees,
-        component_id_pv_module: this.data.component_id_pv_module,
-        component_id_mounting_system: this.data.component_id_mounting_system,
-        modules: modules,
-        module_tilt_degrees: this.data.module_tilt_degrees,
-        base_line_index: this.data.base_line_index,
-        justify_percent: this.data.justify_percent,
+		} else if (this.layer == 'panel') {
+			extraSerialization.index = this.index
+			extraSerialization.moduleField = { id: this.moduleField.id }
+		} else if (this.layer == 'user_deactivated_panel') {
+			extraSerialization.index = this.index
+			extraSerialization.moduleField = { id: this.moduleField.id }
+		}
+		return JSON.parse(JSON.stringify({ ...baseSerialization, ...extraSerialization }))
+	}
+	serializeForBEStorage() {
+		if (this.layer == 'roof') {
+			const margins_roof_mm = this.margins.isSameMargin
+				? Array(this.outline.length).fill(this.margins.sameMargin)
+				: this.margins.distances
+			return {
+				roof_uuid: this.id,
+				version: this.version,
+				roof_outline: this.outline.map((v) => [v.x, v.y, v.z]),
+				roof_margins_mm: margins_roof_mm,
+				roof_slope_degrees: this.incline,
+				roof_orientation_degrees: this.direction,
+				roof_name: this.name,
+				shading_data: this.shadingData ? this.shadingData : undefined
+			}
+		} else if (this.layer == 'obstacle') {
+			const margins_obstacle_mm = this.margins.isSameMargin
+				? Array(this.outline.length).fill(this.margins.sameMargin)
+				: this.margins.distances
+			return {
+				obstacle_uuid: this.id,
+				version: this.version,
+				obstacle_outline: this.outline.map((v) => [v.x, v.y, v.z]),
+				obstacle_margins_mm: margins_obstacle_mm,
+				obstacle_height_above_ground_mm: this.height,
+				obstacle_slope_is_parallel_to_roof: this.isParallel
+			}
+		} else if (['moduleField', 'tmpModuleField'].includes(this.layer)) {
+			if (!this.panels) {
+				this.panels = []
+			}
+			if (!this.userDeactivatedPanels) {
+				this.userDeactivatedPanels = []
+			}
+			const modules = this.data.modules
+			return {
+				module_field_uuid: this.id,
+				roof_uuid: this.roof.id,
+				version: this.version,
+				module_field_outline: this.outline.map((v) => [v.x, v.y, v.z]),
+				col_spacing_mm: this.data.col_spacing_mm,
+				row_spacing_mm: this.data.row_spacing_mm,
+				offset_percent: this.data.offset_percent,
+				panel_orientation: this.data.panel_orientation,
+				panel_direction_degrees: this.data.panel_direction_degrees,
+				component_id_pv_module: this.data.component_id_pv_module,
+				component_id_mounting_system: this.data.component_id_mounting_system,
+				modules: modules,
+				module_tilt_degrees: this.data.module_tilt_degrees,
+				base_line_index: this.data.base_line_index,
+				justify_percent: this.data.justify_percent,
 
-        number_of_panels_override:!!this.data.number_of_panels_override,
-        number_of_panels:this.data.number_of_panels,
-        yearly_yield_manual_entry:this.data.yearly_yield_manual_entry,
-        yearly_yield_kwh_kwp:this.data.yearly_yield_kwh_kwp,
-        yearly_yield_kwh_kwp_2:this.data.yearly_yield_kwh_kwp_2
-      }
-    } else if (['panel', 'user_deactivated_panel'].includes(this.layer)) {
-      return {
-        id: this.id,
-        index: this.index,
-        outline: this.outline.map((v) => [v.x, v.y, v.z]),
-        moduleField: {
-          id: this.moduleField.id
-        }
-      }
-    }
-  }
+				number_of_panels_override:!!this.data.number_of_panels_override,
+				number_of_panels:this.data.number_of_panels,
+				yearly_yield_manual_entry:this.data.yearly_yield_manual_entry,
+				yearly_yield_kwh_kwp:this.data.yearly_yield_kwh_kwp,
+				yearly_yield_kwh_kwp_2:this.data.yearly_yield_kwh_kwp_2
+			}
+		} else if (['panel', 'user_deactivated_panel'].includes(this.layer)) {
+			return {
+				id: this.id,
+				index: this.index,
+				outline: this.outline.map((v) => [v.x, v.y, v.z]),
+				moduleField: {
+					id: this.moduleField.id
+				}
+			}
+		}
+	}
 }