kitchen-simulator 1.1.1-test.54 → 1.1.1-test.55

package/lib/utils/geometry.js

@@ -96,13 +96,12 @@ exports.verticesDistance = verticesDistance;
 exports.verticesMidPoint = verticesMidPoint;
 var _math = require("./math.js");
 var _constants = require("../constants");
-var _convertUnits = _interopRequireDefault(require("convert-units"));
+var _convertUnitsLite = require("./convert-units-lite");
 var Three = _interopRequireWildcard(require("three"));
 var _utils = require("../components/viewer2d/utils.js");
 var _helper = require("./helper.js");
 var _export = require("./export.js");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
@@ -780,9 +779,9 @@ function getAllItems(scene, catalog, allLineRects) {
       layoutpos: cat && cat.info.layoutpos,
       is_corner: cat && cat.info.is_corner
     });
-    width = (0, _convertUnits["default"])(sizeinfo.width).from(sizeinfo.widthUnit).to(scene.unit);
-    height = (0, _convertUnits["default"])(sizeinfo.depth).from(sizeinfo.depthUnit).to(scene.unit);
-    depth = (0, _convertUnits["default"])(sizeinfo.height).from(sizeinfo.heightUnit).to(scene.unit);
+    width = (0, _convertUnitsLite.convert)(sizeinfo.width).from(sizeinfo.widthUnit).to(scene.unit);
+    height = (0, _convertUnitsLite.convert)(sizeinfo.depth).from(sizeinfo.depthUnit).to(scene.unit);
+    depth = (0, _convertUnitsLite.convert)(sizeinfo.height).from(sizeinfo.heightUnit).to(scene.unit);
     val.size = {
       width: width,
       height: height,
@@ -841,7 +840,7 @@ function getAllItemSpecified(scene, catalog, filter) {
     var getSize = function getSize(key) {
       var _props$getIn;
       var length = props === null || props === void 0 || (_props$getIn = props.getIn) === null || _props$getIn === void 0 ? void 0 : _props$getIn.call(props, [key, '_length']);
-      return length != null ? (0, _convertUnits["default"])(length).from('in').to(scene.unit) : 0;
+      return length != null ? (0, _convertUnitsLite.convert)(length).from('in').to(scene.unit) : 0;
     };
     val.size = {
       width: getSize('width'),
@@ -1717,7 +1716,7 @@ function calcSnap2(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect,
   //Check case.
   //If item is 'blind base cabinet', it must be pulled from other 3".
   if (allItemRect.cur && allItemRect.cur.itemInfo.sku_number.startsWith('BBC')) {
-    var offset3inch = (0, _convertUnits["default"])(3).from('in').to('cm');
+    var offset3inch = (0, _convertUnitsLite.convert)(3).from('in').to('cm');
     var tx = nx,
       ty = ny;
     if (allItemRect.cur && allItemRect.cur.itemInfo.sku_number.endsWith('-L')) {
@@ -2070,14 +2069,14 @@ function needSnap(curItem, othItem) {
   var blSnap = false;
   if (curItem == undefined || curItem == null) return false;
   var altitude = curItem.selectedItem.properties.get('altitude');
-  var heightFromFloor = (0, _convertUnits["default"])(altitude.get('_length')).from(altitude.get('_unit')).to('in');
+  var heightFromFloor = (0, _convertUnitsLite.convert)(altitude.get('_length')).from(altitude.get('_unit')).to('in');
   var height = curItem.cat.info.sizeinfo.height;
   var currentItem = {
     heightFromFloor: heightFromFloor,
     height: height
   };
   altitude = othItem.item.properties.get('altitude');
-  heightFromFloor = (0, _convertUnits["default"])(altitude.get('_length')).from(altitude.get('_unit')).to('in');
+  heightFromFloor = (0, _convertUnitsLite.convert)(altitude.get('_length')).from(altitude.get('_unit')).to('in');
   height = othItem.cat && othItem.cat.info.sizeinfo.height;
   var otherItem = {
     heightFromFloor: heightFromFloor,
@@ -2138,7 +2137,7 @@ function isRightWall(v0, v1) {
  * OVERLAP_LINK: two lines are linked at the common point, so they can be merged to one line
  * OVERLAP_INCLUDED: destLine includes srcLine
  * OVERLAP_SOME: two lines are overlapped with some common range, then returns the trimmed segments of srcLine
- * 
+ *
  *  //////// test - start /////////////
     const p1 = { x1: 1413.1313131313132, y1: 1044.949494949495 };
     const p2 = { x1: 1476.2626262626263, y1: 1108.0808080808079 };

package/lib/utils/helper.js

@@ -23,9 +23,8 @@ var _HDRCubeTextureLoader = require("three/examples/jsm/loaders/HDRCubeTextureLo
 var _constants = require("../constants");
 var Three = _interopRequireWildcard(require("three"));
 var _utils = require("./../components/viewer2d/utils");
-var _convertUnits = _interopRequireDefault(require("convert-units"));
+var _convertUnitsLite = require("./convert-units-lite");
 var _math = require("./math");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -89,9 +88,9 @@ var refineProductForSummaryPdf = exports.refineProductForSummaryPdf = function r
       thumbnail: review.img,
       sku: itemSKU,
       sizeInfo: {
-        width: Math.round((0, _convertUnits["default"])(review.info.sizeinfo.width).from('in').to(measurementUnit._unit) * 100) / 100,
-        depth: Math.round((0, _convertUnits["default"])(review.info.sizeinfo.depth).from('in').to(measurementUnit._unit) * 100) / 100,
-        height: Math.round((0, _convertUnits["default"])(review.info.sizeinfo.height).from('in').to(measurementUnit._unit) * 100) / 100,
+        width: Math.round((0, _convertUnitsLite.convert)(review.info.sizeinfo.width).from('in').to(measurementUnit._unit) * 100) / 100,
+        depth: Math.round((0, _convertUnitsLite.convert)(review.info.sizeinfo.depth).from('in').to(measurementUnit._unit) * 100) / 100,
+        height: Math.round((0, _convertUnitsLite.convert)(review.info.sizeinfo.height).from('in').to(measurementUnit._unit) * 100) / 100,
         _unit: measurementUnit._unit
       },
       doorstyle: doorStyleName,
@@ -207,7 +206,7 @@ var animateDoor = exports.animateDoor = function animateDoor(offsetData, doorObj
 
 // Opening or Closing the drawer action
 var translateDrawer = exports.translateDrawer = function translateDrawer(item, drawerObj, open_doors, mode) {
-  var animate_translate_unit = (0, _convertUnits["default"])(item.properties.depth._length).from(item.properties.depth._unit).to('cm') * (1 / 2) / _constants.ANIMATE_STEP_MAX * 0.01;
+  var animate_translate_unit = (0, _convertUnitsLite.convert)(item.properties.depth._length).from(item.properties.depth._unit).to('cm') * (1 / 2) / _constants.ANIMATE_STEP_MAX * 0.01;
   // Check whether the object's drawer is opened in 2D.
   if (mode === 'Opened2D') animate_translate_unit *= _constants.ANIMATE_STEP_MAX;
   drawerObj.translateZ(open_doors ? -animate_translate_unit : animate_translate_unit);
@@ -270,7 +269,7 @@ function isCeilLimitation(layer, ceilHeight, ceilUnit) {
     var heightUnit = item.properties.getIn(['height', '_unit']);
     var altitude = item.properties.getIn(['altitude', '_length']);
     var altitudeUnit = item.properties.getIn(['altitude', '_unit']);
-    var totalHeight = (0, _convertUnits["default"])(height).from(heightUnit).to(ceilUnit._unit) + (0, _convertUnits["default"])(altitude).from(altitudeUnit).to(ceilUnit._unit);
+    var totalHeight = (0, _convertUnitsLite.convert)(height).from(heightUnit).to(ceilUnit._unit) + (0, _convertUnitsLite.convert)(altitude).from(altitudeUnit).to(ceilUnit._unit);
     return totalHeight > ceilHeight;
   });
 }

package/lib/utils/molding.js

@@ -23,7 +23,7 @@ exports.sortItemsByDistance = sortItemsByDistance;
 exports.tryMergeMDItem = tryMergeMDItem;
 var _constants = require("../constants");
 var Three = _interopRequireWildcard(require("three"));
-var _convertUnits = _interopRequireDefault(require("convert-units"));
+var _convertUnitsLite = require("./convert-units-lite");
 var _idBroker = _interopRequireDefault(require("./id-broker"));
 var _utils = require("../components/viewer2d/utils");
 var _export = require("./export");
@@ -48,10 +48,10 @@ function getItemRect(item) {
   var rotRad = item.rotation / 180 * Math.PI;
   var itemWidth = item.properties.get('width').get('_length');
   var itemWidthUnit = item.properties.get('width').get('_unit') || 'cm';
-  itemWidth = (0, _convertUnits["default"])(itemWidth / 2).from(itemWidthUnit).to('cm');
+  itemWidth = (0, _convertUnitsLite.convert)(itemWidth / 2).from(itemWidthUnit).to('cm');
   var itemDepth = item.properties.get('depth').get('_length');
   var itemDepthUnit = item.properties.get('depth').get('_unit') || 'cm';
-  itemDepth = (0, _convertUnits["default"])(itemDepth / 2).from(itemDepthUnit).to('cm');
+  itemDepth = (0, _convertUnitsLite.convert)(itemDepth / 2).from(itemDepthUnit).to('cm');
   var mx = x - itemWidth * Math.cos(rotRad);
   var my = y - itemWidth * Math.sin(rotRad);
   var x0 = mx + itemDepth * Math.sin(rotRad);
@@ -93,16 +93,16 @@ function isEnableItemForMolding(layer, selItem) {
   else return result && hasMoldingLayout(molding, selItem.layoutpos);
 }
 
-/**
- * Check two line segments are overlap. The direction of the two line segments must be opposite.
- * s1       c2     s2          c1
- * |--------|------|-----------|
- * Decision Formular: L(s1,c1) + L(s2, c2) = L(s1, s2) + L(c1, c2)
- * @param {*} selRectPos1
- * @param {*} selRectPos2
- * @param {*} curRectPos1
- * @param {*} curRectPos2
- * @returns L(s1,c1) + L(s2, c2) - L(s1, s2) - L(c1, c2)
+/**
+ * Check two line segments are overlap. The direction of the two line segments must be opposite.
+ * s1       c2     s2          c1
+ * |--------|------|-----------|
+ * Decision Formular: L(s1,c1) + L(s2, c2) = L(s1, s2) + L(c1, c2)
+ * @param {*} selRectPos1
+ * @param {*} selRectPos2
+ * @param {*} curRectPos1
+ * @param {*} curRectPos2
+ * @returns L(s1,c1) + L(s2, c2) - L(s1, s2) - L(c1, c2)
  */
 function getDelta(selRectPos1, selRectPos2, curRectPos1, curRectPos2) {
   return (
@@ -142,16 +142,16 @@ function isSameMoldingLayoutpos(curItem, item) {
 function isItemSameItemByLocation(item1, item2, location) {
   var item1Altitude = item1.properties.get('altitude').get('_length');
   var item1AltitudeUnit = item1.properties.get('altitude').get('_unit');
-  item1Altitude = (0, _convertUnits["default"])(item1Altitude).from(item1AltitudeUnit).to('cm');
+  item1Altitude = (0, _convertUnitsLite.convert)(item1Altitude).from(item1AltitudeUnit).to('cm');
   var item1Height = item1.properties.get('height').get('_length');
   var item1HeightUnit = item1.properties.get('height').get('_unit');
-  item1Height = (0, _convertUnits["default"])(item1Height).from(item1HeightUnit).to('cm');
+  item1Height = (0, _convertUnitsLite.convert)(item1Height).from(item1HeightUnit).to('cm');
   var item2Altitude = item2.properties.get('altitude').get('_length');
   var item2AltitudeUnit = item2.properties.get('altitude').get('_unit');
-  item2Altitude = (0, _convertUnits["default"])(item2Altitude).from(item2AltitudeUnit).to('cm');
+  item2Altitude = (0, _convertUnitsLite.convert)(item2Altitude).from(item2AltitudeUnit).to('cm');
   var item2Height = item2.properties.get('height').get('_length');
   var item2HeightUnit = item2.properties.get('height').get('_unit');
-  item2Height = (0, _convertUnits["default"])(item2Height).from(item2HeightUnit).to('cm');
+  item2Height = (0, _convertUnitsLite.convert)(item2Height).from(item2HeightUnit).to('cm');
   var flag = false;
   switch (location) {
     case _constants.TOP_MOLDING_LOCATION:
@@ -192,11 +192,11 @@ function tryMergeItemWithLocation(curItem, itemGroup, location) {
   });
 }
 
-/**
- * Make the molding group array with [items].
- * @param {*} layer
- * @param {*} items - Mergable snapped item group, if [items] is null then get all MG array of layer
- * @returns MG array
+/**
+ * Make the molding group array with [items].
+ * @param {*} layer
+ * @param {*} items - Mergable snapped item group, if [items] is null then get all MG array of layer
+ * @returns MG array
  */
 function getAllMoldingGroups(layer) {
   var items = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
@@ -268,10 +268,10 @@ function getLinesOfItem(item, allLineRects, catalog) {
   // get edge lines
   var newWidth = item.properties.get('width').get('_length');
   var wUnit = item.properties.get('width').get('_unit') || 'cm';
-  newWidth = (0, _convertUnits["default"])(newWidth).from(wUnit).to('cm');
+  newWidth = (0, _convertUnitsLite.convert)(newWidth).from(wUnit).to('cm');
   var newDepth = item.properties.get('depth').get('_length');
   var hUnit = item.properties.get('depth').get('_unit') || 'cm';
-  newDepth = (0, _convertUnits["default"])(newDepth).from(hUnit).to('cm');
+  newDepth = (0, _convertUnitsLite.convert)(newDepth).from(hUnit).to('cm');
   if (item) {
     // Get Outline Data of Selected Item
     outline = element.info.outline;
@@ -371,12 +371,12 @@ function mergeOverlappedLines(line1, line2) {
   }
 }
 
-/**
- * Get the contour line array of moldingGroup items
- * @param {*} moldingGroup
- * @param {*} layer
- * @param {*} catalog
- * @returns contour line array of moldingGroup items
+/**
+ * Get the contour line array of moldingGroup items
+ * @param {*} moldingGroup
+ * @param {*} layer
+ * @param {*} catalog
+ * @returns contour line array of moldingGroup items
  */
 function getLinesFromItems2(moldingGroup, layer, catalog) {
   // wall lines
@@ -393,10 +393,10 @@ function getLinesFromItems2(moldingGroup, layer, catalog) {
       var itemLines = getLinesOfItem(item, allLineRects, catalog);
       var itemAltitude = item.properties.get('altitude').get('_length');
       var itemAltitudeUnit = item.properties.get('altitude').get('_unit');
-      itemAltitude = (0, _convertUnits["default"])(itemAltitude).from(itemAltitudeUnit).to('cm');
+      itemAltitude = (0, _convertUnitsLite.convert)(itemAltitude).from(itemAltitudeUnit).to('cm');
       var itemHeight = item.properties.get('height').get('_length');
       var itemHeightUnit = item.properties.get('height').get('_unit');
-      itemHeight = (0, _convertUnits["default"])(itemHeight).from(itemHeightUnit).to('cm');
+      itemHeight = (0, _convertUnitsLite.convert)(itemHeight).from(itemHeightUnit).to('cm');
       itemLines.forEach(function (line) {
         line.push({
           altitude: itemAltitude,
@@ -412,10 +412,10 @@ function getLinesFromItems2(moldingGroup, layer, catalog) {
   items.forEach(function (item) {
     var itemAltitude = item.properties.get('altitude').get('_length');
     var itemAltitudeUnit = item.properties.get('altitude').get('_unit');
-    itemAltitude = (0, _convertUnits["default"])(itemAltitude).from(itemAltitudeUnit).to('cm');
+    itemAltitude = (0, _convertUnitsLite.convert)(itemAltitude).from(itemAltitudeUnit).to('cm');
     var itemHeight = item.properties.get('height').get('_length');
     var itemHeightUnit = item.properties.get('height').get('_unit');
-    itemHeight = (0, _convertUnits["default"])(itemHeight).from(itemHeightUnit).to('cm');
+    itemHeight = (0, _convertUnitsLite.convert)(itemHeight).from(itemHeightUnit).to('cm');
     var itemLines = getLinesOfItem(item, allLineRects, catalog);
 
     // remove the edge that overlapped with other snapped items
@@ -531,13 +531,13 @@ function getLinesFromItems2(moldingGroup, layer, catalog) {
   return newMGlines;
 }
 
-/**
- * Get the line that colinear linked with [line], and merge them to a new line
- * @param {*} line
- * @param {*} MGlines
- * @returns
- *  - returns merged new line
- *  - returns filtered new line group (remove linked line from [MGlines])
+/**
+ * Get the line that colinear linked with [line], and merge them to a new line
+ * @param {*} line
+ * @param {*} MGlines
+ * @returns
+ *  - returns merged new line
+ *  - returns filtered new line group (remove linked line from [MGlines])
  */
 function getMergedLine(line, MGlines, cnt) {
   try {
@@ -590,11 +590,11 @@ function getMergedLine(line, MGlines, cnt) {
   }
 }
 
-/**
- * Get the contour line segments from [lineSegs]
- * @param {*} lineSegs
- * @param {*} otherLines
- * @returns
+/**
+ * Get the contour line segments from [lineSegs]
+ * @param {*} lineSegs
+ * @param {*} otherLines
+ * @returns
  */
 function getTrimmedContourLineSegs(lineSegs, otherLines, cnt) {
   try {
@@ -692,16 +692,16 @@ function getLinesFromItems(moldingGroup, layer, catalog) {
   snapped_other_items.forEach(function (item) {
     var itemAltitude = item.properties.get('altitude').get('_length');
     var itemAltitudeUnit = item.properties.get('altitude').get('_unit');
-    itemAltitude = (0, _convertUnits["default"])(itemAltitude).from(itemAltitudeUnit).to('cm');
+    itemAltitude = (0, _convertUnitsLite.convert)(itemAltitude).from(itemAltitudeUnit).to('cm');
     var itemHeight = item.properties.get('height').get('_length');
     var itemHeightUnit = item.properties.get('height').get('_unit');
-    itemHeight = (0, _convertUnits["default"])(itemHeight).from(itemHeightUnit).to('cm');
+    itemHeight = (0, _convertUnitsLite.convert)(itemHeight).from(itemHeightUnit).to('cm');
     var mgroupAltitude = items[0].properties.get('altitude').get('_length');
     var mgroupAltitudeUnit = items[0].properties.get('altitude').get('_unit');
-    mgroupAltitude = (0, _convertUnits["default"])(mgroupAltitude).from(mgroupAltitudeUnit).to('cm');
+    mgroupAltitude = (0, _convertUnitsLite.convert)(mgroupAltitude).from(mgroupAltitudeUnit).to('cm');
     var mgroupHeight = items[0].properties.get('height').get('_length');
     var mgroupHeightUnit = items[0].properties.get('height').get('_unit');
-    mgroupHeight = (0, _convertUnits["default"])(mgroupHeight).from(mgroupHeightUnit).to('cm');
+    mgroupHeight = (0, _convertUnitsLite.convert)(mgroupHeight).from(mgroupHeightUnit).to('cm');
     var flag = false;
     switch (moldingGroup.location_type) {
       case _constants.TOP_MOLDING_LOCATION:
@@ -860,10 +860,10 @@ function getMDPoints(newMD) {
   }
   var z = newMD.items[0].properties.get('altitude').get('_length');
   var zUnit = newMD.items[0].properties.get('altitude').get('_unit') || 'cm';
-  z = (0, _convertUnits["default"])(z).from(zUnit).to('cm');
+  z = (0, _convertUnitsLite.convert)(z).from(zUnit).to('cm');
   var height = newMD.items[0].properties.get('height').get('_length');
   var heightUnit = newMD.items[0].properties.get('height').get('_unit') || 'cm';
-  height = (0, _convertUnits["default"])(height).from(heightUnit).to('cm');
+  height = (0, _convertUnitsLite.convert)(height).from(heightUnit).to('cm');
   switch (newMD.location_type) {
     case _constants.TOP_MOLDING_LOCATION:
       z += height;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "1.1.1-test.54",
+  "version": "1.1.1-test.55",
   "description": "It is a kitchen simulator.",
   "license": "MIT",
   "main": "lib/index.js",
@@ -58,7 +58,6 @@
     "redux"
   ],
   "peerDependencies": {
-    "convert-units": "2.3.4",
     "hoist-non-react-statics": "2.5.5",
     "immutable": "3.8.2",
     "immutablediff": "0.4.4",
@@ -99,7 +98,6 @@
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-plugin-transform-rename-import": "^2.3.0",
     "const-version": "2.0.0",
-    "convert-units": "2.3.4",
     "cross-env": "^5.2.0",
     "css-loader": "*",
     "file-loader": "6.2.0",