kitchen-simulator 1.1.1-test.6 → 1.1.1-test.60

package/lib/components/viewer3d/ruler-utils/layer3D.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = Layer3D;
 var _react = _interopRequireDefault(require("react"));
 var _ruler3D = _interopRequireDefault(require("./ruler3D"));
-var _convertUnits = _interopRequireDefault(require("convert-units"));
+var _convertUnitsLite = require("../../../utils/convert-units-lite");
 var _export = require("../../../utils/export");
 var _utils = require("../../../components/viewer2d/utils");
 var _constants = require("../../../constants");
@@ -91,10 +91,10 @@ function Layer3D(_ref) {
     var catid = item.type;
     var cat = catalog.elements[catid];
     if (!cat) cat = catalog.elements[(0, _utils.returnReplaceableDeepSearchType)(catid)];
-    var width = (0, _convertUnits["default"])(item.properties.getIn(['width', '_length'])).from(item.properties.getIn(['width', '_unit'])).to(scene.unit);
-    var height = (0, _convertUnits["default"])(item.properties.getIn(['height', '_length'])).from(item.properties.getIn(['height', '_unit'])).to(scene.unit);
-    var depth = (0, _convertUnits["default"])(item.properties.getIn(['depth', '_length'])).from(item.properties.getIn(['depth', '_unit'])).to(scene.unit);
-    var altitude = (0, _convertUnits["default"])(item.properties.getIn(['altitude', '_length'])).from(item.properties.getIn(['altitude', '_unit'])).to(scene.unit);
+    var width = (0, _convertUnitsLite.convert)(item.properties.getIn(['width', '_length'])).from(item.properties.getIn(['width', '_unit'])).to(scene.unit);
+    var height = (0, _convertUnitsLite.convert)(item.properties.getIn(['height', '_length'])).from(item.properties.getIn(['height', '_unit'])).to(scene.unit);
+    var depth = (0, _convertUnitsLite.convert)(item.properties.getIn(['depth', '_length'])).from(item.properties.getIn(['depth', '_unit'])).to(scene.unit);
+    var altitude = (0, _convertUnitsLite.convert)(item.properties.getIn(['altitude', '_length'])).from(item.properties.getIn(['altitude', '_unit'])).to(scene.unit);
     val.size = {
       width: width,
       height: height,
@@ -128,29 +128,29 @@ function Layer3D(_ref) {
       var vertex0, vertex1;
       if (isSnapped(item.rect[3], item.rect[2])) {
         vertex0 = {
-          x: -frontRect.width / 2 + (0, _convertUnits["default"])(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
+          x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
           y: height / 2
         };
         vertex1 = {
-          x: -frontRect.width / 2 + (0, _convertUnits["default"])(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
+          x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
           y: height / 2
         };
       } else if (isSnapped(item.rect[2], item.rect[1])) {
         vertex0 = {
-          x: -frontRect.width / 2 + (0, _convertUnits["default"])(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
+          x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
           y: height / 2
         };
         vertex1 = {
-          x: -frontRect.width / 2 + (0, _convertUnits["default"])(getLength(item.rect[1], v0)).from('cm').to(layer.unit) * scale,
+          x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[1], v0)).from('cm').to(layer.unit) * scale,
           y: height / 2
         };
       } else if (isSnapped(item.rect[0], item.rect[3])) {
         vertex0 = {
-          x: -frontRect.width / 2 + (0, _convertUnits["default"])(getLength(item.rect[0], v0)).from('cm').to(layer.unit) * scale,
+          x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[0], v0)).from('cm').to(layer.unit) * scale,
           y: height / 2
         };
         vertex1 = {
-          x: -frontRect.width / 2 + (0, _convertUnits["default"])(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
+          x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
           y: height / 2
         };
       }
@@ -177,29 +177,29 @@ function Layer3D(_ref) {
       var vertex0, vertex1;
       if (isSnapped(item.rect[3], item.rect[2])) {
         vertex0 = {
-          x: -frontRect.width / 2 + (0, _convertUnits["default"])(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
+          x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
           y: -height / 2
         };
         vertex1 = {
-          x: -frontRect.width / 2 + (0, _convertUnits["default"])(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
+          x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
           y: -height / 2
         };
       } else if (isSnapped(item.rect[2], item.rect[1])) {
         vertex0 = {
-          x: -frontRect.width / 2 + (0, _convertUnits["default"])(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
+          x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
           y: -height / 2
         };
         vertex1 = {
-          x: -frontRect.width / 2 + (0, _convertUnits["default"])(getLength(item.rect[1], v0)).from('cm').to(layer.unit) * scale,
+          x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[1], v0)).from('cm').to(layer.unit) * scale,
           y: -height / 2
         };
       } else if (isSnapped(item.rect[0], item.rect[3])) {
         vertex0 = {
-          x: -frontRect.width / 2 + (0, _convertUnits["default"])(getLength(item.rect[0], v0)).from('cm').to(layer.unit) * scale,
+          x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[0], v0)).from('cm').to(layer.unit) * scale,
           y: -height / 2
         };
         vertex1 = {
-          x: -frontRect.width / 2 + (0, _convertUnits["default"])(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
+          x: -frontRect.width / 2 + (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
           y: -height / 2
         };
       }
@@ -232,7 +232,7 @@ function Layer3D(_ref) {
   leftItems.forEach(function (item, idx) {
     var forwardItems = [];
     var distLine = 0;
-    var itemHeight = (0, _convertUnits["default"])(item.size.height).from(scene.unit).to(layer.unit);
+    var itemHeight = (0, _convertUnitsLite.convert)(item.size.height).from(scene.unit).to(layer.unit);
     for (var i = 0; i < idx; i++) {
       forwardItems.push(leftItems[i]);
     }
@@ -241,12 +241,12 @@ function Layer3D(_ref) {
     }).length) {
       if (item.itemInfo.properties.altitude._length) {
         if (isSnapped(item.rect[3], item.rect[2])) {
-          distLine = (0, _convertUnits["default"])(getLength(item.rect[2], v1)).from(scene.unit).to(layer.unit);
+          distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[2], v1)).from(scene.unit).to(layer.unit);
         } else if (isSnapped(item.rect[2], item.rect[1])) {
-          distLine = (0, _convertUnits["default"])(getLength(item.rect[1], v1)).from(scene.unit).to(layer.unit);
+          distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[1], v1)).from(scene.unit).to(layer.unit);
         }
-        var itemAltitude = (0, _convertUnits["default"])(item.size.altitude).from(scene.unit).to(layer.unit);
-        if (ceilHeight - (itemAltitude + itemHeight) > (0, _convertUnits["default"])(_constants.DELTA).from(toler_unit).to(layer.unit)) {
+        var itemAltitude = (0, _convertUnitsLite.convert)(item.size.altitude).from(scene.unit).to(layer.unit);
+        if (ceilHeight - (itemAltitude + itemHeight) > (0, _convertUnitsLite.convert)(_constants.DELTA).from(toler_unit).to(layer.unit)) {
           rulerLines.push({
             v0: {
               x: width / 2,
@@ -287,9 +287,9 @@ function Layer3D(_ref) {
         right_count++;
       } else {
         if (isSnapped(item.rect[3], item.rect[2])) {
-          distLine = (0, _convertUnits["default"])(getLength(item.rect[3], v0)).from(scene.unit).to(layer.unit);
+          distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from(scene.unit).to(layer.unit);
         } else if (isSnapped(item.rect[2], item.rect[1])) {
-          distLine = (0, _convertUnits["default"])(getLength(item.rect[2], v0)).from(scene.unit).to(layer.unit);
+          distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from(scene.unit).to(layer.unit);
         }
         rulerLines.push({
           v0: {
@@ -324,7 +324,7 @@ function Layer3D(_ref) {
   rightItems.forEach(function (item, idx) {
     var forwardItems = [];
     var distLine = 0;
-    var itemHeight = (0, _convertUnits["default"])(item.size.height).from(scene.unit).to(layer.unit);
+    var itemHeight = (0, _convertUnitsLite.convert)(item.size.height).from(scene.unit).to(layer.unit);
     for (var i = 0; i < idx; i++) {
       forwardItems.push(rightItems[i]);
     }
@@ -333,12 +333,12 @@ function Layer3D(_ref) {
     }).length) {
       if (item.itemInfo.properties.altitude._length) {
         if (isSnapped(item.rect[3], item.rect[2])) {
-          distLine = (0, _convertUnits["default"])(getLength(item.rect[3], v0)).from(scene.unit).to(layer.unit);
+          distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[3], v0)).from(scene.unit).to(layer.unit);
         } else if (isSnapped(item.rect[2], item.rect[1])) {
-          distLine = (0, _convertUnits["default"])(getLength(item.rect[2], v0)).from(scene.unit).to(layer.unit);
+          distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[2], v0)).from(scene.unit).to(layer.unit);
         }
-        var _itemHeight = (0, _convertUnits["default"])(item.size.height).from(scene.unit).to(layer.unit);
-        var itemAltitude = (0, _convertUnits["default"])(item.size.altitude).from(scene.unit).to(layer.unit);
+        var _itemHeight = (0, _convertUnitsLite.convert)(item.size.height).from(scene.unit).to(layer.unit);
+        var itemAltitude = (0, _convertUnitsLite.convert)(item.size.altitude).from(scene.unit).to(layer.unit);
         rulerLines.push({
           v0: {
             x: -width / 2,
@@ -363,7 +363,7 @@ function Layer3D(_ref) {
           text: (0, _math.formatNumber)(_itemHeight, _constants.DECIMAL_PLACES_2),
           space: rulerSpace + +distLine * scale + left_count * lineSpace
         });
-        if (ceilHeight - (itemAltitude + _itemHeight) > (0, _convertUnits["default"])(_constants.DELTA).from(toler_unit).to(layer.unit)) {
+        if (ceilHeight - (itemAltitude + _itemHeight) > (0, _convertUnitsLite.convert)(_constants.DELTA).from(toler_unit).to(layer.unit)) {
           rulerLines.push({
             v0: {
               x: -width / 2,
@@ -380,9 +380,9 @@ function Layer3D(_ref) {
         left_count++;
       } else {
         if (isSnapped(item.rect[3], item.rect[2])) {
-          distLine = (0, _convertUnits["default"])(getLength(item.rect[2], v1)).from(scene.unit).to(layer.unit);
+          distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[2], v1)).from(scene.unit).to(layer.unit);
         } else if (isSnapped(item.rect[2], item.rect[1])) {
-          distLine = (0, _convertUnits["default"])(getLength(item.rect[1], v1)).from(scene.unit).to(layer.unit);
+          distLine = (0, _convertUnitsLite.convert)(getLength(item.rect[1], v1)).from(scene.unit).to(layer.unit);
         }
         rulerLines.push({
           v0: {

package/lib/components/viewer3d/ruler-utils/scene3D.js

@@ -6,10 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.compareVertices = compareVertices;
 exports["default"] = Scene3D;
 var _react = _interopRequireDefault(require("react"));
-var _export = require("../../../utils/export");
-var _helper = require("../../..//utils/helper");
 var _geometry = require("../../../utils/geometry");
-var _convertUnits = _interopRequireDefault(require("convert-units"));
+var _convertUnitsLite = require("../../../utils/convert-units-lite");
 var _layer3D = _interopRequireDefault(require("./layer3D"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function compareVertices(v0, v1) {
@@ -23,12 +21,13 @@ function Scene3D(_ref) {
     mode = _ref.mode,
     downloadFlag = _ref.downloadFlag;
   var layers = scene.layers;
+  console.log(layers.toJS());
   var selectedLayer = layers.get(scene.selectedLayer);
   var ceilHeight = selectedLayer.ceilHeight;
   var selectedLine = selectedLayer.lines.get(selectedLayer.selected.lines.toJS()[0]);
   var vertex0 = selectedLayer.vertices.get(selectedLine.vertices.get(0));
   var vertex1 = selectedLayer.vertices.get(selectedLine.vertices.get(1));
-  var lineLength = (0, _convertUnits["default"])((0, _geometry.verticesDistance)(vertex0, vertex1)).from(scene.unit).to(selectedLayer.unit);
+  var lineLength = (0, _convertUnitsLite.convert)((0, _geometry.verticesDistance)(vertex0, vertex1)).from(scene.unit).to(selectedLayer.unit);
   var multi = downloadFlag ? 0.85 : 0.6;
   var scale = Math.min(width * multi / lineLength, height * multi / ceilHeight);
   var frontRect = {

package/lib/components/viewer3d/scene-creator.js

@@ -37,7 +37,7 @@ var _gridCreator = _interopRequireDefault(require("./grid-creator"));
 var _threeMemoryCleaner = require("./three-memory-cleaner");
 var _constants = require("../../constants");
 var _export = require("../../utils/export");
-var _convertUnits = _interopRequireDefault(require("convert-units"));
+var _convertUnitsLite = require("../../utils/convert-units-lite");
 var _geometry2 = require("../../utils/geometry");
 var GeomUtils = _interopRequireWildcard(require("../../catalog/utils/geom-utils"));
 var _itemLoader = require("../../catalog/utils/item-loader");
@@ -546,16 +546,16 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
             var posVec = new Three.Vector3(object.position.x, object.position.y, object.position.z);
             var newAltitude = item.properties.get('altitude').get('_length');
             var newUnit = item.properties.get('altitude').get('_unit') || 'in';
-            newAltitude = (0, _convertUnits["default"])(newAltitude).from(newUnit).to(sceneData.unit);
+            newAltitude = (0, _convertUnitsLite.convert)(newAltitude).from(newUnit).to(sceneData.unit);
             var newWidth = item.properties.get('width').get('_length');
             var newWidthUnit = item.properties.get('width').get('_unit') || 'in';
-            newWidth = (0, _convertUnits["default"])(newWidth).from(newWidthUnit).to('in');
+            newWidth = (0, _convertUnitsLite.convert)(newWidth).from(newWidthUnit).to('in');
             var newHeight = item.properties.get('height').get('_length');
             var newHeightUnit = item.properties.get('height').get('_unit') || 'in';
-            newHeight = (0, _convertUnits["default"])(newHeight).from(newHeightUnit).to('in');
+            newHeight = (0, _convertUnitsLite.convert)(newHeight).from(newHeightUnit).to('in');
             var newDepth = item.properties.get('depth').get('_length');
             var newDepthUnit = item.properties.get('depth').get('_unit') || 'in';
-            newDepth = (0, _convertUnits["default"])(newDepth).from(newDepthUnit).to('in');
+            newDepth = (0, _convertUnitsLite.convert)(newDepth).from(newDepthUnit).to('in');
             var sizeinfo = !!catalog.elements[item.type] ? catalog.elements[item.type].info.sizeinfo : catalog.elements[(0, _utils.returnReplaceableDeepSearchType)(item.type)].info.sizeinfo;
             object.scale.set(1 * newWidth / sizeinfo.width, 1 * newHeight / sizeinfo.height, 1 * newDepth / sizeinfo.depth);
             object.position.set(0, 0, 0);
@@ -960,7 +960,7 @@ function getLineDistance(obj, layer, isCalcWall, index) {
         obj.geometry.attributes.position.needsUpdate = true;
         obj.geometry.computeBoundingSphere();
         obj.geometry.computeBoundingBox();
-        var dist = (0, _math.formatNumber)((0, _convertUnits["default"])(intersects[i].distance).from('cm').to('in'), _constants.DECIMAL_PLACES_2);
+        var dist = (0, _math.formatNumber)((0, _convertUnitsLite.convert)(intersects[i].distance).from('cm').to('in'), _constants.DECIMAL_PLACES_2);
         if (dist > 3) {
           var _canvas = getTextCanvas(dist);
           var wid = _canvas.width / window.innerWidth * 30;
@@ -1814,7 +1814,7 @@ function addArea(sceneData, planData, layer, areaID, catalog, areaActions, mode)
         realVec.push(vec);
       });
       if (vertices.includes(realVec[0]) && vertices.includes(realVec[1])) {
-        height = (0, _convertUnits["default"])(layer.ceilHeight).from(layer.unit).to(_constants.UNIT_CENTIMETER);
+        height = (0, _convertUnitsLite.convert)(layer.ceilHeight).from(layer.unit).to(_constants.UNIT_CENTIMETER);
         // height = data.properties.getIn(["height", "length"]);
         return 1; // break
       }
@@ -1822,7 +1822,7 @@ function addArea(sceneData, planData, layer, areaID, catalog, areaActions, mode)
     for (var i = 0; i < lines.length; i++) {
       if (_loop2()) break;
     }
-    ceil.translateZ((0, _convertUnits["default"])(layer.ceilHeight).from(layer.unit).to(_constants.UNIT_CENTIMETER));
+    ceil.translateZ((0, _convertUnitsLite.convert)(layer.ceilHeight).from(layer.unit).to(_constants.UNIT_CENTIMETER));
     pivot.name = 'pivot';
     pivot.add(area3D);
     pivot.add(area3D.userData.floorSupport);
@@ -1986,9 +1986,9 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
     var catid = item.type;
     var cat = catalog.elements[catid];
     if (!cat) cat = catalog.elements[(0, _utils.returnReplaceableDeepSearchType)(catid)];
-    var width = (0, _convertUnits["default"])(item.properties.getIn(['width', '_length'])).from('in').to(sceneData.unit);
-    var height = (0, _convertUnits["default"])(item.properties.getIn(['height', '_length'])).from('in').to(sceneData.unit);
-    var depth = (0, _convertUnits["default"])(item.properties.getIn(['depth', '_length'])).from('in').to(sceneData.unit);
+    var width = (0, _convertUnitsLite.convert)(item.properties.getIn(['width', '_length'])).from('in').to(sceneData.unit);
+    var height = (0, _convertUnitsLite.convert)(item.properties.getIn(['height', '_length'])).from('in').to(sceneData.unit);
+    var depth = (0, _convertUnitsLite.convert)(item.properties.getIn(['depth', '_length'])).from('in').to(sceneData.unit);
     val.size = {
       width: width,
       height: height,
@@ -2233,13 +2233,13 @@ function createCTFromItems(items, unit, catalog) {
   // let height = convert(item0.properties.getIn(['height', '_length'])).from('in').to('cm');
   var width = item0.properties.get('width').get('_length');
   var widthUnit = item0.properties.get('width').get('_unit') || 'cm';
-  width = (0, _convertUnits["default"])(width).from(widthUnit).to('cm');
+  width = (0, _convertUnitsLite.convert)(width).from(widthUnit).to('cm');
   var depth = item0.properties.get('depth').get('_length');
   var depthUnit = item0.properties.get('depth').get('_unit') || 'cm';
-  depth = (0, _convertUnits["default"])(depth).from(depthUnit).to('cm');
+  depth = (0, _convertUnitsLite.convert)(depth).from(depthUnit).to('cm');
   var height = item0.properties.get('height').get('_length');
   var heightUnit = item0.properties.get('height').get('_unit') || 'cm';
-  height = (0, _convertUnits["default"])(height).from(heightUnit).to('cm');
+  height = (0, _convertUnitsLite.convert)(height).from(heightUnit).to('cm');
   var size = {
     width: width * items.length,
     depth: depth,
@@ -2259,10 +2259,10 @@ function createMDFromItem(item, lines, molding) {
   var MDId = _export.IDBroker.acquireID();
   var z = item.properties.get('altitude').get('_length');
   var zUnit = item.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 = item.properties.get('height').get('_length');
   var heightUnit = item.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 (molding.location_type) {
     case _constants.TOP_MOLDING_LOCATION:
       z += height;
@@ -2521,7 +2521,7 @@ function addCTMesh(countertop, planData, layer) {
       var unit_width = countertop.items.find(function (ct) {
         return !ct.type.includes('Dishwasher') && !ct.type.includes('BF');
       }).properties.get('width').get('_unit') || 'cm';
-      width = (0, _convertUnits["default"])(width).from(unit_width).to('cm');
+      width = (0, _convertUnitsLite.convert)(width).from(unit_width).to('cm');
       pivotMat.scale(new Three.Vector3(countertop.size.width / width, 1, 1));
       var finalMat = objMat.premultiply(pivotMat);
       _ct3d.applyMatrix4(finalMat);
@@ -2852,7 +2852,7 @@ function createBacksplash(item, layer, planData, scene) {
 
   var altitude = item.itemInfo.properties.get('altitude').get('_length');
   var altitudeUnit = item.itemInfo.properties.get('altitude').get('_unit') || 'cm';
-  altitude = (0, _convertUnits["default"])(altitude).from(altitudeUnit).to('cm');
+  altitude = (0, _convertUnitsLite.convert)(altitude).from(altitudeUnit).to('cm');
   var thickness = 1,
     /** Height --- altitude */depth;
 
@@ -2867,7 +2867,7 @@ function createBacksplash(item, layer, planData, scene) {
   wallItems.map(function (wallItem) {
     var altitude = wallItem.itemInfo.properties.get('altitude').get('_length');
     var altitudeUnit = wallItem.itemInfo.properties.get('altitude').get('_unit') || 'cm';
-    altitude = (0, _convertUnits["default"])(altitude).from(altitudeUnit).to('cm');
+    altitude = (0, _convertUnitsLite.convert)(altitude).from(altitudeUnit).to('cm');
     altItems.push({
       x: wallItem.pos.x,
       width: wallItem.size.width,
@@ -3059,17 +3059,17 @@ function _addMGMesh(molding, planData, layer, data, svg_width, svg_height, flag)
     var length = data.length; //point array
     var temp_unit = child.height_unit;
     if (temp_unit === 'inch') {
-      child.height = (0, _convertUnits["default"])(child.height).from('in').to('cm');
+      child.height = (0, _convertUnitsLite.convert)(child.height).from('in').to('cm');
       child.height_unit = 'cm';
     }
     temp_unit = child.width_unit;
     if (temp_unit === 'inch') {
-      child.width = (0, _convertUnits["default"])(child.width).from('in').to('cm');
+      child.width = (0, _convertUnitsLite.convert)(child.width).from('in').to('cm');
       child.width_unit = 'cm';
     }
     temp_unit = child.length_unit;
     if (temp_unit === 'inch') {
-      child.length = (0, _convertUnits["default"])(child.length).from('in').to('cm');
+      child.length = (0, _convertUnitsLite.convert)(child.length).from('in').to('cm');
       child.length_unit = 'cm';
     }
     geometry.needsUpdate = true;
@@ -3596,7 +3596,7 @@ function addWarningBox(itemId, altitude, planData) {
   deleteSpecifiedMeshObjects('WarningBox' + itemId);
   var item3D = planData.sceneGraph.layers[planData.sceneData.selectedLayer].items[itemId];
   if (item3D == undefined) return;
-  var altitudeLength = (0, _convertUnits["default"])(altitude).from('in').to('cm');
+  var altitudeLength = (0, _convertUnitsLite.convert)(altitude).from('in').to('cm');
   var sBounding = item3D.children[0].userData;
   var width = sBounding.max.x - sBounding.min.x;
   var height = sBounding.max.y - sBounding.min.y;
@@ -3635,7 +3635,7 @@ function checkCabinetOverlap(itemPos, itemRect, holeItems, planData) {
     if (i != holeItems.length) {
       var altitude = itemRect.itemInfo.properties.get('altitude').get('_length');
       var altitudeUnit = itemRect.itemInfo.properties.get('altitude').get('_unit') || 'cm';
-      altitude = (0, _convertUnits["default"])(altitude).from(altitudeUnit).to('cm');
+      altitude = (0, _convertUnitsLite.convert)(altitude).from(altitudeUnit).to('cm');
       addWarningBox(itemRect.itemInfo.id, altitude, planData);
     }
   }

package/lib/components/viewer3d/viewer3d.js

@@ -14,9 +14,8 @@ var _threeMemoryCleaner = require("./three-memory-cleaner");
 var _immutablediff = _interopRequireDefault(require("immutablediff"));
 var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
 var _constants = require("../../constants");
-var _util = require("util");
 var _geometry = require("../../utils/geometry");
-var _convertUnits = _interopRequireDefault(require("convert-units"));
+var _convertUnitsLite = require("../../utils/convert-units-lite");
 var _export = require("../../utils/export");
 var _helper = require("../../utils/helper");
 var _RGBELoader = require("three/examples/jsm/loaders/RGBELoader");
@@ -289,7 +288,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             realVec.push(vec);
           });
           if (aVertices.includes(realVec[0]) && aVertices.includes(realVec[1])) {
-            height = (0, _convertUnits["default"])(layer.ceilHeight).from(layer.unit).to(_constants.UNIT_CENTIMETER);
+            height = (0, _convertUnitsLite.convert)(layer.ceilHeight).from(layer.unit).to(_constants.UNIT_CENTIMETER);
             // height = data.properties.getIn(['height', 'length']);
             return 1; // break
           }
@@ -662,6 +661,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             item: _item2,
             cat: ocat
           };
+          console.log('currentItem =>', currentItem);
           if (_export.GeometryUtils.needSnap(currentItem, otherItem) && otherItem.cat.type != 'cabinet') {
             var tRot = _item2.rotation;
             var tPos = new Three.Vector2(_item2.x, _item2.y);
@@ -834,7 +834,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
           var tRot = layer.getIn(['items', target.userData.itemId]) ? layer.getIn(['items', target.userData.itemId]).rotation : 0;
           var item = layer.getIn(['items', source.userData.itemId]);
           var layoutType = item.layoutpos;
-          var altitudeLength = (0, _convertUnits["default"])(item.properties.getIn(['altitude', '_length'])).from('in').to('cm');
+          var altitudeLength = (0, _convertUnitsLite.convert)(item.properties.getIn(['altitude', '_length'])).from('in').to('cm');
           var sBounding = source.children[0].userData;
           var tBounding = target.children[0].userData;
           var tPos = target.position.clone();
@@ -935,7 +935,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             return;
           } else {
             var _layoutType = _item3.layoutpos;
-            var _altitudeLength = (0, _convertUnits["default"])(_item3.properties.getIn(['altitude', '_length'])).from('in').to('cm');
+            var _altitudeLength = (0, _convertUnitsLite.convert)(_item3.properties.getIn(['altitude', '_length'])).from('in').to('cm');
             var _sBounding = source.children[0].userData;
             var _width = _sBounding.max.x - _sBounding.min.x;
             var _height = _sBounding.max.y - _sBounding.min.y;
@@ -1200,7 +1200,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
           var properties = allItemRect.cur.itemInfo.properties;
           altitude = properties.getIn(['altitude', '_length']);
           var unit = properties.getIn(['altitude', '_unit']) || 'in';
-          altitude = (0, _convertUnits["default"])(altitude).from(unit).to(_this2.props.state.scene.unit);
+          altitude = (0, _convertUnitsLite.convert)(altitude).from(unit).to(_this2.props.state.scene.unit);
         }
         getPoint(event, altitude);
         var state = _this2.props.state;
@@ -1292,13 +1292,13 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
                   var _properties = allItemRect.cur.itemInfo.properties;
                   alti = _properties.getIn(['altitude', '_length']);
                   var _unit = _properties.getIn(['altitude', '_unit']) || 'in';
-                  alti = (0, _convertUnits["default"])(alti).from(_unit).to(_this2.props.state.scene.unit);
+                  alti = (0, _convertUnitsLite.convert)(alti).from(_unit).to(_this2.props.state.scene.unit);
                 }
                 getPoint({
                   offsetX: event.offsetX - 50,
                   offsetY: event.offsetY
                 }, alti);
-                if ((0, _util.isUndefined)(selectedItem)) return;
+                if (!selectedItem) return;
                 var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
                 lastAngle = 0;
                 angleObj.position.set(planData.plan.position.x + Point.x, selItem.category === 'lighting' ? -planData.plan.position.y - selItem.properties.get('height').get('length') : selItem.properties.get('altitude').get('length') + planData.plan.position.y, planData.plan.position.z - Point.y);
@@ -1356,7 +1356,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
           var properties = allItemRect.cur.itemInfo.properties;
           altitude = properties.getIn(['altitude', '_length']);
           var unit = properties.getIn(['altitude', '_unit']) || 'in';
-          altitude = (0, _convertUnits["default"])(altitude).from(unit).to(_this2.props.state.scene.unit);
+          altitude = (0, _convertUnitsLite.convert)(altitude).from(unit).to(_this2.props.state.scene.unit);
         }
         scene3D.remove(angleObj);
         scene3D.remove(toolObj);
@@ -1469,7 +1469,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
                 setTimeout(function () {
                   (0, _sceneCreator.getDistances)(layer);
                   var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-                  if ((0, _util.isUndefined)(selectedItem)) return;
+                  if (!selectedItem) return;
                   var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
                   var itemPos = selectedItem.position.clone();
                   if (intersects[_i10].object.parent && intersects[_i10].object.parent.parent.userData.itemId === selectedItem.userData.itemId) {
@@ -1545,13 +1545,13 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
               var _properties2 = allItemRect.cur.itemInfo.properties;
               alti = _properties2.getIn(['altitude', '_length']);
               var _unit2 = _properties2.getIn(['altitude', '_unit']) || 'in';
-              alti = (0, _convertUnits["default"])(alti).from(_unit2).to(_this2.props.state.scene.unit);
+              alti = (0, _convertUnitsLite.convert)(alti).from(_unit2).to(_this2.props.state.scene.unit);
             }
             getPoint(event, alti);
             if (bRotate) {
               var _intersects$_i;
               var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-              if ((0, _util.isUndefined)(selectedItem)) return;
+              if (!selectedItem) return;
               var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
               var itemPos = selectedItem.position.clone();
               if (((_intersects$_i = intersects[_i10]) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.object) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.userData) === null || _intersects$_i === void 0 ? void 0 : _intersects$_i.itemId) === selectedItem.userData.itemId) {
@@ -1569,7 +1569,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             if (bMove) {
               bMove = false;
               var _selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-              if ((0, _util.isUndefined)(_selectedItem)) return;
+              if (!_selectedItem) return;
               var _selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
               var _itemPos = _selectedItem.position.clone();
               if (intersects[_i10].object.parent.parent.userData.itemId === _selectedItem.userData.itemId) {
@@ -1618,7 +1618,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
           var properties = allItemRect.cur.itemInfo.properties;
           altitude = properties.getIn(['altitude', '_length']);
           var unit = properties.getIn(['altitude', '_unit']) || 'in';
-          altitude = (0, _convertUnits["default"])(altitude).from(unit).to(_this2.props.state.scene.unit);
+          altitude = (0, _convertUnitsLite.convert)(altitude).from(unit).to(_this2.props.state.scene.unit);
         }
         if (_this2.props.state.mode === _constants.MODE_DRAWING_HOLE_3D) {
           gridPlanOrigin = gridPlane.position;
@@ -2049,7 +2049,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
         setTimeout(function () {
           try {
             currentObject = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-            if ((0, _util.isUndefined)(currentObject)) return;
+            if (!currentObject) return;
             var selItem = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
             var itemPos = currentObject.position.clone();
             toolObj.position.set(planData.plan.position.x + itemPos.x, selItem.category === 'lighting' ? -planData.plan.position.y - selItem.properties.get('height').get('length') : planData.plan.position.y + currentObject.children[0].position.y, planData.plan.position.z + itemPos.z);
@@ -2078,7 +2078,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
           // In elevation view, set Orthographic camera's position, angle and rotation about selected line
           var layers = scene.layers;
           var selectedLayer = layers.get(scene.selectedLayer);
-          var ceilHeight = (0, _convertUnits["default"])(selectedLayer.ceilHeight).from(selectedLayer.unit).to(scene.unit);
+          var ceilHeight = (0, _convertUnitsLite.convert)(selectedLayer.ceilHeight).from(selectedLayer.unit).to(scene.unit);
           var lines = [];
           var selectedLine = selectedLayer.lines.get(selectedLayer.selected.lines.toJS()[0]);
           var vertex0 = selectedLayer.vertices.get(selectedLine.vertices.get(0));
@@ -2312,7 +2312,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
       var width = nextProps.width,
         height = nextProps.height;
       var selectedLayer = nextProps.state.getIn(['scene', 'layers', nextProps.state.scene.selectedLayer]);
-      var ceilHeight = (0, _convertUnits["default"])(selectedLayer.ceilHeight).from(selectedLayer.unit).to(nextProps.state.scene.unit);
+      var ceilHeight = (0, _convertUnitsLite.convert)(selectedLayer.ceilHeight).from(selectedLayer.unit).to(nextProps.state.scene.unit);
       var actions = {
         areaActions: this.context.areaActions,
         holesActions: this.context.holesActions,