@crystaldesign/web-planner-logic 26.3.0-beta.8 → 26.3.0-rc.0

package/build/cjs/{DivaBoxPlanner-79175554.js → DivaBoxPlanner-185e3d91.js}

@@ -5,11 +5,11 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-d0f2d17b.js');
+var index = require('./index-f7a97168.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
-var PlannerHandler2D = require('./PlannerHandler2D-6c5cc33b.js');
+var PlannerHandler2D = require('./PlannerHandler2D-640d5871.js');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('axios');
 require('@crystaldesign/basket-model');
@@ -2162,7 +2162,7 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
                   //If rule == dir only correct this element if it is the target
 
                   if (rule.dir == 'TOP' && boxPlannerGrid.getElementHasBottomElement(allElementIds[i])) {
-                    var bottomElements = boxPlannerGrid.getBottomElements(allElementIds[i]);
+                    var bottomElements = boxPlannerGrid.getBottomElements(allElementIds[i], rule.onlyDirectNeighbor);
                     for (var bElemNr = 0; bElemNr < bottomElements.length; bElemNr++) {
                       if (targetElements.indexOf(bottomElements[bElemNr].getElementId()) >= 0) {
                         doCheckRule = true;
@@ -2170,7 +2170,7 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
                     }
                   }
                   if (rule.dir == 'DOWN' && boxPlannerGrid.getElementHasTopElement(allElementIds[i])) {
-                    var topElements = boxPlannerGrid.getTopElements(allElementIds[i]);
+                    var topElements = boxPlannerGrid.getTopElements(allElementIds[i], rule.onlyDirectNeighbor);
                     for (var tElemNr = 0; tElemNr < topElements.length; tElemNr++) {
                       if (targetElements.indexOf(topElements[tElemNr].getElementId()) >= 0) {
                         doCheckRule = true;
@@ -2179,7 +2179,7 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
                   }
                   if (rule.dir == 'LEFT_RIGHT') {
                     if (boxPlannerGrid.getElementHasLeftElement(allElementIds[i])) {
-                      var allLeftElements = boxPlannerGrid.getLeftElements(allElementIds[i]);
+                      var allLeftElements = boxPlannerGrid.getLeftElements(allElementIds[i], rule.onlyDirectNeighbor);
                       for (var lElemNr = 0; lElemNr < allLeftElements.length; lElemNr++) {
                         if (targetElements.indexOf(allLeftElements[lElemNr].getElementId()) >= 0) {
                           doCheckRule = true;
@@ -2187,7 +2187,7 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
                       }
                     }
                     if (boxPlannerGrid.getElementHasRightElement(allElementIds[i])) {
-                      var allRightElements = boxPlannerGrid.getRightElements(allElementIds[i]);
+                      var allRightElements = boxPlannerGrid.getRightElements(allElementIds[i], rule.onlyDirectNeighbor);
                       for (var rElemNr = 0; rElemNr < allRightElements.length; rElemNr++) {
                         if (targetElements.indexOf(allRightElements[rElemNr].getElementId()) >= 0) {
                           doCheckRule = true;
@@ -3145,7 +3145,7 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
                 retailArticleRules: constructionRule.retailArticleRules
               };
             }
-          } else if (constructionRule.range == "singular") {
+          } else if (constructionRule.range == 'singular') {
             var _allValid = false;
             //Do check if all Elements satify the rules
             for (var j = 0; j < allElements.length; j++) {
@@ -3182,35 +3182,6 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
       return this.constructionRulesLoaded;
     }
 
-    /* This is a hardcoded System4/Quadro functionality
-     * we need a aussenblech on the side of every door side 
-     * but not if the neighbor door has the same shared side -> then we do not
-     * need any
-    */
-  }, {
-    key: "correctAussenblech",
-    value: function correctAussenblech(boxPlannerGrid, optionHandler, curElementId) {
-      if (boxPlannerGrid.getForceSingleCellPerElement()) {
-        var right = boxPlannerGrid.getNeighborElements(curElementId, "RIGHT");
-        var left = boxPlannerGrid.getNeighborElements(curElementId, "LEFT");
-        var curopt = this.getOptionVal(curElementId, "OPTTUER", optionHandler);
-        if (right.length > 0 && curopt) {
-          var rightopt = this.getOptionVal(right[0].ElementId, "OPTTUER", optionHandler);
-          if (rightopt && rightopt == 'OPVLINKS' && curopt == 'OPVRECHTS') {
-            optionHandler.get(curElementId).set('OPTAUSSENBLECH_RECHTS', 'OPVOHNE');
-            optionHandler.get(curElementId).set('OPTAUSSENBLECH_LINKS', 'OPVOHNE');
-          }
-        }
-        if (left.length > 0 && curopt) {
-          var leftopt = this.getOptionVal(left[0].ElementId, "OPTTUER", optionHandler);
-          if (leftopt && leftopt == 'OPVRECHTS' && curopt == 'OPVLINKS') {
-            optionHandler.get(curElementId).set('OPTAUSSENBLECH_LINKS', 'OPVOHNE');
-            optionHandler.get(curElementId).set('OPTAUSSENBLECH_RECHTS', 'OPVOHNE');
-          }
-        }
-      }
-    }
-
     //Die gleiche Option kann sowohl nach rechts als auch nach oben gesetzt werden (Rahmen rechts oben). Wenn das der Fall ist, darf wenn es rechts keinen Nachbarn gibt nicht mit doShow überschrieben werden, wenn es vorher bei TOP versteckt wurde
     //Deshalb darf es nicht angeschalten werden, wenn es in der gleichen Runde ausgeschalten wurde
     /*
@@ -3359,13 +3330,13 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
               i = 0;
             case 55:
               if (!(i < boxPlannerGrid.getColumnCount())) {
-                _context.next = 69;
+                _context.next = 68;
                 break;
               }
               j = 0;
             case 57:
               if (!(j < boxPlannerGrid.getRowCount(i, false))) {
-                _context.next = 66;
+                _context.next = 65;
                 break;
               }
               _elementId2 = (_boxPlannerGrid$getPl4 = boxPlannerGrid.getPlannerElementAtGridPos(i, j, false)) === null || _boxPlannerGrid$getPl4 === void 0 ? void 0 : _boxPlannerGrid$getPl4.getElementId();
@@ -3373,27 +3344,26 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
                 _context.next = 61;
                 break;
               }
-              return _context.abrupt("continue", 63);
+              return _context.abrupt("continue", 62);
             case 61:
               this.correctBack(boxPlannerGrid, optionHandler, _elementId2);
-              this.correctAussenblech(boxPlannerGrid, optionHandler, _elementId2);
-            case 63:
+            case 62:
               j++;
               _context.next = 57;
               break;
-            case 66:
+            case 65:
               i++;
               _context.next = 55;
               break;
-            case 69:
+            case 68:
               doChangeRetailArticleNumbers = this.doChangeRetailArticleNumbers(boxPlannerGrid, optionHandler);
-              _context.next = 72;
+              _context.next = 71;
               return this.updateCfgValuesByPlanner(optionHandler, undefined, this.constructionRules.partlistRules.bundleRules, doChangeRetailArticleNumbers);
-            case 72:
+            case 71:
               LOG$2.debug('BoxPlanner updateOptionLogic - Duration after setting Option Values of all Articles: ' + (new Date().getTime() - startTime));
               LOG$2.debug('BoxPlanner updateOptionLogic - Duration after setting updating configurator: ' + (new Date().getTime() - startTime));
               return _context.abrupt("return", resultMessage);
-            case 75:
+            case 74:
             case "end":
               return _context.stop();
           }
@@ -3447,7 +3417,8 @@ var ConstructionRulesHandler = /*#__PURE__*/function () {
   }, {
     key: "getForceWholePlanningSameHeight",
     value: function getForceWholePlanningSameHeight() {
-      return this.constructionRules.forceWholePlanningSameHeight;
+      var _this$constructionRul2;
+      return !!((_this$constructionRul2 = this.constructionRules) !== null && _this$constructionRul2 !== void 0 && _this$constructionRul2.forceWholePlanningSameHeight);
     }
   }]);
 }();
@@ -3897,7 +3868,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
      */
   }, {
     key: "getTopElements",
-    value: function getTopElements(elementId) {
+    value: function getTopElements(elementId, onlyDirectNeighbor) {
       var _curGrid$plannedEleme;
       var result = this.getCellsInGridByElementId(elementId);
       var curGrid = result.backside ? this.generalPlanningState.grids[1].matrix : this.generalPlanningState.grids[0].matrix;
@@ -3909,6 +3880,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
         var element = topElement.plannedElement;
         if (!element) break;
         neighborPlannerElements.push(this.plannerElements.get(element.elementId));
+        if (onlyDirectNeighbor) break;
         topElement = curGrid[element.area.fromX][element.area.toY];
       }
       return neighborPlannerElements;
@@ -3968,7 +3940,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
      */
   }, {
     key: "getBottomElements",
-    value: function getBottomElements(elementId) {
+    value: function getBottomElements(elementId, onlyDirectNeighbor) {
       var _curGrid$plannedEleme2;
       var result = this.getCellsInGridByElementId(elementId);
       var curGrid = result.backside ? this.generalPlanningState.grids[1].matrix : this.generalPlanningState.grids[0].matrix;
@@ -3981,6 +3953,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
         var element = topElement.plannedElement;
         if (!element) break;
         neighborPlannerElements.push(this.plannerElements.get(element.elementId));
+        if (onlyDirectNeighbor) break;
         topElement = (_curGrid$element$area = curGrid[element.area.fromX]) === null || _curGrid$element$area === void 0 ? void 0 : _curGrid$element$area[element.area.fromY - 1];
       }
       return neighborPlannerElements;
@@ -4011,7 +3984,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
      */
   }, {
     key: "getRightElements",
-    value: function getRightElements(elementId) {
+    value: function getRightElements(elementId, onlyDirectNeighbor) {
       var result = this.getCellsInGridByElementId(elementId);
       var curGrid = result.backside ? this.generalPlanningState.grids[1].matrix : this.generalPlanningState.grids[0].matrix;
       var rightElements = [];
@@ -4025,6 +3998,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
         if (cell && _elementId2 && rightElementIds.indexOf(_elementId2) == -1) {
           rightElementIds.push(_elementId2);
           rightElements.push(this.plannerElements.get(_elementId2));
+          if (onlyDirectNeighbor) break;
         }
       }
       return rightElements;
@@ -4054,7 +4028,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
      */
   }, {
     key: "getLeftElements",
-    value: function getLeftElements(elementId) {
+    value: function getLeftElements(elementId, onlyDirectNeighbor) {
       var result = this.getCellsInGridByElementId(elementId);
       var curGrid = result.backside ? this.generalPlanningState.grids[1].matrix : this.generalPlanningState.grids[0].matrix;
       var rightElements = [];
@@ -4068,6 +4042,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
         if (cell && _elementId3 && rightElementIds.indexOf(_elementId3) == -1) {
           rightElementIds.push(_elementId3);
           rightElements.push(this.plannerElements.get(_elementId3));
+          if (onlyDirectNeighbor) break;
         }
       }
       return rightElements;
@@ -4204,6 +4179,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
       var endHeight = 0;
       for (var y = 0; y < currentRow.length;) {
         var cell = currentRow[y];
+        if (!cell || !cell.plannedElement) continue;
         if (cell.index.y < res.startRowIndex) startHeight = Math.round((startHeight + cell.plannedElement.size.height) * 1000) / 1000;
         if (cell.index.y < res.endRowIndex) endHeight = Math.round((endHeight + cell.plannedElement.size.height) * 1000) / 1000;
         y = cell.plannedElement.area.toY;
@@ -4217,7 +4193,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
           for (var x = plannedElement.area.toX; x < curGrid.length;) {
             var _neighbourRow$0$plann, _neighbourRow$0$plann2;
             var neighbourRow = curGrid[x];
-            for (var _y = 0; _y < neighbourRow.length;) {
+            for (var _y = 0; _y < (neighbourRow === null || neighbourRow === void 0 ? void 0 : neighbourRow.length);) {
               var _cell5$plannedElement, _cell5$plannedElement2;
               var _cell5 = neighbourRow[_y];
               if (neighbours.includes(_cell5)) continue;
@@ -4239,11 +4215,11 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
         case 'LEFT':
           for (var _x2 = plannedElement.area.fromX - 1; _x2 >= 0;) {
             var _neighbourRow = curGrid[_x2];
-            for (var _y2 = 0; _y2 < _neighbourRow.length;) {
+            for (var _y2 = 0; _y2 < (_neighbourRow === null || _neighbourRow === void 0 ? void 0 : _neighbourRow.length);) {
               var _cell6$plannedElement, _cell6$plannedElement2;
               var _cell6 = _neighbourRow[_y2];
               if (neighbours.includes(_cell6)) continue;
-              if (plannedElement.area.fromY == _y2 && this.gridSetupParams.forceSingleCellPerElement && plannedElement.area.toX == _x2) neighbours.push(_cell6);else if (clean && !this.gridSetupParams.forceSingleCellPerElement && neighbourSize == startHeight) neighbours.push(_cell6);else if (!clean && neighbourSize >= startHeight && neighbourSize <= endHeight) neighbours.push(_cell6);
+              if (plannedElement.area.fromY == _y2 && this.gridSetupParams.forceSingleCellPerElement && plannedElement.area.fromX - 1 == _x2) neighbours.push(_cell6);else if (clean && !this.gridSetupParams.forceSingleCellPerElement && neighbourSize == startHeight) neighbours.push(_cell6);else if (!clean && neighbourSize >= startHeight && neighbourSize <= endHeight) neighbours.push(_cell6);
               neighbourSize = Math.round((neighbourSize + _cell6.plannedElement.size.height) * 1000) / 1000;
               _y2 = (_cell6$plannedElement = (_cell6$plannedElement2 = _cell6.plannedElement) === null || _cell6$plannedElement2 === void 0 ? void 0 : _cell6$plannedElement2.area.toY) !== null && _cell6$plannedElement !== void 0 ? _cell6$plannedElement : _y2 + 1;
             }
@@ -4864,13 +4840,12 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
             _cell.plannedElement.area.toY += diff.y;
           }
         }
-      } else if (diff.x != 0 && diff.x > free) {
+      } else if (diff.x != 0 && (diff.x > free || diff.x < 0)) {
         // if there is enough free space on the right no need to move
         for (var _x6 = cell.plannedElement.area.fromX; _x6 < grid.length; _x6++) {
           for (var _y5 = cell.plannedElement.area.fromY; _y5 < cell.plannedElement.area.toY; _y5++) {
             var _cell9 = grid[_x6][_y5];
             if (!_cell9 || _cell9.plannedElement.elementId == elementId) continue; //already corrected
-
             _cell9.index.x += diff.x;
             _cell9.plannedElement.area.fromX += diff.x;
             _cell9.plannedElement.area.toX += diff.x;
@@ -4887,7 +4862,7 @@ var BoxPlannerGrid = /*#__PURE__*/function () {
           var cell = plannedCells[idx];
           var area = cell.plannedElement.area;
           if (newGrid.find(function (x) {
-            return x.find(function (y) {
+            return x && x.find(function (y) {
               var _y$plannedElement3, _cell$plannedElement9;
               return (y === null || y === void 0 || (_y$plannedElement3 = y.plannedElement) === null || _y$plannedElement3 === void 0 ? void 0 : _y$plannedElement3.elementId) == ((_cell$plannedElement9 = cell.plannedElement) === null || _cell$plannedElement9 === void 0 ? void 0 : _cell$plannedElement9.elementId);
             });

package/build/cjs/{DivaStandardPlanner-dd42a0a9.js → DivaStandardPlanner-e3bb84bd.js}

@@ -5,9 +5,9 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-d0f2d17b.js');
+var index = require('./index-f7a97168.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
-var PlannerHandler2D = require('./PlannerHandler2D-6c5cc33b.js');
+var PlannerHandler2D = require('./PlannerHandler2D-640d5871.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/toConsumableArray');
@@ -227,15 +227,29 @@ var DivaStandardPlanner = /*#__PURE__*/function () {
       var refDockingPoint = refElement.getDockingPointById(dockingPoint.OnDP.DpId);
       if (refDockingPoint == undefined) return updateConfig;
       var worldPosNewElement = new index.Vector3(0, 0, 0);
+      var worldPosNewElementIgnoreOLF = new index.Vector3(0, 0, 0);
+
+      // DP LocalWorldPos is OLF-corner-relative when HasOLFPolygon (from SVG). Convert to OLT-corner-relative for WorldPosCornerIgnoreOLF.
+      var refDPLocalOlt = refElement.HasOLFPolygon ? new index.Vector2(refDockingPoint.LocalWorldPos.x - refElement.getOltLeft(), refDockingPoint.LocalWorldPos.z - refElement.getOltTop()) : new index.Vector2(refDockingPoint.LocalWorldPos.x, refDockingPoint.LocalWorldPos.z);
+      var newDPLocalOlt = plannerElement.HasOLFPolygon ? new index.Vector2(dockingPoint.LocalWorldPos.x - plannerElement.getOltLeft(), dockingPoint.LocalWorldPos.z - plannerElement.getOltTop()) : new index.Vector2(dockingPoint.LocalWorldPos.x, dockingPoint.LocalWorldPos.z);
       var rotatedLocalRefDP = new index.Vector2(refDockingPoint.LocalWorldPos.x, refDockingPoint.LocalWorldPos.z);
       rotatedLocalRefDP = index.Vector2.rotateOrigin(rotatedLocalRefDP, refElement.RotDeg);
       var angleToRot = refElement.RotDeg + refDockingPoint.RotDeg - dockingPoint.RotDeg;
       plannerElement.RotDeg = angleToRot;
+      var refWorldPosCor = refElement.WorldPosCorner;
+      // For ref without OLF: use same corner for both alignments (no OLF/OLT split; WorldPosCornerIgnoreOLF getter also does this).
+      var refWorldPosCorIgnoreOLF = refElement.HasOLFPolygon ? refElement.WorldPosCornerIgnoreOLF : refWorldPosCor;
       var rotatedLocalDP2D = index.Vector2.rotateOrigin(new index.Vector2(dockingPoint.LocalWorldPos.x, dockingPoint.LocalWorldPos.z), angleToRot);
-      worldPosNewElement.x = refElement.WorldPosCorner.x + rotatedLocalRefDP.x - rotatedLocalDP2D.x;
-      worldPosNewElement.y = refElement.WorldPosCorner.y + refDockingPoint.LocalWorldPos.y - dockingPoint.LocalWorldPos.y;
-      worldPosNewElement.z = refElement.WorldPosCorner.z + rotatedLocalRefDP.y - rotatedLocalDP2D.y;
+      worldPosNewElement.x = refWorldPosCor.x + rotatedLocalRefDP.x - rotatedLocalDP2D.x;
+      worldPosNewElement.y = refWorldPosCor.y + refDockingPoint.LocalWorldPos.y - dockingPoint.LocalWorldPos.y;
+      worldPosNewElement.z = refWorldPosCor.z + rotatedLocalRefDP.y - rotatedLocalDP2D.y;
+      var rotatedRefDPOlt = index.Vector2.rotateOrigin(refDPLocalOlt, refElement.RotDeg);
+      var rotatedNewDPOlt = index.Vector2.rotateOrigin(newDPLocalOlt, angleToRot);
+      worldPosNewElementIgnoreOLF.x = refWorldPosCorIgnoreOLF.x + rotatedRefDPOlt.x - rotatedNewDPOlt.x;
+      worldPosNewElementIgnoreOLF.z = refWorldPosCorIgnoreOLF.z + rotatedRefDPOlt.y - rotatedNewDPOlt.y;
+      worldPosNewElementIgnoreOLF.y = refWorldPosCorIgnoreOLF.y + refDockingPoint.LocalWorldPos.y - dockingPoint.LocalWorldPos.y;
       plannerElement.WorldPosCorner = worldPosNewElement;
+      plannerElement.WorldPosCornerIgnoreOLF = worldPosNewElementIgnoreOLF;
       updateConfig = this.set.onDockingChanged(plannerElement.ElementId, refElement.ElementId, 'DOCK', dockingPoint.Type);
       var data = this.set.getPlannerData(plannerElement.ElementId);
       plannerElement.updatePlannerData(data);
@@ -1804,16 +1818,24 @@ var DivaStandardPlanner = /*#__PURE__*/function () {
       var width = this.plannerBoundingBox.getWidth(catalog.PlannerMeasureDigits);
       var depth = this.plannerBoundingBox.getDepth(catalog.PlannerMeasureDigits);
       var height = this.plannerBoundingBox.getHeight(catalog.PlannerMeasureDigits);
+      var widthIgnoreOLF = this.plannerBoundingBox.getWidth(catalog.PlannerMeasureDigits, true);
+      var depthIgnoreOLF = this.plannerBoundingBox.getDepth(catalog.PlannerMeasureDigits, true);
+      var heightIgnoreOLF = this.plannerBoundingBox.getHeight(catalog.PlannerMeasureDigits, true);
+      var olfDefined = widthIgnoreOLF !== width || depthIgnoreOLF !== depth || heightIgnoreOLF !== height;
       return {
         width: width,
         height: height,
-        depth: depth
+        depth: depth,
+        widthIgnoreOLF: olfDefined ? widthIgnoreOLF : undefined,
+        depthIgnoreOLF: olfDefined ? depthIgnoreOLF : undefined,
+        heightIgnoreOLF: olfDefined ? heightIgnoreOLF : undefined
       };
     }
   }, {
     key: "updatePlannerBoundingBox",
     value: function updatePlannerBoundingBox() {
       this.plannerBoundingBox.calcPlannerBoundingBox(this.getAllPlannerElements());
+      this.plannerBoundingBox.calcPlannerBoundingBoxIgnoreOLF(this.getAllPlannerElements());
     }
   }, {
     key: "getCatalogData",

package/build/cjs/{DoorPlanner-90472b69.js → DoorPlanner-eabb345c.js}

@@ -3,7 +3,7 @@
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-require('./index-d0f2d17b.js');
+require('./index-f7a97168.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/cjs/{Host3DSignalR-867a94ef.js → Host3DSignalR-572a3770.js}

@@ -5,7 +5,7 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-d0f2d17b.js');
+var index = require('./index-f7a97168.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var signalr = require('@microsoft/signalr');
 var io = require('socket.io-client');

package/build/cjs/{LiviqueWWSHandler-316e06ff.js → LiviqueWWSHandler-f12ccd19.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-require('./index-d0f2d17b.js');
+require('./index-f7a97168.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/defineProperty');

package/build/cjs/{PfisterWWSHandler-93e12209.js → PfisterWWSHandler-06c52e7b.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-var index = require('./index-d0f2d17b.js');
+var index = require('./index-f7a97168.js');
 var basketModel = require('@crystaldesign/basket-model');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');

package/build/cjs/{PlannerHandler2D-6c5cc33b.js → PlannerHandler2D-640d5871.js}

@@ -5,7 +5,8 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-d0f2d17b.js');
+var index = require('./index-f7a97168.js');
+var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var fabric = require('fabric');
 var DivaUtils = require('@crystaldesign/diva-utils');
@@ -18,6 +19,7 @@ var _classCallCheck__default = /*#__PURE__*/_interopDefaultLegacy(_classCallChec
 var _createClass__default = /*#__PURE__*/_interopDefaultLegacy(_createClass);
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regeneratorRuntime);
+var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
 var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
 var DivaUtils__default = /*#__PURE__*/_interopDefaultLegacy(DivaUtils);
 var serialize__default = /*#__PURE__*/_interopDefaultLegacy(serialize);
@@ -134,18 +136,122 @@ var SVGUtils = /*#__PURE__*/function () {
       var yArr = points.map(function (c) {
         return c.y;
       });
-      var l = Math.min.apply(Math, _toConsumableArray__default["default"](xArr));
-      var r = Math.max.apply(Math, _toConsumableArray__default["default"](xArr));
-      var b = Math.min.apply(Math, _toConsumableArray__default["default"](yArr));
-      var t = Math.max.apply(Math, _toConsumableArray__default["default"](yArr));
-      var width = r - l;
-      var height = t - b;
+      var minX = Math.min.apply(Math, _toConsumableArray__default["default"](xArr));
+      var maxX = Math.max.apply(Math, _toConsumableArray__default["default"](xArr));
+      var minY = Math.min.apply(Math, _toConsumableArray__default["default"](yArr));
+      var maxY = Math.max.apply(Math, _toConsumableArray__default["default"](yArr));
+      var width = maxX - minX;
+      var height = maxY - minY;
       return {
         width: width,
-        height: height
+        height: height,
+        minX: minX,
+        minY: minY
       };
     }
 
+    /**
+     * Returns OLF geometry (minX, minY, width, height) from SVG - supports rect and polygon.
+     * Iterates through matches to find first rect/polygon (handles Illustrator group wrappers).
+     */
+  }, {
+    key: "getOLFGeometryFromSvg",
+    value: function getOLFGeometryFromSvg(content) {
+      var parser = new DOMParser();
+      var xmlDocument = parser.parseFromString(content, 'application/xml');
+      var olfObjs = xmlDocument.evaluate("//*[starts-with(@id,'OLF')]", xmlDocument, null, 7, null);
+      for (var i = 0; i < olfObjs.snapshotLength; i++) {
+        var obj = olfObjs.snapshotItem(i);
+        if ((obj === null || obj === void 0 ? void 0 : obj.nodeName) === 'rect') {
+          var _obj$getAttribute, _obj$getAttribute2, _obj$getAttribute3, _obj$getAttribute4;
+          var x = parseFloat((_obj$getAttribute = obj.getAttribute('x')) !== null && _obj$getAttribute !== void 0 ? _obj$getAttribute : '0');
+          var y = parseFloat((_obj$getAttribute2 = obj.getAttribute('y')) !== null && _obj$getAttribute2 !== void 0 ? _obj$getAttribute2 : '0');
+          var width = parseFloat((_obj$getAttribute3 = obj.getAttribute('width')) !== null && _obj$getAttribute3 !== void 0 ? _obj$getAttribute3 : '0');
+          var height = parseFloat((_obj$getAttribute4 = obj.getAttribute('height')) !== null && _obj$getAttribute4 !== void 0 ? _obj$getAttribute4 : '0');
+          return {
+            minX: x,
+            minY: y,
+            width: width,
+            height: height
+          };
+        }
+        if ((obj === null || obj === void 0 ? void 0 : obj.nodeName) === 'polygon') {
+          var pts = obj.getAttribute('points');
+          if (pts) {
+            var points = pts.split(/\s+/).reduce(function (acc, p) {
+              var _p$split = p.split(','),
+                _p$split2 = _slicedToArray__default["default"](_p$split, 2),
+                x = _p$split2[0],
+                y = _p$split2[1];
+              if (x != null && y != null) acc.push(new index.Vector2(Number(x), Number(y)));
+              return acc;
+            }, []);
+            if (points.length) {
+              var bbox = this.getBoundingBoxOfPoints(points);
+              return {
+                minX: bbox.minX,
+                minY: bbox.minY,
+                width: bbox.width,
+                height: bbox.height
+              };
+            }
+          }
+        }
+      }
+      return undefined;
+    }
+
+    /**
+     * Returns OLT geometry (x, y, width, height) from SVG attributes - untransformed coords.
+     * Iterates through matches to find first rect/polygon (handles Illustrator group wrappers).
+     */
+  }, {
+    key: "getOLTGeometryFromSvg",
+    value: function getOLTGeometryFromSvg(content) {
+      var parser = new DOMParser();
+      var xmlDocument = parser.parseFromString(content, 'application/xml');
+      var oltObjs = xmlDocument.evaluate("//*[starts-with(@id,'OLT')]", xmlDocument, null, 7, null);
+      for (var i = 0; i < oltObjs.snapshotLength; i++) {
+        var obj = oltObjs.snapshotItem(i);
+        if ((obj === null || obj === void 0 ? void 0 : obj.nodeName) === 'rect') {
+          var _obj$getAttribute5, _obj$getAttribute6, _obj$getAttribute7, _obj$getAttribute8;
+          var x = parseFloat((_obj$getAttribute5 = obj.getAttribute('x')) !== null && _obj$getAttribute5 !== void 0 ? _obj$getAttribute5 : '0');
+          var y = parseFloat((_obj$getAttribute6 = obj.getAttribute('y')) !== null && _obj$getAttribute6 !== void 0 ? _obj$getAttribute6 : '0');
+          var width = parseFloat((_obj$getAttribute7 = obj.getAttribute('width')) !== null && _obj$getAttribute7 !== void 0 ? _obj$getAttribute7 : '0');
+          var height = parseFloat((_obj$getAttribute8 = obj.getAttribute('height')) !== null && _obj$getAttribute8 !== void 0 ? _obj$getAttribute8 : '0');
+          return {
+            x: x,
+            y: y,
+            width: width,
+            height: height
+          };
+        }
+        if ((obj === null || obj === void 0 ? void 0 : obj.nodeName) === 'polygon') {
+          var pts = obj.getAttribute('points');
+          if (pts) {
+            var points = pts.split(/\s+/).reduce(function (acc, p) {
+              var _p$split3 = p.split(','),
+                _p$split4 = _slicedToArray__default["default"](_p$split3, 2),
+                x = _p$split4[0],
+                y = _p$split4[1];
+              if (x != null && y != null) acc.push(new index.Vector2(Number(x), Number(y)));
+              return acc;
+            }, []);
+            if (points.length) {
+              var bbox = this.getBoundingBoxOfPoints(points);
+              return {
+                x: bbox.minX,
+                y: bbox.minY,
+                width: bbox.width,
+                height: bbox.height
+              };
+            }
+          }
+        }
+      }
+      return undefined;
+    }
+
     /**
      * This function looks if the svg has a Mask HTML element. If so it removes all masks from SVG
      * @param content
@@ -2069,15 +2175,24 @@ var PlannerHandler2D = /*#__PURE__*/function () {
       }
       plannerElement.OLTPolygon = oltPoints;
       var olf = this.svgUtils.getPointOfPoligonById(svgXml, 'OLF');
+      var olfGeoEarly = this.svgUtils.getOLFGeometryFromSvg(svgXml);
       if (olf !== null && olf !== void 0 && olf.length) {
-        var _this$svgUtils$getBou = this.svgUtils.getBoundingBoxOfPoints(olf),
-          widthOlf = _this$svgUtils$getBou.width,
-          heightOlf = _this$svgUtils$getBou.height;
-        plannerElement.setupOLF(olf, widthOlf, heightOlf);
-      } else if (sizes !== null && sizes !== void 0 && sizes.heightOLF, sizes !== null && sizes !== void 0 && sizes.widthOLF) {
-        plannerElement.setupOLF(olf, sizes === null || sizes === void 0 ? void 0 : sizes.widthOLF, sizes === null || sizes === void 0 ? void 0 : sizes.heightOLF);
+        var _olfGeoEarly$width, _olfGeoEarly$height;
+        var olfBBox = this.svgUtils.getBoundingBoxOfPoints(olf);
+        // Prefer getOLFGeometryFromSvg for dims - single source of truth, handles split(/\s+/) correctly
+        var olfW = (_olfGeoEarly$width = olfGeoEarly === null || olfGeoEarly === void 0 ? void 0 : olfGeoEarly.width) !== null && _olfGeoEarly$width !== void 0 ? _olfGeoEarly$width : olfBBox.width;
+        var olfD = (_olfGeoEarly$height = olfGeoEarly === null || olfGeoEarly === void 0 ? void 0 : olfGeoEarly.height) !== null && _olfGeoEarly$height !== void 0 ? _olfGeoEarly$height : olfBBox.height;
+        plannerElement.setupOLF(olf, olfW, olfD);
       } else {
-        plannerElement.clearOLF();
+        var olfGeo = this.svgUtils.getOLFGeometryFromSvg(svgXml);
+        if (olfGeo) {
+          var olfRectPoints = [new index.Vector2(olfGeo.minX, olfGeo.minY), new index.Vector2(olfGeo.minX + olfGeo.width, olfGeo.minY), new index.Vector2(olfGeo.minX + olfGeo.width, olfGeo.minY + olfGeo.height), new index.Vector2(olfGeo.minX, olfGeo.minY + olfGeo.height)];
+          plannerElement.setupOLF(olfRectPoints, olfGeo.width, olfGeo.height);
+        } else if (sizes !== null && sizes !== void 0 && sizes.heightOLF, sizes !== null && sizes !== void 0 && sizes.widthOLF) {
+          plannerElement.setupOLF(olf, sizes === null || sizes === void 0 ? void 0 : sizes.widthOLF, sizes === null || sizes === void 0 ? void 0 : sizes.heightOLF);
+        } else {
+          plannerElement.clearOLF();
+        }
       }
 
       //if we are running in node js dont do fabric stuff
@@ -2102,8 +2217,6 @@ var PlannerHandler2D = /*#__PURE__*/function () {
                   break;
                 case 'OLT':
                   object.stroke = 'none';
-                  oltTop = object.top;
-                  oltLeft = object.left;
                   oltWidth = object.width;
                   oltDepth = object.height;
                   break;
@@ -2111,6 +2224,16 @@ var PlannerHandler2D = /*#__PURE__*/function () {
             }
             olfObjects.push(object);
           }
+          // oltLeft/oltTop/oltWidth/oltDepth from SVG attributes (untransformed) - Fabric values wrong for transformed rects
+          var olfGeo = that.svgUtils.getOLFGeometryFromSvg(svgXml);
+          var oltGeo = that.svgUtils.getOLTGeometryFromSvg(svgXml);
+          if (olfGeo && oltGeo) {
+            oltLeft = oltGeo.x - olfGeo.minX;
+            oltTop = oltGeo.y - olfGeo.minY;
+            oltWidth = oltGeo.width;
+            oltDepth = oltGeo.height;
+          }
+
           //hier wird definitv fabric.js Element erstellt
           var fabricShapeOLF = fabric.fabric.util.groupSVGElements(olfObjects, options);
           fabricShapeOLF.set({
@@ -2137,14 +2260,20 @@ var PlannerHandler2D = /*#__PURE__*/function () {
           plannerElement.SvgData = svgXml;
           fabric.fabric.loadSVGFromString(svgXmlOLT, function (objectsOLT, optionsOLT) {
             plannerElement.cleanShapeOLT2D();
-            for (var objNo = 0; objNo < objects.length; objNo++) {
-              var object = objects[objNo];
-              var objID;
-              if (object.id) {
-                objID = object.id.toString();
-                if (objID.startsWith('OLT')) {
-                  optionsOLT.height = object.height;
-                  optionsOLT.width = object.width;
+            if (oltGeo) {
+              optionsOLT.width = oltGeo.width;
+              optionsOLT.height = oltGeo.height;
+            } else {
+              for (var objNo = 0; objNo < objects.length; objNo++) {
+                var object = objects[objNo];
+                var objID;
+                if (object.id) {
+                  objID = object.id.toString();
+                  if (objID.startsWith('OLT')) {
+                    optionsOLT.height = object.height;
+                    optionsOLT.width = object.width;
+                    break;
+                  }
                 }
               }
             }

package/build/cjs/{SeriousBasketHandler-bfa89b28.js → SeriousBasketHandler-93c02d45.js}

@@ -3,7 +3,7 @@
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-var index = require('./index-d0f2d17b.js');
+var index = require('./index-f7a97168.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/cjs/{ShelfPlanner-bdfb41c4.js → ShelfPlanner-a7f6daa9.js}

@@ -6,7 +6,7 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-d0f2d17b.js');
+var index = require('./index-f7a97168.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');