@things-factory/scene-visualizer 4.3.755 → 4.3.764

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@things-factory/scene-visualizer",
   "description": "The visualizer component for things-scene.",
-  "version": "4.3.755",
+  "version": "4.3.764",
   "things-scene": true,
   "browser": "src/index.js",
   "author": "heartyoh",
@@ -19,5 +19,5 @@
     "lit": "^2.2.0",
     "three": "^0.122.0"
   },
-  "gitHead": "7cd08ee86623f4ab057bd7bbc63f0f2d1be6659b"
+  "gitHead": "4dd8055a25e773814603c4be21fc70930d0cfb13"
 }

package/src/stock.js

@@ -29,7 +29,8 @@ export default class Stock extends Mesh {
         this._visualizer.legendTarget &&
         this._visualizer.legendTarget.get('status')
       )
-    ) return this.userDefineDefaultMaterial
+    )
+      return this.userDefineDefaultMaterial
 
     var stockStatus = this._visualizer.legendTarget.get('status')
     var range = stockStatus.ranges[index]
@@ -42,9 +43,9 @@ export default class Stock extends Mesh {
         roughness: 0.7
       })
     }
-    
-    var alpha=range.color.replace(/^.*,(.+)\)/,'$1')
-    if(alpha>0 && alpha<1){
+
+    var alpha = range.color.replace(/^.*,(.+)\)/, '$1')
+    if (alpha > 0 && alpha < 1) {
       this.stockMaterials[index].opacity = alpha
       this.stockMaterials[index].transparent = true
     }
@@ -86,8 +87,8 @@ export default class Stock extends Mesh {
         side: THREE.FrontSide,
         roughness: 0.7
       })
-      var alpha=defaultColor.replace(/^.*,(.+)\)/,'$1')
-      if(alpha>0 && alpha<1){
+      var alpha = defaultColor.replace(/^.*,(.+)\)/, '$1')
+      if (alpha > 0 && alpha < 1) {
         this._visualizer._default_material.opacity = alpha
         this._visualizer._default_material.transparent = true
       }
@@ -111,11 +112,11 @@ export default class Stock extends Mesh {
       this._visualizer._empty_material = new THREE.MeshStandardMaterial({
         color: defaultColor
       })
-      var alpha=defaultColor.replace(/^.*,(.+)\)/,'$1')
-      if(alpha>0 && alpha<1){
+      var alpha = defaultColor.replace(/^.*,(.+)\)/, '$1')
+      if (alpha > 0 && alpha < 1) {
         this._visualizer._empty_material.opacity = alpha
         this._visualizer._empty_material.transparent = true
-      }else{
+      } else {
         this._visualizer._empty_material.opacity = 0.33
         this._visualizer._empty_material.transparent = true
       }
@@ -176,41 +177,58 @@ export default class Stock extends Mesh {
 
     if (!(statusField && ranges)) return
 
-    var data = (this.userData.items ? this.userData.items : [this.userData]).slice(0, 1)
-
-    for (let i in data) {
-      let d = data[i]
+    var data = this.userData.items ? this.userData.items : [this.userData]
 
-      var status = d[statusField]
+    // statusField 값들을 수집하고 유효한 값만 필터링
+    var statusValues = data
+      .map(d => d[statusField])
+      .filter(value => value !== undefined && value !== null && !isNaN(value))
 
-      if (status == undefined) {
-        // this.visible = !this._hideEmptyStock;
-        this.material = this._hideEmptyStock ? this.emptyMaterial : this.userDefineDefaultMaterial
-        return
-      }
+    // 유효한 값이 없으면 기본 material 사용
+    if (statusValues.length === 0) {
+      this.material = this._hideEmptyStock ? this.emptyMaterial : this.userDefineDefaultMaterial
+      return
+    }
 
-      var isInRanges = ranges.some((range, index) => {
-        let { min, max } = range
+    // aggregation 방법으로 계산 (기본값: sum)
+    var aggregation = stockStatus.aggregation || 'sum'
+    var calculatedStatus = this.calculateAggregation(statusValues, aggregation)
 
-        min = Number(min) || min
-        max = Number(max) || max
+    // 계산된 값으로 range 매칭
+    var isInRanges = ranges.some((range, index) => {
+      let { min, max } = range
 
-        if (max > status) {
-          if (min !== undefined) {
-            if (min <= status) {
-              this.material = this.getMaterial(index)
-            } else return false
-          } else this.material = this.getMaterial(index)
+      min = min !== undefined ? Number(min) : -Infinity
+      max = max !== undefined ? Number(max) : Infinity
 
-          // this.visible = true;
-          return true
-        } else {
-          this.material = this._hideEmptyStock ? this.emptyMaterial : this.userDefineDefaultMaterial
-        }
-      })
-      if(!isInRanges){
-        this.material = this.userDefineDefaultMaterial
+      if (min <= calculatedStatus && calculatedStatus < max) {
+        this.material = this.getMaterial(index)
+        return true
       }
+    })
+
+    if (!isInRanges) {
+      this.material = this._hideEmptyStock ? this.emptyMaterial : this.userDefineDefaultMaterial
+    }
+  }
+
+  calculateAggregation(values, method) {
+    if (!values || values.length === 0) return 0
+
+    var numericValues = values.map(v => Number(v)).filter(v => !isNaN(v))
+
+    switch (method) {
+      case 'sum':
+        return numericValues.reduce((sum, val) => sum + val, 0)
+      case 'min':
+        return Math.min(...numericValues)
+      case 'max':
+        return Math.max(...numericValues)
+      case 'avg':
+        return numericValues.reduce((sum, val) => sum + val, 0) / numericValues.length
+      default:
+        // 기본값은 sum
+        return numericValues.reduce((sum, val) => sum + val, 0)
     }
   }