kitchen-simulator 1.1.1-test.6 → 1.1.1-test.61
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/@history.js +10 -2
- package/es/AppContext.js +10 -3
- package/es/KitchenConfigurator.js +95 -106
- package/es/KitchenConfiguratorApp.js +145 -154
- package/es/actions/area-actions.js +12 -5
- package/es/actions/export.js +29 -12
- package/es/actions/groups-actions.js +45 -27
- package/es/actions/holes-actions.js +55 -34
- package/es/actions/items-actions.js +145 -94
- package/es/actions/lines-actions.js +36 -21
- package/es/actions/project-actions.js +145 -94
- package/es/actions/scene-actions.js +21 -11
- package/es/actions/vertices-actions.js +15 -7
- package/es/actions/viewer2d-actions.js +36 -21
- package/es/actions/viewer3d-actions.js +18 -9
- package/es/catalog/areas/area/planner-element.js +18 -8
- package/es/catalog/catalog.js +21 -24
- package/es/catalog/factories/area-factory-3d.js +31 -22
- package/es/catalog/factories/area-factory.js +20 -14
- package/es/catalog/factories/export.js +24 -6
- package/es/catalog/factories/wall-factory-3d.js +41 -31
- package/es/catalog/factories/wall-factory.js +31 -21
- package/es/catalog/holes/door-closet/planner-element.js +24 -15
- package/es/catalog/holes/door-double/planner-element.js +24 -15
- package/es/catalog/holes/door-exterior/planner-element.js +25 -16
- package/es/catalog/holes/door-interior/planner-element.js +25 -16
- package/es/catalog/holes/door-panic/planner-element.js +16 -7
- package/es/catalog/holes/door-panic-double/planner-element.js +24 -15
- package/es/catalog/holes/door-sliding/planner-element.js +25 -16
- package/es/catalog/holes/doorway-framed/planner-element.js +20 -11
- package/es/catalog/holes/doorway-frameless/planner-element.js +16 -7
- package/es/catalog/holes/export.js +97 -13
- package/es/catalog/holes/window-clear/planner-element.js +19 -10
- package/es/catalog/holes/window-cross/planner-element.js +19 -10
- package/es/catalog/holes/window-double-hung/planner-element.js +19 -10
- package/es/catalog/holes/window-vertical/planner-element.js +19 -10
- package/es/catalog/lines/wall/planner-element.js +21 -11
- package/es/catalog/molding/molding-dcm/planner-element.js +14 -5
- package/es/catalog/molding/molding-fbm/planner-element.js +14 -5
- package/es/catalog/molding/molding-lrm/planner-element.js +14 -5
- package/es/catalog/properties/export.js +80 -20
- package/es/catalog/properties/property-checkbox.js +84 -35
- package/es/catalog/properties/property-color.js +23 -16
- package/es/catalog/properties/property-enum.js +72 -28
- package/es/catalog/properties/property-hidden.js +16 -9
- package/es/catalog/properties/property-lenght-measure.js +45 -39
- package/es/catalog/properties/property-length-measure.js +84 -34
- package/es/catalog/properties/property-length-measure_hole.js +45 -39
- package/es/catalog/properties/property-number.js +24 -17
- package/es/catalog/properties/property-read-only.js +23 -16
- package/es/catalog/properties/property-string.js +23 -16
- package/es/catalog/properties/property-toggle.js +23 -16
- package/es/catalog/properties/shared-property-style.js +7 -1
- package/es/catalog/utils/FuseUtils.js +15 -11
- package/es/catalog/utils/exporter.js +15 -11
- package/es/catalog/utils/geom-utils.js +29 -13
- package/es/catalog/utils/item-loader.js +97 -91
- package/es/catalog/utils/load-obj.js +28 -20
- package/es/catalog/utils/mtl-loader.js +9 -3
- package/es/catalog/utils/obj-loader.js +9 -3
- package/es/class/FuseUtils.js +15 -11
- package/es/class/area.js +28 -26
- package/es/class/export.js +95 -23
- package/es/class/group.js +59 -62
- package/es/class/guide.js +21 -19
- package/es/class/hole.js +89 -88
- package/es/class/item.js +150 -155
- package/es/class/layer.js +65 -63
- package/es/class/line.js +143 -144
- package/es/class/project.js +98 -94
- package/es/class/vertex.js +35 -33
- package/es/components/content.js +29 -19
- package/es/components/disclaimer/disclaimer.js +80 -92
- package/es/components/export.js +32 -8
- package/es/components/style/button.js +31 -30
- package/es/components/style/cancel-button.js +14 -8
- package/es/components/style/content-container.js +16 -12
- package/es/components/style/content-title.js +20 -15
- package/es/components/style/delete-button.js +17 -9
- package/es/components/style/export.js +120 -30
- package/es/components/style/form-block.js +15 -12
- package/es/components/style/form-color-input.js +14 -8
- package/es/components/style/form-label.js +15 -12
- package/es/components/style/form-number-input.js +73 -47
- package/es/components/style/form-number-input_2.js +44 -42
- package/es/components/style/form-select.js +60 -14
- package/es/components/style/form-slider.js +38 -16
- package/es/components/style/form-submit-button.js +17 -9
- package/es/components/style/form-text-input.js +57 -37
- package/es/components/viewer2d/area.js +24 -17
- package/es/components/viewer2d/export.js +120 -30
- package/es/components/viewer2d/grids/grid-horizontal-streak.js +17 -11
- package/es/components/viewer2d/grids/grid-streak.js +17 -11
- package/es/components/viewer2d/grids/grid-vertical-streak.js +17 -11
- package/es/components/viewer2d/grids/grids.js +19 -15
- package/es/components/viewer2d/group.js +24 -15
- package/es/components/viewer2d/item.js +70 -68
- package/es/components/viewer2d/layer.js +30 -23
- package/es/components/viewer2d/line.js +111 -104
- package/es/components/viewer2d/ruler.js +29 -23
- package/es/components/viewer2d/rulerDist.js +28 -21
- package/es/components/viewer2d/rulerX.js +47 -45
- package/es/components/viewer2d/rulerY.js +45 -43
- package/es/components/viewer2d/scene.js +42 -46
- package/es/components/viewer2d/snap.js +22 -13
- package/es/components/viewer2d/state.js +27 -23
- package/es/components/viewer2d/utils.js +65 -21
- package/es/components/viewer2d/vertex.js +17 -8
- package/es/components/viewer2d/viewer2d.js +171 -166
- package/es/components/viewer3d/camera-controls-module/camera-controls.module.js +23 -24
- package/es/components/viewer3d/dcm.js +7 -1
- package/es/components/viewer3d/fbm.js +7 -1
- package/es/components/viewer3d/front3D.js +21 -17
- package/es/components/viewer3d/grid-creator.js +17 -8
- package/es/components/viewer3d/grids/grid-horizontal-streak.js +14 -6
- package/es/components/viewer3d/grids/grid-streak.js +13 -5
- package/es/components/viewer3d/grids/grid-vertical-streak.js +14 -6
- package/es/components/viewer3d/libs/first-person-controls.js +9 -2
- package/es/components/viewer3d/libs/helvetiker_regular.typeface.js +7 -1
- package/es/components/viewer3d/libs/mtl-loader.js +8 -2
- package/es/components/viewer3d/libs/obj-loader.js +8 -2
- package/es/components/viewer3d/libs/orbit-controls.js +12 -5
- package/es/components/viewer3d/libs/pointer-lock-controls.js +11 -4
- package/es/components/viewer3d/lrm.js +7 -1
- package/es/components/viewer3d/model.js +7 -1
- package/es/components/viewer3d/pointer-lock-navigation.js +10 -3
- package/es/components/viewer3d/ruler-utils/itemRect.js +25 -18
- package/es/components/viewer3d/ruler-utils/layer3D.js +66 -59
- package/es/components/viewer3d/ruler-utils/ruler3D.js +46 -42
- package/es/components/viewer3d/ruler-utils/scene3D.js +18 -11
- package/es/components/viewer3d/ruler-utils/state3D.js +11 -4
- package/es/components/viewer3d/scene-creator.js +227 -198
- package/es/components/viewer3d/three-memory-cleaner.js +12 -3
- package/es/components/viewer3d/viewer3d-first-person.js +46 -46
- package/es/components/viewer3d/viewer3d.js +208 -209
- package/es/constants.js +358 -349
- package/es/index.js +28 -15
- package/es/models.js +185 -183
- package/es/plugins/SVGLoader.js +53 -48
- package/es/plugins/autosave.js +9 -3
- package/es/plugins/console-debugger.js +12 -8
- package/es/plugins/export.js +32 -8
- package/es/plugins/keyboard.js +35 -29
- package/es/reducers/areas-reducer.js +13 -7
- package/es/reducers/export.js +96 -24
- package/es/reducers/groups-reducer.js +37 -31
- package/es/reducers/holes-reducer.js +49 -43
- package/es/reducers/items-reducer.js +112 -109
- package/es/reducers/lines-reducer.js +34 -28
- package/es/reducers/project-reducer.js +111 -105
- package/es/reducers/reducer.js +23 -16
- package/es/reducers/scene-reducer.js +21 -15
- package/es/reducers/user-reducer.js +11 -6
- package/es/reducers/vertices-reducer.js +17 -11
- package/es/reducers/viewer2d-reducer.js +24 -18
- package/es/reducers/viewer3d-reducer.js +22 -16
- package/es/shared-style.js +16 -10
- package/es/styles/export.js +11 -3
- package/es/translator/en.js +7 -1
- package/es/translator/it.js +7 -1
- package/es/translator/ru.js +7 -1
- package/es/translator/translator.js +19 -17
- package/es/utils/browser.js +9 -2
- package/es/utils/convert-units-lite.js +35 -0
- package/es/utils/email-validator.js +7 -1
- package/es/utils/export.js +46 -15
- package/es/utils/geometry.js +279 -191
- package/es/utils/get-edges-of-subgraphs.js +9 -1
- package/es/utils/graph-cycles.js +11 -9
- package/es/utils/graph-inner-cycles.js +18 -10
- package/es/utils/graph.js +17 -12
- package/es/utils/helper.js +63 -109
- package/es/utils/history.js +15 -8
- package/es/utils/id-broker.js +15 -12
- package/es/utils/logger.js +7 -1
- package/es/utils/math.js +12 -5
- package/es/utils/molding.js +177 -158
- package/es/utils/name-generator.js +13 -11
- package/es/utils/objects-utils.js +19 -7
- package/es/utils/phone-validator.js +7 -1
- package/es/utils/process-black-list.js +10 -6
- package/es/utils/react-if.js +12 -6
- package/es/utils/snap-scene.js +34 -32
- package/es/utils/snap.js +59 -51
- package/es/utils/summarizeCart.js +7 -1
- package/es/utils/threeCSG.es6.js +22 -17
- package/es/version.js +7 -1
- package/lib/@history.js +1 -1
- package/lib/AppContext.js +1 -1
- package/lib/KitchenConfigurator.js +68 -87
- package/lib/KitchenConfiguratorApp.js +94 -110
- package/lib/actions/export.js +1 -1
- package/lib/catalog/areas/area/planner-element.js +12 -8
- package/lib/catalog/catalog.js +7 -15
- package/lib/catalog/factories/area-factory-3d.js +1 -1
- package/lib/catalog/factories/area-factory.js +4 -6
- package/lib/catalog/factories/export.js +1 -1
- package/lib/catalog/factories/wall-factory-3d.js +4 -4
- package/lib/catalog/factories/wall-factory.js +2 -2
- package/lib/catalog/holes/door-closet/planner-element.js +2 -2
- package/lib/catalog/holes/door-double/planner-element.js +2 -2
- package/lib/catalog/holes/door-exterior/planner-element.js +2 -2
- package/lib/catalog/holes/door-interior/planner-element.js +2 -2
- package/lib/catalog/holes/door-panic/planner-element.js +2 -2
- package/lib/catalog/holes/door-panic-double/planner-element.js +2 -2
- package/lib/catalog/holes/door-sliding/planner-element.js +2 -2
- package/lib/catalog/holes/doorway-framed/planner-element.js +2 -2
- package/lib/catalog/holes/doorway-frameless/planner-element.js +2 -2
- package/lib/catalog/holes/export.js +14 -14
- package/lib/catalog/holes/window-clear/planner-element.js +2 -2
- package/lib/catalog/holes/window-cross/planner-element.js +2 -2
- package/lib/catalog/holes/window-double-hung/planner-element.js +2 -2
- package/lib/catalog/holes/window-vertical/planner-element.js +2 -2
- package/lib/catalog/lines/wall/planner-element.js +15 -11
- package/lib/catalog/molding/molding-dcm/planner-element.js +2 -2
- package/lib/catalog/molding/molding-fbm/planner-element.js +2 -2
- package/lib/catalog/molding/molding-lrm/planner-element.js +2 -2
- package/lib/catalog/properties/export.js +1 -1
- package/lib/catalog/properties/property-checkbox.js +66 -24
- package/lib/catalog/properties/property-color.js +1 -1
- package/lib/catalog/properties/property-enum.js +52 -15
- package/lib/catalog/properties/property-hidden.js +1 -1
- package/lib/catalog/properties/property-lenght-measure.js +8 -9
- package/lib/catalog/properties/property-length-measure.js +59 -16
- package/lib/catalog/properties/property-length-measure_hole.js +8 -9
- package/lib/catalog/properties/property-number.js +1 -1
- package/lib/catalog/properties/property-read-only.js +1 -1
- package/lib/catalog/properties/property-string.js +1 -1
- package/lib/catalog/properties/property-toggle.js +1 -1
- package/lib/catalog/utils/FuseUtils.js +8 -10
- package/lib/catalog/utils/exporter.js +8 -11
- package/lib/catalog/utils/geom-utils.js +1 -1
- package/lib/catalog/utils/item-loader.js +29 -35
- package/lib/catalog/utils/mtl-loader.js +7 -3
- package/lib/catalog/utils/obj-loader.js +7 -3
- package/lib/class/FuseUtils.js +8 -10
- package/lib/class/area.js +7 -10
- package/lib/class/export.js +1 -1
- package/lib/class/group.js +11 -19
- package/lib/class/guide.js +9 -12
- package/lib/class/hole.js +5 -8
- package/lib/class/item.js +23 -34
- package/lib/class/layer.js +5 -8
- package/lib/class/line.js +12 -19
- package/lib/class/project.js +8 -10
- package/lib/class/vertex.js +7 -10
- package/lib/components/content.js +3 -2
- package/lib/components/disclaimer/disclaimer.js +67 -87
- package/lib/components/export.js +1 -1
- package/lib/components/style/button.js +15 -21
- package/lib/components/style/cancel-button.js +5 -6
- package/lib/components/style/content-container.js +3 -6
- package/lib/components/style/content-title.js +8 -11
- package/lib/components/style/delete-button.js +6 -7
- package/lib/components/style/export.js +1 -1
- package/lib/components/style/form-block.js +7 -11
- package/lib/components/style/form-color-input.js +5 -6
- package/lib/components/style/form-label.js +7 -11
- package/lib/components/style/form-number-input.js +41 -22
- package/lib/components/style/form-number-input_2.js +13 -18
- package/lib/components/style/form-select.js +51 -14
- package/lib/components/style/form-slider.js +26 -11
- package/lib/components/style/form-submit-button.js +6 -7
- package/lib/components/style/form-text-input.js +44 -31
- package/lib/components/viewer2d/area.js +6 -6
- package/lib/components/viewer2d/export.js +1 -1
- package/lib/components/viewer2d/grids/grid-horizontal-streak.js +1 -2
- package/lib/components/viewer2d/grids/grid-streak.js +1 -2
- package/lib/components/viewer2d/grids/grid-vertical-streak.js +1 -2
- package/lib/components/viewer2d/grids/grids.js +4 -9
- package/lib/components/viewer2d/group.js +2 -2
- package/lib/components/viewer2d/item.js +12 -18
- package/lib/components/viewer2d/layer.js +1 -1
- package/lib/components/viewer2d/line.js +4 -7
- package/lib/components/viewer2d/ruler.js +7 -8
- package/lib/components/viewer2d/rulerDist.js +5 -5
- package/lib/components/viewer2d/rulerX.js +13 -18
- package/lib/components/viewer2d/rulerY.js +13 -18
- package/lib/components/viewer2d/scene.js +22 -33
- package/lib/components/viewer2d/snap.js +2 -2
- package/lib/components/viewer2d/state.js +5 -10
- package/lib/components/viewer2d/utils.js +35 -2
- package/lib/components/viewer2d/vertex.js +2 -2
- package/lib/components/viewer2d/viewer2d.js +38 -40
- package/lib/components/viewer3d/camera-controls-module/camera-controls.module.js +14 -20
- package/lib/components/viewer3d/front3D.js +4 -9
- package/lib/components/viewer3d/grid-creator.js +2 -2
- package/lib/components/viewer3d/grids/grid-horizontal-streak.js +1 -1
- package/lib/components/viewer3d/grids/grid-streak.js +1 -1
- package/lib/components/viewer3d/grids/grid-vertical-streak.js +1 -1
- package/lib/components/viewer3d/libs/mtl-loader.js +6 -2
- package/lib/components/viewer3d/libs/obj-loader.js +6 -2
- package/lib/components/viewer3d/libs/orbit-controls.js +10 -5
- package/lib/components/viewer3d/libs/pointer-lock-controls.js +9 -4
- package/lib/components/viewer3d/pointer-lock-navigation.js +1 -1
- package/lib/components/viewer3d/ruler-utils/itemRect.js +8 -8
- package/lib/components/viewer3d/ruler-utils/layer3D.js +33 -33
- package/lib/components/viewer3d/ruler-utils/ruler3D.js +3 -6
- package/lib/components/viewer3d/ruler-utils/scene3D.js +4 -5
- package/lib/components/viewer3d/ruler-utils/state3D.js +1 -1
- package/lib/components/viewer3d/scene-creator.js +40 -45
- package/lib/components/viewer3d/three-memory-cleaner.js +1 -1
- package/lib/components/viewer3d/viewer3d-first-person.js +11 -16
- package/lib/components/viewer3d/viewer3d.js +32 -37
- package/lib/index.js +22 -88
- package/lib/models.js +58 -63
- package/lib/plugins/console-debugger.js +3 -6
- package/lib/plugins/export.js +1 -1
- package/lib/reducers/export.js +1 -1
- package/lib/reducers/user-reducer.js +0 -1
- package/lib/reducers/viewer2d-reducer.js +3 -4
- package/lib/reducers/viewer3d-reducer.js +3 -4
- package/lib/styles/export.js +1 -1
- package/lib/translator/translator.js +5 -9
- package/lib/utils/convert-units-lite.js +35 -0
- package/lib/utils/export.js +2 -2
- package/lib/utils/geometry.js +20 -28
- package/lib/utils/get-edges-of-subgraphs.js +7 -1
- package/lib/utils/graph-cycles.js +9 -9
- package/lib/utils/graph-inner-cycles.js +1 -1
- package/lib/utils/graph.js +15 -12
- package/lib/utils/helper.js +14 -83
- package/lib/utils/history.js +1 -1
- package/lib/utils/id-broker.js +7 -10
- package/lib/utils/molding.js +66 -71
- package/lib/utils/name-generator.js +5 -8
- package/lib/utils/objects-utils.js +5 -3
- package/lib/utils/process-black-list.js +3 -5
- package/lib/utils/react-if.js +1 -1
- package/lib/utils/snap-scene.js +3 -7
- package/lib/utils/snap.js +22 -26
- package/lib/utils/threeCSG.es6.js +14 -14
- package/package.json +24 -54
- package/es/analytics/ga4.js +0 -191
- package/es/analytics/posthog.js +0 -60
- package/lib/analytics/ga4.js +0 -197
- package/lib/analytics/posthog.js +0 -68
package/es/class/layer.js
CHANGED
|
@@ -1,14 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
exports["default"] = void 0;
|
|
8
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
9
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
10
|
+
var _immutable = require("immutable");
|
|
11
|
+
var _export = require("./export");
|
|
12
|
+
var _export2 = require("../utils/export");
|
|
13
|
+
var _models = require("../models");
|
|
14
|
+
var _helper = require("../utils/helper");
|
|
12
15
|
var sameSet = function sameSet(set1, set2) {
|
|
13
16
|
return set1.size === set2.size && set1.isSuperset(set2) && set1.isSubset(set2);
|
|
14
17
|
};
|
|
@@ -21,17 +24,17 @@ var sameDirection = function sameDirection(list1, list2) {
|
|
|
21
24
|
var i1 = list2.indexOf(l1);
|
|
22
25
|
return (i1 - i0 - 1) % list1.size == 0;
|
|
23
26
|
};
|
|
24
|
-
var Layer = /*#__PURE__*/function () {
|
|
27
|
+
var Layer = exports["default"] = /*#__PURE__*/function () {
|
|
25
28
|
function Layer() {
|
|
26
|
-
|
|
29
|
+
(0, _classCallCheck2["default"])(this, Layer);
|
|
27
30
|
}
|
|
28
|
-
return
|
|
31
|
+
return (0, _createClass2["default"])(Layer, null, [{
|
|
29
32
|
key: "create",
|
|
30
33
|
value: function create(state, name, altitude) {
|
|
31
|
-
var layerID = IDBroker.acquireID();
|
|
34
|
+
var layerID = _export2.IDBroker.acquireID();
|
|
32
35
|
name = name || "layer ".concat(layerID);
|
|
33
36
|
altitude = altitude || 0;
|
|
34
|
-
var layer = new
|
|
37
|
+
var layer = new _models.Layer({
|
|
35
38
|
id: layerID,
|
|
36
39
|
name: name,
|
|
37
40
|
altitude: altitude
|
|
@@ -45,7 +48,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
45
48
|
}, {
|
|
46
49
|
key: "select",
|
|
47
50
|
value: function select(state, layerID) {
|
|
48
|
-
if (!state.get('alterate')) state = Project.unselectAll(state).updatedState;
|
|
51
|
+
if (!state.get('alterate')) state = _export.Project.unselectAll(state).updatedState;
|
|
49
52
|
state = state.setIn(['scene', 'selectedLayer'], layerID);
|
|
50
53
|
return {
|
|
51
54
|
updatedState: state
|
|
@@ -54,7 +57,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
54
57
|
}, {
|
|
55
58
|
key: "selectAll",
|
|
56
59
|
value: function selectAll(state, layerID) {
|
|
57
|
-
if (!state.get('alterate')) state = Project.unselectAll(state).updatedState;
|
|
60
|
+
if (!state.get('alterate')) state = _export.Project.unselectAll(state).updatedState;
|
|
58
61
|
state = state.setIn(['scene', 'selectedLayer'], layerID);
|
|
59
62
|
var layer = state.scene.layers.get(layerID);
|
|
60
63
|
layer.items.forEach(function (data) {
|
|
@@ -121,16 +124,16 @@ var Layer = /*#__PURE__*/function () {
|
|
|
121
124
|
items = _state$getIn.items,
|
|
122
125
|
areas = _state$getIn.areas;
|
|
123
126
|
if (lines) lines.forEach(function (line) {
|
|
124
|
-
state = Line.unselect(state, layerID, line.id).updatedState;
|
|
127
|
+
state = _export.Line.unselect(state, layerID, line.id).updatedState;
|
|
125
128
|
});
|
|
126
129
|
if (holes) holes.forEach(function (hole) {
|
|
127
|
-
state = Hole.unselect(state, layerID, hole.id).updatedState;
|
|
130
|
+
state = _export.Hole.unselect(state, layerID, hole.id).updatedState;
|
|
128
131
|
});
|
|
129
132
|
if (items) items.forEach(function (item) {
|
|
130
|
-
state = Item.unselect(state, layerID, item.id).updatedState;
|
|
133
|
+
state = _export.Item.unselect(state, layerID, item.id).updatedState;
|
|
131
134
|
});
|
|
132
135
|
if (areas) areas.forEach(function (area) {
|
|
133
|
-
state = Area.unselect(state, layerID, area.id).updatedState;
|
|
136
|
+
state = _export.Area.unselect(state, layerID, area.id).updatedState;
|
|
134
137
|
});
|
|
135
138
|
return {
|
|
136
139
|
updatedState: state
|
|
@@ -197,9 +200,9 @@ var Layer = /*#__PURE__*/function () {
|
|
|
197
200
|
checkLines.push(relatedLine);
|
|
198
201
|
checkLines.push(line);
|
|
199
202
|
var relatedLines = [];
|
|
200
|
-
GeometryUtils.getRelatedLines(relatedLines, line, vertices, allLines);
|
|
203
|
+
_export2.GeometryUtils.getRelatedLines(relatedLines, line, vertices, allLines);
|
|
201
204
|
var delflag = false;
|
|
202
|
-
if (isEmpty(allLines[line.id])) {
|
|
205
|
+
if ((0, _helper.isEmpty)(allLines[line.id])) {
|
|
203
206
|
delflag = true;
|
|
204
207
|
}
|
|
205
208
|
if (relatedLines.length > 1) {
|
|
@@ -223,8 +226,8 @@ var Layer = /*#__PURE__*/function () {
|
|
|
223
226
|
value: function interiorsurfacedetect(state, drawingLine, vertices, allLineArray, layerID) {
|
|
224
227
|
var relatedLines = [];
|
|
225
228
|
var allLines = allLineArray.toJS();
|
|
226
|
-
GeometryUtils.getRelatedLines(relatedLines, drawingLine, vertices, allLines);
|
|
227
|
-
if (isEmpty(relatedLines)) {
|
|
229
|
+
_export2.GeometryUtils.getRelatedLines(relatedLines, drawingLine, vertices, allLines);
|
|
230
|
+
if ((0, _helper.isEmpty)(relatedLines)) {
|
|
228
231
|
return {
|
|
229
232
|
updatedState: state
|
|
230
233
|
};
|
|
@@ -234,7 +237,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
234
237
|
this.lineInterior(relatedLines[0], drawingLine, changeLines, vertices, allLines, checkLines);
|
|
235
238
|
for (var i = 0; i < changeLines.length; i++) {
|
|
236
239
|
// if (changeLines[i].vertices.length === 2)
|
|
237
|
-
if (!isEmpty(allLines[changeLines[i].id])) {
|
|
240
|
+
if (!(0, _helper.isEmpty)(allLines[changeLines[i].id])) {
|
|
238
241
|
state = state.mergeIn(['scene', 'layers', layerID, 'lines', changeLines[i].id, 'vertices'], changeLines[i].vertices);
|
|
239
242
|
}
|
|
240
243
|
}
|
|
@@ -247,7 +250,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
247
250
|
tallLinesArray.forEach(function (tline) {
|
|
248
251
|
var line = tline.toJS();
|
|
249
252
|
var relatedLines = [];
|
|
250
|
-
GeometryUtils.getRelatedLines(relatedLines, line, vertices, tallLines);
|
|
253
|
+
_export2.GeometryUtils.getRelatedLines(relatedLines, line, vertices, tallLines);
|
|
251
254
|
relatedLines.forEach(function (relLine) {
|
|
252
255
|
if (relLine.vertices[0] === line.vertices[1]) {
|
|
253
256
|
if (!reverseLines.some(function (reverseLine) {
|
|
@@ -344,15 +347,15 @@ var Layer = /*#__PURE__*/function () {
|
|
|
344
347
|
// if (vertexCount > 1 && !linesArray.some(line => (line[0]==0 && line[1]==vertexCount-1) || (line[1]==0 && line[0]==vertexCount-1))) {
|
|
345
348
|
// linesArray = linesArray.set(IDBroker.acquireID(), [0, vertexCount-1]);
|
|
346
349
|
// }
|
|
347
|
-
var innerCyclesByVerticesArrayIndex = GraphInnerCycles.calculateInnerCycles(verticesArray, linesArray);
|
|
348
|
-
var innerCyclesByVerticesID = new List(innerCyclesByVerticesArrayIndex).map(function (cycle) {
|
|
349
|
-
return new List(cycle.map(function (vertexIndex) {
|
|
350
|
+
var innerCyclesByVerticesArrayIndex = _export2.GraphInnerCycles.calculateInnerCycles(verticesArray, linesArray);
|
|
351
|
+
var innerCyclesByVerticesID = new _immutable.List(innerCyclesByVerticesArrayIndex).map(function (cycle) {
|
|
352
|
+
return new _immutable.List(cycle.map(function (vertexIndex) {
|
|
350
353
|
return verticesArrayIndex_to_vertexID[vertexIndex];
|
|
351
354
|
}));
|
|
352
355
|
});
|
|
353
356
|
// All area vertices should be ordered in counterclockwise order
|
|
354
357
|
innerCyclesByVerticesID = innerCyclesByVerticesID.map(function (area) {
|
|
355
|
-
return GraphInnerCycles.isClockWiseOrder(area.map(function (vertexID) {
|
|
358
|
+
return _export2.GraphInnerCycles.isClockWiseOrder(area.map(function (vertexID) {
|
|
356
359
|
return state.getIn(['scene', 'layers', layerID, 'vertices', vertexID]);
|
|
357
360
|
})) ? area.reverse() : area;
|
|
358
361
|
});
|
|
@@ -364,7 +367,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
364
367
|
return sameDirection(vertices, area.vertices);
|
|
365
368
|
});
|
|
366
369
|
if (!areaInUse) {
|
|
367
|
-
state = Area.remove(state, layerID, area.id).updatedState;
|
|
370
|
+
state = _export.Area.remove(state, layerID, area.id).updatedState;
|
|
368
371
|
}
|
|
369
372
|
});
|
|
370
373
|
|
|
@@ -375,12 +378,12 @@ var Layer = /*#__PURE__*/function () {
|
|
|
375
378
|
});
|
|
376
379
|
if (areaInUse) {
|
|
377
380
|
areaIDs[ind] = areaInUse.id;
|
|
378
|
-
state = state.setIn(['scene', 'layers', layerID, 'areas', areaIDs[ind], 'holes'], new List());
|
|
381
|
+
state = state.setIn(['scene', 'layers', layerID, 'areas', areaIDs[ind], 'holes'], new _immutable.List());
|
|
379
382
|
} else {
|
|
380
383
|
var areaVerticesCoords = cycle.map(function (vertexID) {
|
|
381
384
|
return state.getIn(['scene', 'layers', layerID, 'vertices', vertexID]);
|
|
382
385
|
});
|
|
383
|
-
var resultAdd = Area.add(state, layerID, 'area', areaVerticesCoords, state.catalog);
|
|
386
|
+
var resultAdd = _export.Area.add(state, layerID, 'area', areaVerticesCoords, state.catalog);
|
|
384
387
|
areaIDs[ind] = resultAdd.area.id;
|
|
385
388
|
state = resultAdd.updatedState;
|
|
386
389
|
}
|
|
@@ -392,7 +395,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
392
395
|
var _state$getIn2 = state.getIn(['scene', 'layers', layerID, 'vertices', vertexID]),
|
|
393
396
|
x = _state$getIn2.x,
|
|
394
397
|
y = _state$getIn2.y;
|
|
395
|
-
return new List([x, y]);
|
|
398
|
+
return new _immutable.List([x, y]);
|
|
396
399
|
});
|
|
397
400
|
return {
|
|
398
401
|
id: id,
|
|
@@ -403,11 +406,11 @@ var Layer = /*#__PURE__*/function () {
|
|
|
403
406
|
// Find all holes for an area
|
|
404
407
|
var i, j;
|
|
405
408
|
for (i = 0; i < verticesCoordsForArea.length; i++) {
|
|
406
|
-
var holesList = new List(); // The holes for this area
|
|
409
|
+
var holesList = new _immutable.List(); // The holes for this area
|
|
407
410
|
var areaVerticesList = verticesCoordsForArea[i].vertices.flatten().toArray();
|
|
408
411
|
for (j = 0; j < verticesCoordsForArea.length; j++) {
|
|
409
412
|
if (i !== j) {
|
|
410
|
-
var isHole = GeometryUtils.ContainsPoint(areaVerticesList, verticesCoordsForArea[j].vertices.get(0).get(0), verticesCoordsForArea[j].vertices.get(0).get(1));
|
|
413
|
+
var isHole = _export2.GeometryUtils.ContainsPoint(areaVerticesList, verticesCoordsForArea[j].vertices.get(0).get(0), verticesCoordsForArea[j].vertices.get(0).get(1));
|
|
411
414
|
if (isHole) {
|
|
412
415
|
holesList = holesList.push(verticesCoordsForArea[j].id);
|
|
413
416
|
}
|
|
@@ -434,7 +437,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
434
437
|
|
|
435
438
|
// update direction of lines surrounding area
|
|
436
439
|
var layer = state.getIn(['scene', 'layers', layerID]);
|
|
437
|
-
var allAreaLines = GeometryUtils.getAllAreaLines(layer);
|
|
440
|
+
var allAreaLines = _export2.GeometryUtils.getAllAreaLines(layer);
|
|
438
441
|
// check whether the room is colsed. in this case, the allAreaLines have some values and if doesn't close, this value has nothing.
|
|
439
442
|
layer.lines.forEach(function (line) {
|
|
440
443
|
allAreaLines.some(function (l) {
|
|
@@ -463,7 +466,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
463
466
|
// layer.vertices.get(line.vertices.get(0)).toJS()
|
|
464
467
|
// );
|
|
465
468
|
if (!isAreaLine) {
|
|
466
|
-
if (!(GeometryUtils.isPointInArea(GeometryUtils.getAllArea(layer), layer.vertices.get(line.vertices.get(0))) && GeometryUtils.isPointInArea(GeometryUtils.getAllArea(layer), layer.vertices.get(line.vertices.get(1))))) {
|
|
469
|
+
if (!(_export2.GeometryUtils.isPointInArea(_export2.GeometryUtils.getAllArea(layer), layer.vertices.get(line.vertices.get(0))) && _export2.GeometryUtils.isPointInArea(_export2.GeometryUtils.getAllArea(layer), layer.vertices.get(line.vertices.get(1))))) {
|
|
467
470
|
separatedLine.push(line);
|
|
468
471
|
}
|
|
469
472
|
}
|
|
@@ -491,7 +494,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
491
494
|
pointArray.push(point);
|
|
492
495
|
});
|
|
493
496
|
pointArray.reverse();
|
|
494
|
-
var resultAdd = Area.add(state, layerID, 'area', pointArray, state.catalog);
|
|
497
|
+
var resultAdd = _export.Area.add(state, layerID, 'area', pointArray, state.catalog);
|
|
495
498
|
state = resultAdd.updatedState;
|
|
496
499
|
});
|
|
497
500
|
} else if (separatedLineCnt > 1) {
|
|
@@ -528,12 +531,12 @@ var Layer = /*#__PURE__*/function () {
|
|
|
528
531
|
x: ptXMin,
|
|
529
532
|
y: ptYMAX
|
|
530
533
|
});
|
|
531
|
-
var resultAdd = Area.add(state, layerID, 'area', pointArray, state.catalog);
|
|
534
|
+
var resultAdd = _export.Area.add(state, layerID, 'area', pointArray, state.catalog);
|
|
532
535
|
state = resultAdd.updatedState;
|
|
533
|
-
if (!isEmpty(drawingInfor)) {
|
|
536
|
+
if (!(0, _helper.isEmpty)(drawingInfor)) {
|
|
534
537
|
var allVertices = state.getIn(['scene', 'layers', layerID, 'vertices']);
|
|
535
538
|
var resultInterior = this.interiorsurfacedetect(state, drawingInfor.drawingLine.toJS(), allVertices.toJS(), allLinesArray, layerID);
|
|
536
|
-
if (!isEmpty(resultInterior)) {
|
|
539
|
+
if (!(0, _helper.isEmpty)(resultInterior)) {
|
|
537
540
|
state = resultInterior.updatedState;
|
|
538
541
|
}
|
|
539
542
|
}
|
|
@@ -550,8 +553,8 @@ var Layer = /*#__PURE__*/function () {
|
|
|
550
553
|
var v_id1 = line.getIn(['vertices', 1]);
|
|
551
554
|
var v0 = newState.getIn(['scene', 'layers', layerID, 'vertices', v_id0]);
|
|
552
555
|
var v1 = newState.getIn(['scene', 'layers', layerID, 'vertices', v_id1]);
|
|
553
|
-
if (GeometryUtils.verticesDistance(v0, v1) === 0) {
|
|
554
|
-
newState = Line.remove(newState, layerID, line.id).updatedState;
|
|
556
|
+
if (_export2.GeometryUtils.verticesDistance(v0, v1) === 0) {
|
|
557
|
+
newState = _export.Line.remove(newState, layerID, line.id).updatedState;
|
|
555
558
|
}
|
|
556
559
|
return newState;
|
|
557
560
|
}, state);
|
|
@@ -568,7 +571,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
568
571
|
updatedState: state
|
|
569
572
|
};
|
|
570
573
|
var doubleVertices = state.getIn(['scene', 'layers', layerID, 'vertices']).filter(function (v) {
|
|
571
|
-
return v.id !== vertexID && GeometryUtils.samePoints(vertex, v) // &&
|
|
574
|
+
return v.id !== vertexID && _export2.GeometryUtils.samePoints(vertex, v) // &&
|
|
572
575
|
//!v.lines.contains( vertexID ) &&
|
|
573
576
|
//!v.areas.contains( vertexID )
|
|
574
577
|
;
|
|
@@ -585,7 +588,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
585
588
|
});
|
|
586
589
|
}
|
|
587
590
|
});
|
|
588
|
-
reducedState = Vertex.addElement(reducedState, layerID, vertexID, 'lines', lineID).updatedState;
|
|
591
|
+
reducedState = _export.Vertex.addElement(reducedState, layerID, vertexID, 'lines', lineID).updatedState;
|
|
589
592
|
return reducedState;
|
|
590
593
|
}, state);
|
|
591
594
|
var biReduced = doubleVertex.areas.reduce(function (reducedState, areaID) {
|
|
@@ -594,10 +597,10 @@ var Layer = /*#__PURE__*/function () {
|
|
|
594
597
|
return v === doubleVertex.id ? vertexID : v;
|
|
595
598
|
});
|
|
596
599
|
});
|
|
597
|
-
reducedState = Vertex.addElement(reducedState, layerID, vertexID, 'areas', areaID).updatedState;
|
|
600
|
+
reducedState = _export.Vertex.addElement(reducedState, layerID, vertexID, 'areas', areaID).updatedState;
|
|
598
601
|
return reducedState;
|
|
599
602
|
}, reduced);
|
|
600
|
-
state = Vertex.remove(biReduced, layerID, doubleVertex.id, null, null, true).updatedState;
|
|
603
|
+
state = _export.Vertex.remove(biReduced, layerID, doubleVertex.id, null, null, true).updatedState;
|
|
601
604
|
});
|
|
602
605
|
return {
|
|
603
606
|
updatedState: state
|
|
@@ -608,16 +611,16 @@ var Layer = /*#__PURE__*/function () {
|
|
|
608
611
|
value: function setPropertiesOnSelected(state, layerID, properties) {
|
|
609
612
|
var selected = state.getIn(['scene', 'layers', layerID, 'selected']);
|
|
610
613
|
selected.lines.forEach(function (lineID) {
|
|
611
|
-
return state = Line.setProperties(state, layerID, lineID, properties).updatedState;
|
|
614
|
+
return state = _export.Line.setProperties(state, layerID, lineID, properties).updatedState;
|
|
612
615
|
});
|
|
613
616
|
selected.holes.forEach(function (holeID) {
|
|
614
|
-
return state = Hole.setProperties(state, layerID, holeID, properties).updatedState;
|
|
617
|
+
return state = _export.Hole.setProperties(state, layerID, holeID, properties).updatedState;
|
|
615
618
|
});
|
|
616
619
|
selected.areas.forEach(function (areaID) {
|
|
617
|
-
return state = Area.setProperties(state, layerID, areaID, properties).updatedState;
|
|
620
|
+
return state = _export.Area.setProperties(state, layerID, areaID, properties).updatedState;
|
|
618
621
|
});
|
|
619
622
|
selected.items.forEach(function (itemID) {
|
|
620
|
-
return state = Item.setProperties(state, layerID, itemID, properties).updatedState;
|
|
623
|
+
return state = _export.Item.setProperties(state, layerID, itemID, properties).updatedState;
|
|
621
624
|
});
|
|
622
625
|
return {
|
|
623
626
|
updatedState: state
|
|
@@ -628,16 +631,16 @@ var Layer = /*#__PURE__*/function () {
|
|
|
628
631
|
value: function updatePropertiesOnSelected(state, layerID, properties) {
|
|
629
632
|
var selected = state.getIn(['scene', 'layers', layerID, 'selected']);
|
|
630
633
|
selected.lines.forEach(function (lineID) {
|
|
631
|
-
return state = Line.updateProperties(state, layerID, lineID, properties).updatedState;
|
|
634
|
+
return state = _export.Line.updateProperties(state, layerID, lineID, properties).updatedState;
|
|
632
635
|
});
|
|
633
636
|
selected.holes.forEach(function (holeID) {
|
|
634
|
-
return state = Hole.updateProperties(state, layerID, holeID, properties).updatedState;
|
|
637
|
+
return state = _export.Hole.updateProperties(state, layerID, holeID, properties).updatedState;
|
|
635
638
|
});
|
|
636
639
|
selected.areas.forEach(function (areaID) {
|
|
637
|
-
return state = Area.updateProperties(state, layerID, areaID, properties).updatedState;
|
|
640
|
+
return state = _export.Area.updateProperties(state, layerID, areaID, properties).updatedState;
|
|
638
641
|
});
|
|
639
642
|
selected.items.forEach(function (itemID) {
|
|
640
|
-
return state = Item.updateProperties(state, layerID, itemID, properties).updatedState;
|
|
643
|
+
return state = _export.Item.updateProperties(state, layerID, itemID, properties).updatedState;
|
|
641
644
|
});
|
|
642
645
|
return {
|
|
643
646
|
updatedState: state
|
|
@@ -648,13 +651,13 @@ var Layer = /*#__PURE__*/function () {
|
|
|
648
651
|
value: function setAttributesOnSelected(state, layerID, attributes) {
|
|
649
652
|
var selected = state.getIn(['scene', 'layers', layerID, 'selected']);
|
|
650
653
|
selected.lines.forEach(function (lineID) {
|
|
651
|
-
return state = Line.setAttributes(state, layerID, lineID, attributes).updatedState;
|
|
654
|
+
return state = _export.Line.setAttributes(state, layerID, lineID, attributes).updatedState;
|
|
652
655
|
});
|
|
653
656
|
selected.holes.forEach(function (holeID) {
|
|
654
|
-
return state = Hole.setAttributes(state, layerID, holeID, attributes).updatedState;
|
|
657
|
+
return state = _export.Hole.setAttributes(state, layerID, holeID, attributes).updatedState;
|
|
655
658
|
});
|
|
656
659
|
selected.items.forEach(function (itemID) {
|
|
657
|
-
return state = Item.setAttributes(state, layerID, itemID, attributes).updatedState;
|
|
660
|
+
return state = _export.Item.setAttributes(state, layerID, itemID, attributes).updatedState;
|
|
658
661
|
});
|
|
659
662
|
//selected.areas.forEach(areaID => state = Area.setAttributes( state, layerID, areaID, attributes ).updatedState);
|
|
660
663
|
|
|
@@ -663,5 +666,4 @@ var Layer = /*#__PURE__*/function () {
|
|
|
663
666
|
};
|
|
664
667
|
}
|
|
665
668
|
}]);
|
|
666
|
-
}();
|
|
667
|
-
export { Layer as default };
|
|
669
|
+
}();
|