kitchen-simulator 1.0.0-clark.67 → 1.0.0-clark.71

package/es/components/viewer2d/ruler.js

@@ -2,7 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { convert } from "../../utils/convert-units-lite";
 import IDBroker from "../../utils/id-broker";
-import { LINE_THICKNESS, TEXT_COLOR_NEUTRAL_7 } from "../../constants";
+import { TEXT_COLOR_NEUTRAL_7 } from "../../constants";
+import { STYLE_ROOM_SHAPE } from "./line";
 var STYLE = {
   stroke: TEXT_COLOR_NEUTRAL_7,
   strokeWidth: '1px'
@@ -15,6 +16,7 @@ var STYLE_TEXT = {
   textAnchor: 'middle',
   fontSize: '12px',
   pointerEvents: 'none',
+  fill: '#455A64',
   //http://stackoverflow.com/questions/826782/how-to-disable-text-selection-highlighting-using-css
   WebkitTouchCallout: 'none' /* iOS Safari */,
   WebkitUserSelect: 'none' /* Chrome/Safari/Opera */,
@@ -28,37 +30,9 @@ export default function Ruler(_ref) {
     unit = _ref.unit,
     rulerUnit = _ref.rulerUnit,
     transform = _ref.transform,
-    flag = _ref.flag;
-  var update = function update(lengthInput, unitInput, type) {
-    var newLength = toFixedFloat(lengthInput);
-    var merged = null;
-    if (type === 0) {
-      merged = value.merge({
-        _length: newLength,
-        length: convert(newLength).from(unitInput).to('cm')
-      });
-    } else {
-      merged = value.merge({
-        _length: convert(newLength).from(UNIT_INCH).to(unitInput),
-        _unit: unitInput
-      });
-    }
-    // if (hook) {
-    //   return hook(merged, sourceElement, internalState, state).then(val => {
-    //     return onUpdate(val);
-    //   });
-    // }
-    // return onUpdate(merged);
-  };
-  // let _unit = "in";
-  // let distanceText = convert(length).from(unit).to(rulerUnit);
+    style = _ref.style;
   var distanceText = convert(length).from(unit).to(rulerUnit).toFixed(0);
-  var thickness = convert(LINE_THICKNESS).from(unit).to(rulerUnit).toFixed(0);
-  // let _ft_len = convert(_length).from('in').to('ft');
-  // let _ft_val = Math.floor(_ft_len); _ft_len -= _ft_val;
-  // let _in_val = convert(_ft_len).from('ft').to('in').toFixed(0);
-  // let distanceText = `${_ft_val}'${_in_val}"`;
-  var textLength = (distanceText.length + layer.unit.length) * 18;
+  var textLength = (distanceText.length + layer.unit.length) * 9;
   return /*#__PURE__*/React.createElement("g", {
     transform: transform
   }, /*#__PURE__*/React.createElement("g", {
@@ -79,18 +53,24 @@ export default function Ruler(_ref) {
     style: STYLE_TEXT,
     fill: TEXT_COLOR_NEUTRAL_7
   }, Math.round(convert(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit === 'in' ? '"' : layer.unit)), /*#__PURE__*/React.createElement("line", {
-    x1: "0",
+    x1: style === STYLE_ROOM_SHAPE ? 0 : 4,
     y1: "0",
     x2: (length - textLength) / 2 < 0 ? 0 : (length - textLength) / 2,
     y2: "0",
-    style: STYLE
+    style: style
   }), /*#__PURE__*/React.createElement("line", {
     x1: (length + textLength) / 2 < 0 ? 0 : (length + textLength) / 2 < length ? (length + textLength) / 2 : length,
     y1: "0",
-    x2: length,
+    x2: style === STYLE_ROOM_SHAPE ? length : length - 4,
     y2: "0",
-    style: STYLE
-  }));
+    style: style
+  }), style !== STYLE_ROOM_SHAPE && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("polygon", {
+    points: "3, 0, 6.5, -2, 6.5, 2 ",
+    style: style
+  }), /*#__PURE__*/React.createElement("polygon", {
+    points: "".concat(length - 3, ", 0, ").concat(length - 6.5, ", 2, ").concat(length - 6.5, ", -2"),
+    style: style
+  })));
 }
 Ruler.propTypes = {
   length: PropTypes.number.isRequired,

package/es/components/viewer2d/rulerDist.js

@@ -7,13 +7,15 @@ var ARROW_STYLE = {
   strokeLinecap: 'round'
 };
 var STYLE = {
-  stroke: 'black',
-  strokeWidth: '1.1px'
+  stroke: '#455A64',
+  fill: '#455A64',
+  strokeWidth: '1.5px'
 };
 var STYLE_TEXT = {
   textAnchor: 'middle',
   fontSize: '10px',
   pointerEvents: 'none',
+  fill: '#455A64',
   //http://stackoverflow.com/questions/826782/how-to-disable-text-selection-highlighting-using-css
   WebkitTouchCallout: 'none' /* iOS Safari */,
   WebkitUserSelect: 'none' /* Chrome/Safari/Opera */,
@@ -75,32 +77,24 @@ export default function RulerDist(_ref) {
       y: "0",
       transform: "translate(".concat(length / 2, ",").concat(ay, ") scale(1, -1) rotate(").concat(textRotation, ")"),
       style: STYLE_TEXT
-    }, Math.round(convert(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit)), /*#__PURE__*/React.createElement("circle", {
-      cx: "1",
-      cy: "0",
-      fill: "white",
-      r: "1.1",
-      stroke: "black",
-      strokeWidth: "0.6"
-    }), /*#__PURE__*/React.createElement("line", {
+    }, Math.round(convert(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit === 'in' ? '"' : layer.unit)), /*#__PURE__*/React.createElement("line", {
       x1: "2",
       y1: "0",
       x2: (length - textLength) / 2 < 0 ? 0 : length,
       y2: "0",
       style: STYLE
+    }), /*#__PURE__*/React.createElement("polygon", {
+      points: "1, 0, 4.5, -2, 4.5, 2 ",
+      style: STYLE
     }), /*#__PURE__*/React.createElement("line", {
       x1: (length + textLength) / 2 < 0 ? 0 : (length + textLength) / 2 < length ? (length + textLength) / 2 : length,
       y1: "0",
       x2: length,
       y2: "0",
       style: STYLE
-    }), /*#__PURE__*/React.createElement("circle", {
-      cx: length - 1,
-      cy: "0",
-      fill: "white",
-      r: "1.1",
-      stroke: "black",
-      strokeWidth: "0.6"
+    }), /*#__PURE__*/React.createElement("polygon", {
+      points: "".concat(length - 1, ", 0, ").concat(length - 4.5, ", 2, ").concat(length - 4.5, ", -2"),
+      style: STYLE
     }));
   } else {
     return /*#__PURE__*/React.createElement("g", {
@@ -110,32 +104,24 @@ export default function RulerDist(_ref) {
       y: "0",
       transform: "translate(".concat(length / 2, ",").concat(ay, ") scale(1, -1) rotate(").concat(textRotation, ")"),
       style: STYLE_TEXT
-    }, Math.round(convert(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit)), /*#__PURE__*/React.createElement("circle", {
-      cx: "1",
-      cy: "0",
-      fill: "white",
-      r: "1.1",
-      stroke: "black",
-      strokeWidth: "0.6"
-    }), /*#__PURE__*/React.createElement("line", {
+    }, Math.round(convert(distanceText).from('in').to(layer.unit) * 100) / 100, layer.unit === 'in' ? '"' : layer.unit)), /*#__PURE__*/React.createElement("line", {
       x1: "2",
       y1: "0",
       x2: (length - textLength) / 2 < 0 ? 0 : (length - textLength) / 2,
       y2: "0",
       style: STYLE
+    }), /*#__PURE__*/React.createElement("polygon", {
+      points: "1, 0, 4.5, -2, 4.5, 2 ",
+      style: STYLE
     }), /*#__PURE__*/React.createElement("line", {
       x1: (length + textLength) / 2 < 0 ? 0 : (length + textLength) / 2 < length ? (length + textLength) / 2 : length,
       y1: "0",
       x2: length,
       y2: "0",
       style: STYLE
-    }), /*#__PURE__*/React.createElement("circle", {
-      cx: length - 1,
-      cy: "0",
-      fill: "white",
-      r: "1.1",
-      stroke: "black",
-      strokeWidth: "0.6"
+    }), /*#__PURE__*/React.createElement("polygon", {
+      points: "".concat(length - 1, ", 0, ").concat(length - 4.5, ", 2, ").concat(length - 4.5, ", -2"),
+      style: STYLE
     }));
   }
 }

package/es/components/viewer2d/viewer2d.js

@@ -390,6 +390,7 @@ export default function Viewer2D(_ref, _ref2) {
       vertices[dragVertexId].y = y;
     }
     var absAngle, lineAngle;
+    var angles = [];
     if (draggingLine.vertices[0] !== draggingLine.vertices[1]) {
       if (isEmpty(relatedLines) && mode !== 'DRAGGING_LINE') {
         endDrag.push(true);
@@ -408,6 +409,7 @@ export default function Viewer2D(_ref, _ref2) {
         absAngle = Math.abs(lineAngle);
         var tmpRelated = [];
         GeometryUtils.getRelatedLines(tmpRelated, line, vertices, allLines, draggingLine.id);
+        angles.push(lineAngle);
         for (var j = 0; j < tmpRelated.length; j++) {
           var tmpAngle = Math.abs(GeometryUtils.angleBetweenTwoLines(tmpRelated[j], line, vertices));
           if (tmpAngle < MIN_ANGLE_DISALLOW_DRAW_WALL || tmpAngle > 360 - MIN_ANGLE_DISALLOW_DRAW_WALL) {
@@ -425,7 +427,6 @@ export default function Viewer2D(_ref, _ref2) {
       vtx = x;
       vty = y;
     } else {
-      var rest = MIN_ANGLE_DISALLOW_DRAW_WALL - absAngle;
       // the origin point of rotation(snapping)
       var _originVerId = draggingLine.vertices.findIndex(function (vertice) {
         return vertice !== dragVertexId;
@@ -434,12 +435,22 @@ export default function Viewer2D(_ref, _ref2) {
       if (stepUnit) {
         var _ox = vertices[_originVerId].x;
         var _oy = vertices[_originVerId].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 = GeometryUtils.rotatePointAroundPoint(x, y, _ox, _oy, rest);
-        vtx = res.x;
-        vty = res.y;
+        angles.forEach(function (angle, index) {
+          if (Math.abs(angle) < MIN_ANGLE_DISALLOW_DRAW_WALL || Math.abs(angle) > 360 - MIN_ANGLE_DISALLOW_DRAW_WALL) {
+            var absVal = Math.abs(angle);
+            var rest = MIN_ANGLE_DISALLOW_DRAW_WALL - absVal;
+            if (absVal > 360 - MIN_ANGLE_DISALLOW_DRAW_WALL) {
+              absVal = 360 - absVal;
+              rest = -(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 = GeometryUtils.rotatePointAroundPoint(x, y, _ox, _oy, rest);
+            vtx = res.x;
+            vty = res.y;
+          }
+        });
       }
     }
 

package/es/constants.js

@@ -545,6 +545,12 @@ export var LABEL_COLOR = '#6E7191';
 export var TEXT_COLOR = '#000000';
 export var ACCENT_COLOR = '#AD00FF';
 export var BROWN_COLOR = '#624100';
+export var ROOM_SHAPE_MEASUREMENT_LINE_COLOR = '#455A64';
+export var ROOM_ELEMENT_MEASUREMENT_LINE_COLOR = '#B0BEC5';
+export var BASE_ITEM_MEASUREMENT_LINE_COLOR = '#0277BD';
+export var WALL_ITEM_MEASUREMENT_LINE_COLOR = '#00897B';
+export var DISTANCE_MEASUREMENT_LINE_COLOR = '#7B1FA2';
+export var DASH_LINE_COLOR = '#78909C';
 export var DEFAULT_FONT_FAMILY = 'Open Sans';
 
 // Download summary

package/es/models.js

@@ -38,16 +38,16 @@ export var DefaultGrids = new Map({
     id: 'h1',
     type: 'horizontal-streak',
     properties: {
-      step: 30.48,
-      colors: ['#bbb', '#bbb', '#bbb', '#bbb', '#bbb'] // dot's color
+      step: 24,
+      colors: ['rgba(193, 202, 228, 0.45)'] // dot's color
     }
   }),
   v1: new Grid({
     id: 'v1',
     type: 'vertical-streak',
     properties: {
-      step: 30.48,
-      colors: ['#bbb', '#bbb', '#bbb', '#bbb', '#bbb'] // dot's color
+      step: 24,
+      colors: ['rgba(193, 202, 228, 0.45)'] // dot's color
     }
   })
 });
@@ -339,7 +339,8 @@ export var CatalogElement = /*#__PURE__*/function (_Record1) {
   properties: new Map(),
   obj: new Map(),
   type: '',
-  cds: new Map()
+  cds: new Map(),
+  customer_property: new Map()
 }, 'CatalogElement'));
 export var Catalog = /*#__PURE__*/function (_Record10) {
   function Catalog() {

package/es/shared-style.js

@@ -54,13 +54,13 @@ export var AREA_MESH_COLOR = {
   unselected: 'rgb(221,221,255)'
 };
 export var INTERIOR_LINE = {
-  unselected: ' #0a0a10',
-  selected: '#4C12A1'
+  selected: '#6E1EA8',
+  unselected: ' #455A64'
 };
 export var LINE_MESH_COLOR = {
-  selected: '#4C12A1',
+  selected: '#6E1EA8',
   unselected: 'rgb(135,145,171)'
 };
 export var LINE_MESH = {
-  selected: '#4C12A1'
+  selected: '#6E1EA8'
 };

package/es/utils/isolate-event-handler.js

@@ -504,6 +504,11 @@ function _handleExternalEvent() {
           }
           _element = evt.payload;
           catalog = state.getIn(['catalog']).toJS(); // add item to catalog of state
+          _element = _objectSpread(_objectSpread({}, _element), {}, {
+            cds: {
+              itemID: _element.itemID
+            }
+          });
           if (!isEmpty(catalog === null || catalog === void 0 ? void 0 : catalog.elements[_element.name])) {
             _context5.next = 8;
             break;

package/lib/catalog/factories/wall-factory.js

@@ -27,11 +27,11 @@ var STYLE_LINE = {
   // strokeWidth:1
 };
 var STYLE_INTERIOR_LINE = {
-  strokeWidth: 1,
+  strokeWidth: 2,
   stroke: SharedStyle.INTERIOR_LINE.unselected
 };
 var STYLE_INTERIOR_LINE_SELECTED = {
-  strokeWidth: 2,
+  strokeWidth: 4,
   stroke: SharedStyle.INTERIOR_LINE.selected,
   fill: SharedStyle.INTERIOR_LINE.selected,
   rx: '2px'
@@ -224,9 +224,9 @@ function WallFactory(name, info, textures) {
       })));
       return !element.selected ? /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("polygon", {
         points: "".concat(x1, ",").concat(y1, " ").concat(related0x, ",").concat(related0y, " ").concat(related1x, ",").concat(related1y, " ").concat(x2, ",").concat(y2),
-        fill: "url(#pat)",
-        fillRule: "evenodd"
-      }), outwall, /*#__PURE__*/_react["default"].createElement("line", {
+        fill: "#CFD8DC"
+        // fillRule="evenodd"
+      }), /*#__PURE__*/_react["default"].createElement("line", {
         x1: x1,
         y1: y1,
         x2: x2,
@@ -234,9 +234,9 @@ function WallFactory(name, info, textures) {
         style: STYLE_INTERIOR_LINE
       })) : /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("polygon", {
         points: "".concat(x1, ",").concat(y1, " ").concat(related0x, ",").concat(related0y, " ").concat(related1x, ",").concat(related1y, " ").concat(x2, ",").concat(y2),
-        fill: "url(#pat)",
-        fillRule: "evenodd"
-      }), outwall, /*#__PURE__*/_react["default"].createElement("line", {
+        fill: "#CFD8DC"
+        // fillRule="evenodd"
+      }), /*#__PURE__*/_react["default"].createElement("line", {
         x1: x1,
         y1: y1,
         x2: x2,

package/lib/catalog/utils/exporter.js

@@ -27,6 +27,7 @@ function _default(_ref) {
     alti = _ref.alti,
     obj_property = _ref.obj_property,
     outlineSVGData = _ref.outlineSVGData,
+    customer_property = _ref.customer_property,
     cds = _ref.cds;
   var _length = alti || 0;
   // const length = convert(_length).from("in").to("cm");
@@ -143,6 +144,7 @@ function _default(_ref) {
     img: base,
     obj: obj_property,
     cds: cds,
+    customer_property: customer_property,
     render2D: function render2D(element, layer, scene) {
       return render2DItem.call(this, element, layer, scene, sizeinfo, layoutpos, is_corner, shape_svg);
     },

package/lib/catalog/utils/item-loader.js

@@ -369,8 +369,14 @@ function render3DItem(element, layer, scene, sizeinfo, structure_json, is_corner
   if (layer.toJS().counterTop.uri) {
     counterTop.uri = layer.toJS().counterTop.uri;
   }
-  if ('name' in element.doorStyle) {
-    doorStyles = new _immutable.Map(element.doorStyle.doorStyles);
+  if (element.doorStyle.has('name')) {
+    var tempDoorStyle = element.doorStyle.toJS().doorStyles;
+    if (!tempDoorStyle.hasOwnProperty('base')) {
+      tempDoorStyle = _objectSpread(_objectSpread({}, tempDoorStyle), {}, {
+        base: ''
+      });
+    }
+    doorStyles = new _immutable.Map(tempDoorStyle);
     color = element.doorStyle.color;
     glossness = element.doorStyle.glossness;
     handleMaterial.metalness = element.doorStyle.metalness;

package/lib/class/item.js

@@ -78,9 +78,7 @@ var Item = exports["default"] = /*#__PURE__*/function () {
       }
       var setSizeOfItemByDoorStyle = function setSizeOfItemByDoorStyle() {
         var doorStyle = item.get('doorStyle').toJS();
-        var euroCDS = state.catalog.getIn(['elements', type, 'cds']).data.filter(function (element) {
-          return element && element.is_euro_cds;
-        });
+        var euroCDS = state.catalog.getIn(['elements', type, 'customer_property']).is_euro_cds;
         if (doorStyle.door_style_name === 'Euro & Frameless' && euroCDS.length > 0) {
           var newProperties = item.get('properties').toJS();
           if (newProperties.hasOwnProperty('depth')) {

package/lib/class/line.js

@@ -510,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)) {
@@ -518,6 +518,7 @@ 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]) {
@@ -529,9 +530,10 @@ var Line = exports["default"] = /*#__PURE__*/function () {
               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 = false;
-              } else moveFlag = true;
+                moveFlag.push(false);
+              } else moveFlag.push(true);
             }
           });
         } else {
@@ -543,23 +545,36 @@ var Line = exports["default"] = /*#__PURE__*/function () {
       }
 
       // 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;

package/lib/components/viewer2d/grids/grid-streak.js

@@ -29,7 +29,7 @@ function GridStreak(_ref) {
         key: i,
         cx: x,
         cy: y,
-        r: 1.5,
+        r: 2,
         fill: color
       }));
     }

package/lib/components/viewer2d/item.js

@@ -127,11 +127,11 @@ function Item(_ref, _ref2) {
     var selectedItem;
     if (layer.selected.items.size > 0) {
       selectedItem = layer.getIn(['items', layer.selected.items.get(0)]);
-      var catid = selectedItem.type;
-      var cat = (0, _geometry.findCatalogElement)(catalog, catid);
+      var _catid = selectedItem.type;
+      var _cat = (0, _geometry.findCatalogElement)(catalog, _catid);
       currentItem = {
         selectedItem: selectedItem,
-        cat: cat
+        cat: _cat
       };
     }
     layer.items.forEach(function (item) {
@@ -269,7 +269,7 @@ function Item(_ref, _ref2) {
           if (_export.GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y) > _export.GeometryUtils.pointsDistance(p0.x, p0.y, coordinatePoint.x, coordinatePoint.y) && _export.GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y) > _export.GeometryUtils.pointsDistance(p1.x, p1.y, coordinatePoint.x, coordinatePoint.y)) {
             if (_export.GeometryUtils.pointsDistance(coordinatePoint.x, coordinatePoint.y, center_x, center_y) > _export.GeometryUtils.pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y)) {
               comparelength.push(_export.GeometryUtils.pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y));
-              a = Math.min.apply(null, comparelength);
+              a = Math.max.apply(null, comparelength);
             }
           }
         }
@@ -284,8 +284,13 @@ function Item(_ref, _ref2) {
   var nh = height / 2;
   var _getDistant = getDistant(x, y, val.rotRad),
     PointArray = _getDistant.PointArray;
+  var catid = item.type;
+  var cat = catalog.elements[catid];
   PointArray.forEach(function (pointElement, index) {
     if (pointElement[0] == undefined) PointArray[index][0] = 0;
+    if (pointElement[1] === -90 && cat.info.is_corner !== 1) {
+      PointArray[index][0] -= 4;
+    }
   });
   if (Array.isArray(PointArray)) {
     itemsActions.storeDistArray(layerID, id, PointArray);
@@ -314,7 +319,7 @@ function Item(_ref, _ref2) {
           length: itemDistanceFromLine,
           angle: rotation,
           rotation: element[1],
-          transform: "translate(".concat(element[1] === 180 ? -nw : element[1] === 0 ? nw : 0, ", ").concat(element[1] === 90 ? nh : element[1] === -90 ? -nh : 3 * nh / 4, ") rotate(").concat(element[1], ", 0, 0)")
+          transform: "translate(".concat(element[1] === 180 ? -nw : element[1] === 0 ? nw : 0, ", ").concat(element[1] === 90 ? nh : element[1] === -90 ? cat.info.is_corner !== 1 ? -(nh + 4) : -nh : 0, ") rotate(").concat(element[1], ", 0, 0)")
         })));
       }
     });