Merge fa26de3 into f1a2063

MaslowCNC · Jan 24, 2020 · 132c18a · 132c18a
2 parents f1a2063 + fa26de3
commit 132c18a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/dist/maslowWorker.js b/dist/maslowWorker.js
@@ -138164,11 +138164,11 @@ return d[d.length-1];};return ", funcName].join("");
           return Shape.fromGeometry(values[0]).as(values[1]).toDisjointGeometry();
         case 'specify':
           console.log(Shape.fromGeometry(values[0]));
-          return Shape.fromGeometry(values[0]).item([values[1]]).toDisjointGeometry();
+          return Shape.fromGeometry(values[0]).Item(values[1]).toDisjointGeometry();
         case 'translate':
           return Shape.fromGeometry(values[0]).move(values[1], values[2], values[3]).toDisjointGeometry();
         case 'getBOM':
-          return Shape.fromGeometry(values[0]).toBillOfMaterial();
+          return Shape.fromGeometry(values[0]).bom();
         case 'union':
           return union$5(Shape.fromGeometry(values[0]), Shape.fromGeometry(values[1])).toDisjointGeometry();
         default:

diff --git a/src/js/BOM.js b/src/js/BOM.js
@@ -17,7 +17,7 @@ export class BOMEntry {
          * The number of this item needed.
          * @type {number}
          */
-        this.numberNeeded = 0
+        this.numberNeeded = 1
         /** 
          * The cost of one of this item in USD.
          * @type {number}
@@ -48,9 +48,12 @@ export const extractBomTags = async(geometry) => {
 
     if (result != -1 ){
         //Filter for only bomItems
-        bomItems = result.filter(item => {return item.substring(5, 12) == "BOMitem"})
-        bomItems = bomItems.map(JSON.parse)
+        bomItems = result.filter(item => {
+            return item[0].substring(2, 13) == "BOMitemName"
+        })
+
         bomItems = bomItems.map(JSON.parse)
+        //bomItems = bomItems.map(JSON.parse)
 
         //Consolidate similar items into a single item
         var compiledArray = []