kitchen-simulator 1.1.1-test.9 → 2.0.1-dot-color

package/lib/class/layer.js

@@ -1,20 +1,17 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _immutable = require("immutable");
 var _export = require("./export");
 var _export2 = require("../utils/export");
 var _models = require("../models");
 var _helper = require("../utils/helper");
-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 _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
-function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
-function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var sameSet = function sameSet(set1, set2) {
   return set1.size === set2.size && set1.isSuperset(set2) && set1.isSubset(set2);
 };
@@ -29,9 +26,9 @@ var sameDirection = function sameDirection(list1, list2) {
 };
 var Layer = exports["default"] = /*#__PURE__*/function () {
   function Layer() {
-    _classCallCheck(this, Layer);
+    (0, _classCallCheck2["default"])(this, Layer);
   }
-  return _createClass(Layer, null, [{
+  return (0, _createClass2["default"])(Layer, null, [{
     key: "create",
     value: function create(state, name, altitude) {
       var layerID = _export2.IDBroker.acquireID();
@@ -669,4 +666,5 @@ var Layer = exports["default"] = /*#__PURE__*/function () {
       };
     }
   }]);
-}();
+}();
+module.exports = exports.default;

package/lib/class/line.js

@@ -1,9 +1,14 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _immutable = require("immutable");
 var _export = require("./export");
 var _export2 = require("../utils/export");
@@ -11,28 +16,16 @@ var Three = _interopRequireWildcard(require("three"));
 var _constants = require("../constants");
 var _helper = require("../utils/helper");
 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 _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-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 _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
-function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
-function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var timeGlobal = 0;
 var TimeRecorder = /*#__PURE__*/function () {
   function TimeRecorder(name) {
-    _classCallCheck(this, TimeRecorder);
+    (0, _classCallCheck2["default"])(this, TimeRecorder);
     this.name = name;
     if (name === 'beginDrawingLine') {
       console.log('time__  Start Drawing');
     }
   }
-  return _createClass(TimeRecorder, [{
+  return (0, _createClass2["default"])(TimeRecorder, [{
     key: "start",
     value: function start() {
       this.first = Date.now();
@@ -53,9 +46,9 @@ var TimeRecorder = /*#__PURE__*/function () {
 }();
 var Line = exports["default"] = /*#__PURE__*/function () {
   function Line() {
-    _classCallCheck(this, Line);
+    (0, _classCallCheck2["default"])(this, Line);
   }
-  return _createClass(Line, null, [{
+  return (0, _createClass2["default"])(Line, null, [{
     key: "create",
     value: function create(state, layerID, type, x0, y0, x1, y1, properties) {
       var lineCreatedDateTime = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : new Date().getTime();
@@ -95,7 +88,7 @@ var Line = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "select",
     value: function select(state, layerID, lineID) {
-      var _line$vertices, _line$vertices$get, _line$vertices2, _line$vertices2$get;
+      var _line$toJS, _line$vertices, _line$vertices$get, _line$vertices2, _line$vertices2$get;
       // Try selecting the layer first
       var layerResult = _export.Layer.select(state, layerID);
       if (!layerResult || !layerResult.updatedState) {
@@ -107,7 +100,7 @@ var Line = exports["default"] = /*#__PURE__*/function () {
 
       // Try getting the line
       var line = state.getIn(['scene', 'layers', layerID, 'lines', lineID]);
-      if (!line) {
+      if (!line || (0, _helper.isEmpty)((_line$toJS = line.toJS) === null || _line$toJS === void 0 ? void 0 : _line$toJS.call(line))) {
         return {
           updatedState: state
         }; // no update if line not found
@@ -143,8 +136,9 @@ var Line = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "remove",
     value: function remove(state, layerID, lineID) {
+      var _line$toJS2;
       var line = state.getIn(['scene', 'layers', layerID, 'lines', lineID]);
-      if (line) {
+      if (line && !(0, _helper.isEmpty)((_line$toJS2 = line.toJS) === null || _line$toJS2 === void 0 ? void 0 : _line$toJS2.call(line))) {
         state = this.unselect(state, layerID, lineID).updatedState;
         line.holes.forEach(function (holeID) {
           return state = _export.Hole.remove(state, layerID, holeID).updatedState;
@@ -265,7 +259,7 @@ var Line = exports["default"] = /*#__PURE__*/function () {
         return x1 === x2 ? y1 - y2 : x1 - x2;
       });
       var pointsPair = points.zip(points.skip(1)).filterNot(function (_ref3) {
-        var _ref4 = _slicedToArray(_ref3, 2),
+        var _ref4 = (0, _slicedToArray2["default"])(_ref3, 2),
           _ref4$ = _ref4[0],
           x1 = _ref4$.x,
           y1 = _ref4$.y,
@@ -276,7 +270,7 @@ var Line = exports["default"] = /*#__PURE__*/function () {
       });
       var lines = [];
       pointsPair.forEach(function (_ref5) {
-        var _ref6 = _slicedToArray(_ref5, 2),
+        var _ref6 = (0, _slicedToArray2["default"])(_ref5, 2),
           _ref6$ = _ref6[0],
           x1 = _ref6$.x,
           y1 = _ref6$.y,
@@ -370,7 +364,7 @@ var Line = exports["default"] = /*#__PURE__*/function () {
         var _line$vertices$map$to = line.vertices.map(function (vertexID) {
             return reducedState.getIn(['scene', 'layers', layerID, 'vertices']).get(vertexID);
           }).toArray(),
-          _line$vertices$map$to2 = _slicedToArray(_line$vertices$map$to, 2),
+          _line$vertices$map$to2 = (0, _slicedToArray2["default"])(_line$vertices$map$to, 2),
           v0 = _line$vertices$map$to2[0],
           v1 = _line$vertices$map$to2[1];
         var hasCommonEndpoint = _export2.GeometryUtils.samePoints(v0, points[0]) || _export2.GeometryUtils.samePoints(v0, points[1]) || _export2.GeometryUtils.samePoints(v1, points[0]) || _export2.GeometryUtils.samePoints(v1, points[1]);
@@ -516,7 +510,7 @@ var Line = exports["default"] = /*#__PURE__*/function () {
       // let relatedLines = [];
       var vertices = state.getIn(['scene', 'layers', layerID, 'vertices']).toJS();
       var drawingLine = state.getIn(['scene', 'layers', layerID, 'lines', lineID]).toJS();
-      var moveFlag = true;
+      var moveFlag = [];
       var tx = vertices[drawingLine.vertices[1]].x;
       var ty = vertices[drawingLine.vertices[1]].y;
       if (!(0, _helper.isEmpty)(relatedLines)) {
@@ -524,41 +518,63 @@ var Line = exports["default"] = /*#__PURE__*/function () {
         vertices[drawingLine.vertices[1]].y = y;
       }
       var absAngle, lineAngle;
+      var angles = [];
 
       // get the angle of two lines and check the angle
       if (drawingLine.vertices[0] !== drawingLine.vertices[1]) {
-        relatedLines.forEach(function (line) {
-          // get the points of two lines(drawing line and related line)
-          if (!(0, _helper.isEmpty)(line)) {
-            // the angle between two lines(line, drawingLine)
-            lineAngle = _export2.GeometryUtils.angleBetweenTwoLines(line, drawingLine, vertices);
-            // check whether the angle is less than or bigger than specific value.
-            absAngle = Math.abs(lineAngle);
-            if (absAngle < _constants.MIN_ANGLE_DISALLOW_DRAW_WALL || absAngle > 360 - _constants.MIN_ANGLE_DISALLOW_DRAW_WALL) {
-              moveFlag = false;
-            } else moveFlag = true;
-          }
-        });
+        if (!(0, _helper.isEmpty)(relatedLines)) {
+          relatedLines.forEach(function (line) {
+            // get the points of two lines(drawing line and related line)
+            if (!(0, _helper.isEmpty)(line)) {
+              // the angle between two lines(line, drawingLine)
+              lineAngle = _export2.GeometryUtils.angleBetweenTwoLines(line, drawingLine, vertices);
+              // check whether the angle is less than or bigger than specific value.
+              absAngle = Math.abs(lineAngle);
+              angles.push(lineAngle);
+              if (absAngle < _constants.MIN_ANGLE_DISALLOW_DRAW_WALL || absAngle > 360 - _constants.MIN_ANGLE_DISALLOW_DRAW_WALL) {
+                moveFlag.push(false);
+              } else moveFlag.push(true);
+            }
+          });
+        } else {
+          var px = vertices[drawingLine.vertices[0]].x;
+          var py = vertices[drawingLine.vertices[0]].y;
+          lineAngle = _export2.GeometryUtils.angleBetweenTwoPointsAndOrigin(px, py, x, y);
+          absAngle = Math.abs(lineAngle);
+        }
       }
 
       // if the angle is bigger or less than specific value, the wall mustn't be drawn at new position
-      if (moveFlag) {
+      if (!moveFlag.some(function (flag) {
+        return flag === false;
+      })) {
         tx = x;
         ty = y;
       } else {
-        var rest = _constants.MIN_ANGLE_DISALLOW_DRAW_WALL - absAngle;
         // the origin point of rotation(snapping)
         var ox = vertices[drawingLine.vertices[0]].x;
         var oy = vertices[drawingLine.vertices[0]].y;
-        // determine the direction of rotation.
-        rest = lineAngle > 0 ? -rest : rest;
-        // rotate the current point to last point around the first point of drawing line.
-        var res = _export2.GeometryUtils.rotatePointAroundPoint(x, y, ox, oy, rest);
-        tx = res.x;
-        ty = res.y;
+        angles.forEach(function (angle, index) {
+          if (!moveFlag[index]) {
+            var absVal = Math.abs(angle);
+            var rest = _constants.MIN_ANGLE_DISALLOW_DRAW_WALL - absVal;
+            if (absVal > 360 - _constants.MIN_ANGLE_DISALLOW_DRAW_WALL) {
+              absVal = 360 - absVal;
+              rest = -(_constants.MIN_ANGLE_DISALLOW_DRAW_WALL - absVal);
+            }
+            // determine the direction of rotation.
+            rest = angle > 0 ? -rest : rest;
+            // rotate the current point to last point around the first point of drawing line.
+            var res = _export2.GeometryUtils.rotatePointAroundPoint(x, y, ox, oy, rest);
+            tx = res.x;
+            ty = res.y;
+          }
+        });
       }
       // angle snapping as a value of UNIT_ANGLE
-      if (moveFlag && !(0, _helper.isEmpty)(absAngle) && absAngle % _constants.UNIT_ANGLE !== 0) {
+      if (!moveFlag.some(function (flag) {
+        return flag === false;
+      }) && !(0, _helper.isEmpty)(absAngle) && absAngle % _constants.UNIT_ANGLE !== 0) {
         var result = _export2.GeometryUtils.snapAngleByUnit(lineAngle, vertices, drawingLine, tx, ty, drawingLine.vertices[1]);
         tx = result.x;
         ty = result.y;
@@ -624,9 +640,10 @@ var Line = exports["default"] = /*#__PURE__*/function () {
       var _this3 = this;
       var layer = state.getIn(['scene', 'layers', layerID]);
       var allVertices = state.getIn(['scene', 'layers', layerID, 'vertices']);
-      selectedLineInfo.points.forEach(function (vertex, index) {
-        vertex = vertex.toJS();
-        if (vertex.lines.length === 2) {
+      selectedLineInfo.points.forEach(function (tvertex, index) {
+        var _tvertex$toJS, _vertex$lines;
+        var vertex = tvertex === null || tvertex === void 0 || (_tvertex$toJS = tvertex.toJS) === null || _tvertex$toJS === void 0 ? void 0 : _tvertex$toJS.call(tvertex);
+        if (vertex && !(0, _helper.isEmpty)(vertex) && ((_vertex$lines = vertex.lines) === null || _vertex$lines === void 0 ? void 0 : _vertex$lines.length) === 2) {
           var relatedLineID = vertex.lines.filter(function (lineID) {
             return !selectedLineInfo.mergelines.some(function (mgline) {
               return mgline.id === lineID;
@@ -634,27 +651,33 @@ var Line = exports["default"] = /*#__PURE__*/function () {
           });
           if (!(0, _helper.isEmpty)(relatedLineID)) {
             var relatedLine = layer.lines.get(relatedLineID[0]);
-            var intersectionPoint = vertex;
-            var startPoint, endPoint;
-            if (relatedLine.vertices.get(0) === intersectionPoint.id) {
-              endPoint = allVertices.get(relatedLine.vertices.get(1));
-              startPoint = selectedLineInfo.points[1 - index];
-            } else {
-              startPoint = allVertices.get(relatedLine.vertices.get(0));
-              endPoint = selectedLineInfo.points[1 - index];
-            }
-            var tline1 = {
-              vertices: [startPoint.id, intersectionPoint.id]
-            };
-            var tline2 = {
-              vertices: [intersectionPoint.id, endPoint.id]
-            };
-            var angle = Math.abs(_export2.GeometryUtils.angleBetweenTwoLines(tline1, tline2, allVertices.toJS()));
-            if (Math.abs(angle - 180) <= _constants.EPSILON) {
-              selectedLineInfo.mergelines.push(relatedLine);
-              selectedLineInfo.points[0] = startPoint;
-              selectedLineInfo.points[1] = endPoint;
-              return _this3.mergeAllLines(state, selectedLineInfo, layerID);
+            if (!(0, _helper.isEmpty)(relatedLine)) {
+              var intersectionPoint = vertex;
+              var startPoint, endPoint;
+              var tstPoint = allVertices.get(relatedLine.vertices.get(0)).toJS();
+              var tedPoint = allVertices.get(relatedLine.vertices.get(1)).toJS();
+              if (!(0, _helper.isEmpty)(tstPoint) && !(0, _helper.isEmpty)(tedPoint)) {
+                if (relatedLine.vertices.get(0) === intersectionPoint.id) {
+                  endPoint = allVertices.get(relatedLine.vertices.get(1));
+                  startPoint = selectedLineInfo.points[1 - index];
+                } else {
+                  startPoint = allVertices.get(relatedLine.vertices.get(0));
+                  endPoint = selectedLineInfo.points[1 - index];
+                }
+                var tline1 = {
+                  vertices: [startPoint.id, intersectionPoint.id]
+                };
+                var tline2 = {
+                  vertices: [intersectionPoint.id, endPoint.id]
+                };
+                var angle = Math.abs(_export2.GeometryUtils.angleBetweenTwoLines(tline1, tline2, allVertices.toJS()));
+                if (Math.abs(angle - 180) <= _constants.EPSILON) {
+                  selectedLineInfo.mergelines.push(relatedLine);
+                  selectedLineInfo.points[0] = startPoint;
+                  selectedLineInfo.points[1] = endPoint;
+                  return _this3.mergeAllLines(state, selectedLineInfo, layerID);
+                }
+              }
             }
           }
         }
@@ -669,9 +692,7 @@ var Line = exports["default"] = /*#__PURE__*/function () {
       var lineID = state.getIn(['scene', 'layers', layerID, 'selected', 'lines']).first();
       var line = state.getIn(['scene', 'layers', layerID, 'lines', lineID]);
       if ((0, _helper.isEmpty)(line)) {
-        return {
-          updatedState: state
-        };
+        return null;
       }
       var tmpStPoint = allVertices.get(line.vertices.get(0));
       var tmpEdPoint = allVertices.get(line.vertices.get(1));
@@ -693,7 +714,12 @@ var Line = exports["default"] = /*#__PURE__*/function () {
     key: "createLines",
     value: function createLines(state, actionType, mergeInfo) {
       var _this4 = this,
-        _ret;
+        _ret2;
+      if ((0, _helper.isEmpty)(mergeInfo)) {
+        return {
+          updatedState: state
+        };
+      }
       var layerID = state.getIn(['scene', 'selectedLayer']);
       var layer = state.getIn(['scene', 'layers', layerID]);
       var lineGroups = [];
@@ -706,6 +732,7 @@ var Line = exports["default"] = /*#__PURE__*/function () {
         };
       }
       mergeInfo.mergelines.forEach(function (line) {
+        var _nv0$toJS, _nv1$toJS;
         if ([_constants.END_DRAGGING_LINE, _constants.END_DRAGGING_VERTEX].includes(actionType)) {
           var tmpGroups = state //get groups membership if present
           .getIn(['scene', 'groups']).filter(function (group) {
@@ -718,10 +745,12 @@ var Line = exports["default"] = /*#__PURE__*/function () {
         }
         var nv0 = layer.getIn(['vertices', line.vertices.get(0)]);
         var nv1 = layer.getIn(['vertices', line.vertices.get(1)]);
-        var tmpholeposition = _this4.getHolePosition(layer, line.id, nv0, nv1);
-        tmpholeposition.forEach(function (holeInfo) {
-          return holesWithOffsetPosition.push(holeInfo);
-        });
+        if (!(0, _helper.isEmpty)(nv0 === null || nv0 === void 0 || (_nv0$toJS = nv0.toJS) === null || _nv0$toJS === void 0 ? void 0 : _nv0$toJS.call(nv0)) && !(0, _helper.isEmpty)(nv1 === null || nv1 === void 0 || (_nv1$toJS = nv1.toJS) === null || _nv1$toJS === void 0 ? void 0 : _nv1$toJS.call(nv1))) {
+          var tmpholeposition = _this4.getHolePosition(layer, line.id, nv0, nv1);
+          tmpholeposition.forEach(function (holeInfo) {
+            return holesWithOffsetPosition.push(holeInfo);
+          });
+        }
         state = Line.remove(state, layerID, line.id).updatedState;
       });
       var ret;
@@ -730,16 +759,18 @@ var Line = exports["default"] = /*#__PURE__*/function () {
         state = ret.updatedState;
       }
       if ([_constants.END_DRAGGING_LINE, _constants.END_DRAGGING_VERTEX].includes(actionType)) {
+        var _ret;
         //re-add to old line's groups if present
-        ret.lines.forEach(function (addedLine) {
+        (_ret = ret) === null || _ret === void 0 || _ret.lines.forEach(function (addedLine) {
           lineGroups.forEach(function (oldLineGroup) {
             state = _export.Group.addElement(state, oldLineGroup.id, layerID, 'lines', addedLine.id).updatedState;
           });
         });
       }
       state = _export.Layer.removeZeroLengthLines(state, layerID).updatedState;
-      if (!(0, _helper.isEmpty)((_ret = ret) === null || _ret === void 0 ? void 0 : _ret.newline)) {
-        state = this.select(state, layerID, ret.newline.get('id')).updatedState;
+      if (!(0, _helper.isEmpty)((_ret2 = ret) === null || _ret2 === void 0 ? void 0 : _ret2.newline)) {
+        var _ret3;
+        state = this.select(state, layerID, (_ret3 = ret) === null || _ret3 === void 0 ? void 0 : _ret3.newline.get('id')).updatedState;
       }
       return {
         updatedState: state
@@ -783,11 +814,13 @@ var Line = exports["default"] = /*#__PURE__*/function () {
           updatedState: state
         };
       }
-      if (!(0, _helper.isEmpty)(v0)) {
+      var tv0 = state.getIn(['scene', 'layers', layerID, 'vertices', line.vertices.get(0)]).toJS();
+      var tv1 = state.getIn(['scene', 'layers', layerID, 'vertices', line.vertices.get(1)]).toJS();
+      if (!(0, _helper.isEmpty)(v0) && !(0, _helper.isEmpty)(tv0)) {
         state = state.setIn(['scene', 'layers', layerID, 'vertices', line.vertices.get(0), 'x'], v0.x);
         state = state.setIn(['scene', 'layers', layerID, 'vertices', line.vertices.get(0), 'y'], v0.y);
       }
-      if (!(0, _helper.isEmpty)(v1)) {
+      if (!(0, _helper.isEmpty)(v1) && !(0, _helper.isEmpty)(tv1)) {
         state = state.setIn(['scene', 'layers', layerID, 'vertices', line.vertices.get(1), 'x'], v1.x);
         state = state.setIn(['scene', 'layers', layerID, 'vertices', line.vertices.get(1), 'y'], v1.y);
       }
@@ -811,6 +844,11 @@ var Line = exports["default"] = /*#__PURE__*/function () {
       var layerID = state.getIn(['drawingSupport', 'layerID']);
       var lineID = state.getIn(['scene', 'layers', layerID, 'selected', 'lines']).first();
       var drawingLine = state.getIn(['scene', 'layers', layerID, 'lines', lineID]).toJS();
+      if ((0, _helper.isEmpty)(drawingLine)) {
+        return {
+          updatedState: state
+        };
+      }
       if (drawingLine.vertices[0] === drawingLine.vertices[1]) {
         state = Line.remove(state, layerID, lineID).updatedState;
         state = state.merge({
@@ -1003,6 +1041,11 @@ var Line = exports["default"] = /*#__PURE__*/function () {
       var line = layer.lines.get(lineID);
       var drawedLine = line.toJS();
       var allVertices = state.getIn(['scene', 'layers', layerID, 'vertices']).toJS();
+      if ((0, _helper.isEmpty)(drawedLine)) {
+        return {
+          updatedState: state
+        };
+      }
       var diffX = x - draggingSupport.get('startPointX');
       var diffY = y - draggingSupport.get('startPointY');
       var newVertex0X = draggingSupport.get('startVertex0X') + diffX;
@@ -1183,4 +1226,5 @@ var Line = exports["default"] = /*#__PURE__*/function () {
       };
     }
   }]);
-}();
+}();
+module.exports = exports.default;

package/lib/class/project.js

@@ -1,9 +1,14 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _immutable = require("immutable");
 var _constants = _interopRequireWildcard(require("../constants"));
 var constants = _constants;
@@ -13,20 +18,13 @@ var _export2 = require("../class/export");
 var viewer2DActions = _interopRequireWildcard(require("../actions/viewer2d-actions"));
 var _helper = require("../utils/helper");
 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; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
-function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
-function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var Project = exports["default"] = /*#__PURE__*/function () {
   function Project() {
-    _classCallCheck(this, Project);
+    (0, _classCallCheck2["default"])(this, Project);
   }
-  return _createClass(Project, null, [{
+  return (0, _createClass2["default"])(Project, null, [{
     key: "setAlterate",
     value: function setAlterate(state) {
       return {
@@ -45,7 +43,6 @@ var Project = exports["default"] = /*#__PURE__*/function () {
     key: "newProject",
     value: function newProject(state) {
       var doorStyle = state.toJS().doorStyle === null ? null : state.toJS().doorStyle;
-      var oStyle = state.oStyle;
       // let counterTop = state.getIn(['scene', 'layers', layerID, 'counterTop']);
       // let floorStyle = state.getIn(['scene', 'layers', layerID, 'floorStyle']);
       var _viewer2D = state.viewer2D;
@@ -59,7 +56,6 @@ var Project = exports["default"] = /*#__PURE__*/function () {
       state = new _models.State({});
       state = state.merge({
         doorStyle: doorStyle,
-        oStyle: oStyle,
         viewer2D: _viewer2D
       });
       // state = Item.setCounterTop(state, counterTop).updatedState;
@@ -70,9 +66,8 @@ var Project = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "loadProject",
-    value: function loadProject(state, sceneJSON, categoryData) {
+    value: function loadProject(state, sceneJSON) {
       var doorStyle = state.doorStyle;
-      var oStyle = state.oStyle;
       var layerID = state.scene.selectedLayer;
       var _viewer2D = state.viewer2D;
       var viewer = state.viewer2D.toJS();
@@ -172,28 +167,10 @@ var Project = exports["default"] = /*#__PURE__*/function () {
       }
       state = state.merge({
         doorStyle: doorStyle,
-        oStyle: oStyle,
         viewer2D: _viewer2D
       });
       state = _export2.Item.setCounterTop(state, counterTop).updatedState;
       state = _export2.Area.setFloorStyles(state, floorStyle).updatedState;
-      if (state.getIn(['scene', 'layers', layerID, 'doorStyle']) && !state.getIn(['scene', 'layers', layerID, 'doorStyle', 'install'])) {
-        var layerDoorStyle = state.getIn(['scene', 'layers', layerID, 'doorStyle']);
-        var install = '';
-        categoryData.data.doorStyles.items.forEach(function (category) {
-          category.items.forEach(function (element) {
-            if (element.items.filter(function (it) {
-              return it.id === layerDoorStyle.id && (layerDoorStyle.install ? category.name === layerDoorStyle.install : true);
-            }).length) {
-              install = category.name;
-            }
-          });
-        });
-        layerDoorStyle = _objectSpread(_objectSpread({}, layerDoorStyle), {}, {
-          install: install
-        });
-        state = state.mergeIn(['scene', 'layers', layerID, 'doorStyle'], layerDoorStyle);
-      }
       this.updateZoomScale(state, a);
       viewer2DActions.updateCameraView(_viewer2D);
       return {
@@ -338,7 +315,7 @@ var Project = exports["default"] = /*#__PURE__*/function () {
       var delLine = !(0, _helper.isEmpty)(lineID) && state.getIn(['scene', 'layers', selectedLayer, 'lines', lineID]).toJS();
       var allLines = state.getIn(['scene', 'layers', selectedLayer, 'lines']).toJS();
       var relatedLines = [];
-      delLine && _export.GeometryUtils.getRelatedLines(relatedLines, delLine, allVertices, allLines);
+      !(0, _helper.isEmpty)(delLine) && _export.GeometryUtils.getRelatedLines(relatedLines, delLine, allVertices, allLines);
       selectedLines.forEach(function (lineID) {
         state = _export2.Line.remove(state, selectedLayer, lineID).updatedState;
       });
@@ -348,12 +325,14 @@ var Project = exports["default"] = /*#__PURE__*/function () {
       selectedItems.forEach(function (itemID) {
         state = _export2.Item.remove(state, selectedLayer, itemID).updatedState;
       });
-      if (!(0, _helper.isEmpty)(relatedLines)) {
+      if (!(0, _helper.isEmpty)(selectedLines) && !(0, _helper.isEmpty)(relatedLines)) {
         state = state.setIn(['mode'], _constants.MODE_DRAWING_LINE);
         relatedLines.forEach(function (relLine, index) {
           state = _export2.Line.select(state, selectedLayer, relLine.id).updatedState;
           state = _export2.Line.applyWallChanges(state, _constants.END_DRAWING_LINE).updatedState;
         });
+      } else {
+        state = _export2.Line.applyWallChanges(state, _constants.END_DRAWING_LINE).updatedState;
       }
       state = _export2.Layer.unselectAll(state, selectedLayer).updatedState;
       var mode = state.getIn(['mode']);
@@ -487,6 +466,10 @@ var Project = exports["default"] = /*#__PURE__*/function () {
         };
       }
       var mode;
+      var isLineAction = false;
+      if (state.mode.includes('LINE')) {
+        isLineAction = true;
+      }
       if (state.mode == _constants.MODE_DRAWING_ITEM_3D) {
         mode = _constants.MODE_IDLE_3D;
         if (state.drawingSupport.has('currentID')) state = _export2.Layer.removeElement(state, state.scene.selectedLayer, 'items', state.drawingSupport.get('currentID')).updatedState;
@@ -529,6 +512,9 @@ var Project = exports["default"] = /*#__PURE__*/function () {
         draggingSupport: new _immutable.Map(),
         rotatingSupport: new _immutable.Map()
       });
+      if (isLineAction) {
+        state = _export2.Line.applyWallChanges(state, _constants.END_DRAWING_LINE).updatedState;
+      }
       return {
         updatedState: state
       };
@@ -601,6 +587,24 @@ var Project = exports["default"] = /*#__PURE__*/function () {
         };
       }
     }
+  }, {
+    key: "addElementToCatalog",
+    value: function addElementToCatalog(state, element) {
+      try {
+        var elements = state.getIn(['catalog', 'elements']).toJS();
+        elements[element.name] = element;
+        var newElements = (0, _models.safeLoadMapList)(elements, _models.CatalogElement);
+        state = state.setIn(['catalog', 'elements'], newElements);
+        return {
+          updatedState: state
+        };
+      } catch (error) {
+        console.log('addElementToCatalogError', error);
+        return {
+          updatedState: state
+        };
+      }
+    }
   }, {
     key: "updateMouseCoord",
     value: function updateMouseCoord(state, coords) {
@@ -796,4 +800,5 @@ var Project = exports["default"] = /*#__PURE__*/function () {
       };
     }
   }]);
-}();
+}();
+module.exports = exports.default;