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