@wcardinal/wcardinal-ui 0.310.1 → 0.312.0

package/dist/wcardinal-ui.cjs.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.310.1
+ Winter Cardinal UI v0.312.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -1369,6 +1369,17 @@ var DASHED = 128;
 var DASHED_DENSELY = 256;
 var DASHED_LOOSELY = 512;
 var CURVE = 1024;
+var FORMATTER_SHIFT = 10;
+var FORMATTER_MASK = 0xffc00;
+var FORMATTER_EXTENSION_LOWEST = 512;
+var FORMATTER_EXTENSION_HIGHEST = 1023;
+var FORMATTER_CURVE = 1;
+/**
+ * EShape point style.
+ *
+ * * Bits 0 to 9: Bit field of styles.
+ * * Bits 10 to 19: Formatter ID.
+ */
 var EShapePointsStyle = {
     NONE: 0,
     CLOSED: CLOSED,
@@ -1397,7 +1408,11 @@ var EShapePointsStyle = {
     /** @deprecated in favor of EShapeStrokeStyle. */
     DASHED_MASK: DASHED | DASHED_DENSELY | DASHED_LOOSELY,
     CURVE: CURVE,
-    FORMATTER_MASK: CURVE
+    FORMATTER_SHIFT: FORMATTER_SHIFT,
+    FORMATTER_MASK: FORMATTER_MASK,
+    FORMATTER_EXTENSION_LOWEST: FORMATTER_EXTENSION_LOWEST,
+    FORMATTER_EXTENSION_HIGHEST: FORMATTER_EXTENSION_HIGHEST,
+    FORMATTER_CURVE: FORMATTER_CURVE
 };
 
 var buildColor = function (color, alpha, voffset, vcount, colors) {
@@ -18241,191 +18256,551 @@ var toIndexOf = function (array, value) {
  * Copyright (C) 2019 Toshiba Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-var PID = Math.PI * 2;
-var PIH = Math.PI * 0.5;
-var vdot = function (x0, y0, x1, y1) {
-    return x0 * x1 + y0 * y1;
-};
-var vlen = function (x0, y0) {
-    return Math.sqrt(vdot(x0, y0, x0, y0));
-};
-var vcross = function (x0, y0, x1, y1) {
-    return x0 * y1 - y0 * x1;
-};
-var pnew = function () {
-    return {
-        center: [0, 0],
-        axis1: [0, 0],
-        axis2: [0, 0],
-        angle: [0, 0, 0]
-    };
-};
-var pset = function (cx, cy, a1x, a1y, a2x, a2y, angle1, angle2, angle3, result) {
-    var c = result.center;
-    c[0] = cx;
-    c[1] = cy;
-    var a1 = result.axis1;
-    a1[0] = a1x;
-    a1[1] = a1y;
-    var a2 = result.axis2;
-    a2[0] = a2x;
-    a2[1] = a2y;
-    var a = result.angle;
-    a[0] = angle1;
-    a[1] = angle2;
-    a[2] = angle3;
-    return result;
-};
-var pcopy = function (source, result) {
-    var c = source.center;
-    var a1 = source.axis1;
-    var a2 = source.axis2;
-    var a = source.angle;
-    return pset(c[0], c[1], a1[0], a1[1], a2[0], a2[1], a[0], a[1], a[2], result);
-};
-var acopy = function (source, result) {
-    var sourceLength = source.length;
-    for (var i = 0; i < sourceLength; ++i) {
-        result[i] = source[i];
+var toPointsBoundary = function (values, result) {
+    var valuesLength = values.length;
+    if (2 <= valuesLength) {
+        var xmin = values[0];
+        var ymin = values[1];
+        var xmax = xmin;
+        var ymax = ymin;
+        for (var i = 2, imax = values.length; i < imax; i += 2) {
+            var x = values[i];
+            var y = values[i + 1];
+            xmin = Math.min(xmin, x);
+            ymin = Math.min(ymin, y);
+            xmax = Math.max(xmax, x);
+            ymax = Math.max(ymax, y);
+        }
+        result[0] = xmin;
+        result[1] = ymin;
+        result[2] = xmax;
+        result[3] = ymax;
     }
-    if (result.length !== sourceLength) {
-        result.length = sourceLength;
+    else {
+        result[0] = 0;
+        result[1] = 0;
+        result[2] = 0;
+        result[3] = 0;
     }
     return result;
 };
-/**
- * An utility class for spline curves based on the work of Cem Yuksel.
- * Pleaase refer to the paper `A class of C2 interpolating splines`.
- * http://www.cemyuksel.com/research/interpolating_splines/
+
+/*
+ * Copyright (C) 2019 Toshiba Corporation
+ * SPDX-License-Identifier: Apache-2.0
  */
-var UtilCurve = /** @class */ (function () {
-    function UtilCurve() {
+var EShapePointsMarkerBase = /** @class */ (function () {
+    function EShapePointsMarkerBase(parent) {
+        var _this = this;
+        this._parent = parent;
+        this._lockCount = 0;
+        this._isTypeChanged = false;
+        this._isSizeChanged = false;
+        this._isFillChanged = false;
+        this._type = EShapePointsMarkerType.NONE;
+        this._size = new pixi_js.ObservablePoint(function () {
+            _this.onSizeChange();
+        }, undefined, EShapeDefaults.SIZE_X * 0.15, EShapeDefaults.SIZE_Y * 0.15);
+        this._fill = this.newFill();
+        this._transformId = 0;
     }
-    UtilCurve.set = function (center1, angle10, angle11, axis11, axis12, center2, angle20, angle21, axis21, axis22, nsegment, isAdaptive, isEdge, result, resultIndex) {
-        var a = Math.max(Math.abs(angle10 - angle11), Math.abs(angle20 - angle21));
-        var n = isAdaptive ? Math.max(1, Math.round(nsegment * (a / PIH))) : nsegment;
-        var imax = isEdge ? n + 1 : n;
-        for (var i = 0; i < imax; ++i) {
-            var t = i / n;
-            var w0 = 1 - t;
-            var w1 = t;
-            var t1 = w0 * angle10 + w1 * angle11;
-            var c1 = Math.cos(t1);
-            var s1 = Math.sin(t1);
-            var x1 = center1[0] + c1 * axis11[0] + s1 * axis12[0];
-            var y1 = center1[1] + c1 * axis11[1] + s1 * axis12[1];
-            var t2 = w0 * angle20 + w1 * angle21;
-            var c2 = Math.cos(t2);
-            var s2 = Math.sin(t2);
-            var x2 = center2[0] + c2 * axis21[0] + s2 * axis22[0];
-            var y2 = center2[1] + c2 * axis21[1] + s2 * axis22[1];
-            var t3 = PIH * t;
-            var c3 = Math.cos(t3);
-            var s3 = Math.sin(t3);
-            var cc3 = c3 * c3;
-            var ss3 = s3 * s3;
-            var x3 = cc3 * x1 + ss3 * x2;
-            var y3 = cc3 * y1 + ss3 * y2;
-            result[++resultIndex] = x3;
-            result[++resultIndex] = y3;
-        }
-        return resultIndex;
+    EShapePointsMarkerBase.prototype.newFill = function () {
+        return new EShapeFillImpl(this, true, EShapeDefaults.FILL_COLOR, 1);
     };
-    /**
-     * Calculate an interpolated points of the given control points.
-     *
-     * @param length A number of control points.
-     * @param values An array of control points.
-     * @param toParameter An interpolation method.
-     * @param isClosed True if the line is closed.
-     * @param nsegment The number of segments per 90 degree if isAdaptive is true.
-     * If isAdaptive is false, the number of segments is fixed to the given number
-     * regardless of arc angles.
-     * @param isAdaptive True to adjust the number of segments adaptively.
-     * @returns An interpolated points of the given control points.
-     */
-    UtilCurve.interpolate = function (length, values, segments, toParameter, isClosed, nsegment, isAdaptive, result) {
-        var rvalues = result.values;
-        var rsegments = result.segments;
-        if (length <= 2) {
-            acopy(values, rvalues);
-            acopy(segments, rsegments);
-            return result;
+    EShapePointsMarkerBase.prototype.lock = function () {
+        this._lockCount += 1;
+        if (this._lockCount === 1) {
+            this._isTypeChanged = false;
+            this._isSizeChanged = false;
+            this._isFillChanged = false;
         }
-        var c0 = this.WORK_P0 || pnew();
-        var c1 = this.WORK_P1 || pnew();
-        var c2 = this.WORK_P2 || pnew();
-        this.WORK_P0 = c0;
-        this.WORK_P1 = c1;
-        this.WORK_P2 = c2;
-        var rvaluesCount = -1;
-        var rsegmentCount = -1;
-        if (isClosed) {
-            toParameter(0, length, values, c0);
-            pcopy(c0, c1);
-            for (var i = 1; i < length; ++i) {
-                toParameter(i, length, values, c2);
-                if (0 <= toIndexOf(segments, i)) {
-                    var index = (i - 1) << 1;
-                    rvalues[++rvaluesCount] = values[index + 0];
-                    rvalues[++rvaluesCount] = values[index + 1];
-                    rsegments[++rsegmentCount] = (rvaluesCount + 1) >> 1;
-                }
-                else {
-                    rvaluesCount = this.set(c1.center, c1.angle[1], c1.angle[2], c1.axis1, c1.axis2, c2.center, c2.angle[0], c2.angle[1], c2.axis1, c2.axis2, nsegment, isAdaptive, false, rvalues, rvaluesCount);
-                }
-                var c3 = c1;
-                c1 = c2;
-                c2 = c3;
+        return this;
+    };
+    EShapePointsMarkerBase.prototype.unlock = function () {
+        this._lockCount -= 1;
+        if (this._lockCount === 0) {
+            if (this._isTypeChanged) {
+                this.onTypeChange();
             }
-            if (0 <= toIndexOf(segments, 0)) {
-                var index = (length - 1) << 1;
-                rvalues[++rvaluesCount] = values[index + 0];
-                rvalues[++rvaluesCount] = values[index + 1];
-                rsegments.unshift(0);
-                rsegmentCount += 1;
+            else if (this._isSizeChanged) {
+                this.onSizeChange();
             }
-            else {
-                rvaluesCount = this.set(c1.center, c1.angle[1], c1.angle[2], c1.axis1, c1.axis2, c0.center, c0.angle[0], c0.angle[1], c0.axis1, c0.axis2, nsegment, isAdaptive, false, rvalues, rvaluesCount);
+            else if (this._isFillChanged) {
+                this.onFillChange();
             }
+            this._isTypeChanged = false;
+            this._isSizeChanged = false;
+            this._isFillChanged = false;
         }
-        else {
-            toParameter(1, length, values, c0);
-            if (0 <= toIndexOf(segments, 1)) {
-                rvalues[++rvaluesCount] = values[0];
-                rvalues[++rvaluesCount] = values[1];
-                rsegments[++rsegmentCount] = 1;
-            }
-            else {
-                rvaluesCount = this.set(c0.center, c0.angle[0], c0.angle[1], c0.axis1, c0.axis2, c0.center, c0.angle[0], c0.angle[1], c0.axis1, c0.axis2, nsegment, isAdaptive, false, rvalues, rvaluesCount);
-            }
-            pcopy(c0, c1);
-            for (var i = 2, imax = length - 1; i < imax; ++i) {
-                toParameter(i, length, values, c2);
-                if (0 <= toIndexOf(segments, i)) {
-                    var index = (i - 1) << 1;
-                    rvalues[++rvaluesCount] = values[index + 0];
-                    rvalues[++rvaluesCount] = values[index + 1];
-                    rsegments[++rsegmentCount] = (rvaluesCount + 1) >> 1;
-                }
-                else {
-                    rvaluesCount = this.set(c1.center, c1.angle[1], c1.angle[2], c1.axis1, c1.axis2, c2.center, c2.angle[0], c2.angle[1], c2.axis1, c2.axis2, nsegment, isAdaptive, false, rvalues, rvaluesCount);
-                }
-                var c3 = c1;
-                c1 = c2;
-                c2 = c3;
-            }
-            if (0 <= toIndexOf(segments, length - 1)) {
-                var index = (length - 2) << 1;
-                rvalues[++rvaluesCount] = values[index + 0];
-                rvalues[++rvaluesCount] = values[index + 1];
-                rsegments[++rsegmentCount] = (rvaluesCount + 1) >> 1;
-            }
-            else {
-                rvaluesCount = this.set(c1.center, c1.angle[1], c1.angle[2], c1.axis1, c1.axis2, c1.center, c1.angle[1], c1.angle[2], c1.axis1, c1.axis2, nsegment, isAdaptive, true, rvalues, rvaluesCount);
+        return this;
+    };
+    Object.defineProperty(EShapePointsMarkerBase.prototype, "type", {
+        get: function () {
+            return this._type;
+        },
+        set: function (type) {
+            if (this._type !== type) {
+                this._type = type;
+                this.onTypeChange();
             }
+        },
+        enumerable: false,
+        configurable: true
+    });
+    EShapePointsMarkerBase.prototype.onTypeChange = function () {
+        if (0 < this._lockCount) {
+            this._isTypeChanged = true;
+            return;
         }
-        rvaluesCount += 1;
+        this._parent.onTypeChange();
+    };
+    Object.defineProperty(EShapePointsMarkerBase.prototype, "size", {
+        get: function () {
+            return this._size;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    EShapePointsMarkerBase.prototype.onSizeChange = function () {
+        if (0 < this._lockCount) {
+            this._isSizeChanged = true;
+            return;
+        }
+        this._parent.onSizeChange();
+    };
+    Object.defineProperty(EShapePointsMarkerBase.prototype, "transform", {
+        get: function () {
+            return this.updateTransform();
+        },
+        enumerable: false,
+        configurable: true
+    });
+    EShapePointsMarkerBase.prototype.updateTransform = function () {
+        var result = this._transform;
+        if (result == null) {
+            result = new pixi_js.Matrix();
+            this._transform = result;
+        }
+        var parentParent = this._parent.parent;
+        var id = parentParent.id;
+        if (this._transformId !== id) {
+            this._transformId = id;
+            var formatted = parentParent.formatted;
+            if (2 <= formatted.length) {
+                this.toTransform(formatted.values, result);
+            }
+            else {
+                result.identity();
+            }
+        }
+        return result;
+    };
+    EShapePointsMarkerBase.prototype.toTransformMatrix = function (x0, y0, x1, y1, result) {
+        var dx = x0 - x1;
+        var dy = y0 - y1;
+        var n = dx * dx + dy * dy;
+        if (0.00001 < n) {
+            var f = 1 / Math.sqrt(n);
+            var nx = dx * f;
+            var ny = dy * f;
+            result.set(ny, -nx, -nx, -ny, x0, y0);
+        }
+        else {
+            result.set(1, 0, 0, 1, x0, y0);
+        }
+        return result;
+    };
+    Object.defineProperty(EShapePointsMarkerBase.prototype, "fill", {
+        get: function () {
+            return this._fill;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    EShapePointsMarkerBase.prototype.onFillChange = function () {
+        if (0 < this._lockCount) {
+            this._isFillChanged = true;
+            return;
+        }
+        this._parent.onFillChange();
+    };
+    EShapePointsMarkerBase.prototype.updateUploaded = function () {
+        this.onFillChange();
+    };
+    EShapePointsMarkerBase.prototype.copy = function (source) {
+        var size = source.size;
+        this.set(source.type, size.x, size.y);
+        return this;
+    };
+    EShapePointsMarkerBase.prototype.set = function (type, sizeX, sizeY) {
+        this.lock();
+        if (type != null) {
+            this.type = type;
+        }
+        this.size.set(sizeX, sizeY);
+        this.unlock();
+        return this;
+    };
+    EShapePointsMarkerBase.prototype.serialize = function (manager) {
+        var size = this._size;
+        var fillId = this._fill.serialize(manager);
+        return manager.addResource("[".concat(this._type, ",").concat(size.x, ",").concat(size.y, ",").concat(fillId, "]"));
+    };
+    EShapePointsMarkerBase.prototype.deserialize = function (resourceId, manager) {
+        var resources = manager.resources;
+        if (0 <= resourceId && resourceId < resources.length) {
+            var parsed = manager.getExtension(resourceId);
+            if (parsed == null) {
+                parsed = JSON.parse(resources[resourceId]);
+                manager.setExtension(resourceId, parsed);
+            }
+            this.lock();
+            this.type = parsed[0];
+            this._size.set(parsed[1], parsed[2]);
+            this._fill.deserialize(parsed[3], manager);
+            this.unlock();
+        }
+    };
+    return EShapePointsMarkerBase;
+}());
+
+var EShapePointsMarkerHead = /** @class */ (function (_super) {
+    __extends(EShapePointsMarkerHead, _super);
+    function EShapePointsMarkerHead() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    EShapePointsMarkerHead.prototype.toTransform = function (values, result) {
+        var valuesLength = values.length;
+        if (4 <= valuesLength) {
+            return this.toTransformMatrix(values[valuesLength - 2], values[valuesLength - 1], values[valuesLength - 4], values[valuesLength - 3], result);
+        }
+        else {
+            result.identity();
+        }
+        return result;
+    };
+    return EShapePointsMarkerHead;
+}(EShapePointsMarkerBase));
+
+var EShapePointsMarkerTail = /** @class */ (function (_super) {
+    __extends(EShapePointsMarkerTail, _super);
+    function EShapePointsMarkerTail() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    EShapePointsMarkerTail.prototype.toTransform = function (values, result) {
+        var valuesLength = values.length;
+        if (4 <= valuesLength) {
+            return this.toTransformMatrix(values[0], values[1], values[2], values[3], result);
+        }
+        else {
+            result.identity();
+        }
+        return result;
+    };
+    return EShapePointsMarkerTail;
+}(EShapePointsMarkerBase));
+
+/*
+ * Copyright (C) 2019 Toshiba Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+var EShapePointsMarkerContainerImpl = /** @class */ (function () {
+    function EShapePointsMarkerContainerImpl(parent) {
+        this._parent = parent;
+        this._lockCount = 0;
+        this._isTypeChanged = false;
+        this._isSizeChanged = false;
+        this._isFillChanged = false;
+        this._head = new EShapePointsMarkerHead(this);
+        this._tail = new EShapePointsMarkerTail(this);
+    }
+    EShapePointsMarkerContainerImpl.prototype.lock = function () {
+        this._lockCount += 1;
+        if (this._lockCount === 1) {
+            this._isTypeChanged = false;
+            this._isSizeChanged = false;
+            this._isFillChanged = false;
+        }
+        return this;
+    };
+    EShapePointsMarkerContainerImpl.prototype.unlock = function () {
+        this._lockCount -= 1;
+        if (this._lockCount === 0) {
+            if (this._isTypeChanged) {
+                this.onTypeChange();
+            }
+            else if (this._isSizeChanged) {
+                this.onSizeChange();
+            }
+            else if (this._isFillChanged) {
+                this.onFillChange();
+            }
+            this._isTypeChanged = false;
+            this._isSizeChanged = false;
+            this._isFillChanged = false;
+        }
+        return this;
+    };
+    Object.defineProperty(EShapePointsMarkerContainerImpl.prototype, "parent", {
+        get: function () {
+            return this._parent;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(EShapePointsMarkerContainerImpl.prototype, "head", {
+        get: function () {
+            return this._head;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(EShapePointsMarkerContainerImpl.prototype, "tail", {
+        get: function () {
+            return this._tail;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    EShapePointsMarkerContainerImpl.prototype.onTypeChange = function () {
+        if (0 < this._lockCount) {
+            this._isTypeChanged = true;
+            return;
+        }
+        this._parent.onMarkerTypeChange();
+    };
+    EShapePointsMarkerContainerImpl.prototype.onSizeChange = function () {
+        if (0 < this._lockCount) {
+            this._isSizeChanged = true;
+            return;
+        }
+        this._parent.onMarkerSizeChange();
+    };
+    EShapePointsMarkerContainerImpl.prototype.onFillChange = function () {
+        if (0 < this._lockCount) {
+            this._isFillChanged = true;
+            return;
+        }
+        this._parent.onMarkerFillChange();
+    };
+    EShapePointsMarkerContainerImpl.prototype.copy = function (source) {
+        this.lock();
+        this._head.copy(source.head);
+        this._tail.copy(source.tail);
+        this.unlock();
+        return this;
+    };
+    EShapePointsMarkerContainerImpl.prototype.serialize = function (manager) {
+        var headId = this._head.serialize(manager);
+        var tailId = this._tail.serialize(manager);
+        return manager.addResource("[".concat(headId, ",").concat(tailId, "]"));
+    };
+    EShapePointsMarkerContainerImpl.prototype.deserialize = function (resourceId, manager) {
+        var resources = manager.resources;
+        if (0 <= resourceId && resourceId < resources.length) {
+            var parsed = manager.getExtension(resourceId);
+            if (parsed == null) {
+                parsed = JSON.parse(resources[resourceId]);
+                manager.setExtension(resourceId, parsed);
+            }
+            this.lock();
+            this._head.deserialize(parsed[0], manager);
+            this._tail.deserialize(parsed[1], manager);
+            this.unlock();
+        }
+    };
+    return EShapePointsMarkerContainerImpl;
+}());
+
+/*
+ * Copyright (C) 2019 Toshiba Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+var PID = Math.PI * 2;
+var PIH = Math.PI * 0.5;
+var vdot = function (x0, y0, x1, y1) {
+    return x0 * x1 + y0 * y1;
+};
+var vlen = function (x0, y0) {
+    return Math.sqrt(vdot(x0, y0, x0, y0));
+};
+var vcross = function (x0, y0, x1, y1) {
+    return x0 * y1 - y0 * x1;
+};
+var pnew = function () {
+    return {
+        center: [0, 0],
+        axis1: [0, 0],
+        axis2: [0, 0],
+        angle: [0, 0, 0]
+    };
+};
+var pset = function (cx, cy, a1x, a1y, a2x, a2y, angle1, angle2, angle3, result) {
+    var c = result.center;
+    c[0] = cx;
+    c[1] = cy;
+    var a1 = result.axis1;
+    a1[0] = a1x;
+    a1[1] = a1y;
+    var a2 = result.axis2;
+    a2[0] = a2x;
+    a2[1] = a2y;
+    var a = result.angle;
+    a[0] = angle1;
+    a[1] = angle2;
+    a[2] = angle3;
+    return result;
+};
+var pcopy = function (source, result) {
+    var c = source.center;
+    var a1 = source.axis1;
+    var a2 = source.axis2;
+    var a = source.angle;
+    return pset(c[0], c[1], a1[0], a1[1], a2[0], a2[1], a[0], a[1], a[2], result);
+};
+var acopy = function (source, result) {
+    var sourceLength = source.length;
+    for (var i = 0; i < sourceLength; ++i) {
+        result[i] = source[i];
+    }
+    if (result.length !== sourceLength) {
+        result.length = sourceLength;
+    }
+    return result;
+};
+/**
+ * An utility class for spline curves based on the work of Cem Yuksel.
+ * Pleaase refer to the paper `A class of C2 interpolating splines`.
+ * http://www.cemyuksel.com/research/interpolating_splines/
+ */
+var UtilCurve = /** @class */ (function () {
+    function UtilCurve() {
+    }
+    UtilCurve.set = function (center1, angle10, angle11, axis11, axis12, center2, angle20, angle21, axis21, axis22, nsegment, isAdaptive, isEdge, result, resultIndex) {
+        var a = Math.max(Math.abs(angle10 - angle11), Math.abs(angle20 - angle21));
+        var n = isAdaptive ? Math.max(1, Math.round(nsegment * (a / PIH))) : nsegment;
+        var imax = isEdge ? n + 1 : n;
+        for (var i = 0; i < imax; ++i) {
+            var t = i / n;
+            var w0 = 1 - t;
+            var w1 = t;
+            var t1 = w0 * angle10 + w1 * angle11;
+            var c1 = Math.cos(t1);
+            var s1 = Math.sin(t1);
+            var x1 = center1[0] + c1 * axis11[0] + s1 * axis12[0];
+            var y1 = center1[1] + c1 * axis11[1] + s1 * axis12[1];
+            var t2 = w0 * angle20 + w1 * angle21;
+            var c2 = Math.cos(t2);
+            var s2 = Math.sin(t2);
+            var x2 = center2[0] + c2 * axis21[0] + s2 * axis22[0];
+            var y2 = center2[1] + c2 * axis21[1] + s2 * axis22[1];
+            var t3 = PIH * t;
+            var c3 = Math.cos(t3);
+            var s3 = Math.sin(t3);
+            var cc3 = c3 * c3;
+            var ss3 = s3 * s3;
+            var x3 = cc3 * x1 + ss3 * x2;
+            var y3 = cc3 * y1 + ss3 * y2;
+            result[++resultIndex] = x3;
+            result[++resultIndex] = y3;
+        }
+        return resultIndex;
+    };
+    /**
+     * Calculate an interpolated points of the given control points.
+     *
+     * @param length A number of control points.
+     * @param values An array of control points.
+     * @param toParameter An interpolation method.
+     * @param isClosed True if the line is closed.
+     * @param nsegment The number of segments per 90 degree if isAdaptive is true.
+     * If isAdaptive is false, the number of segments is fixed to the given number
+     * regardless of arc angles.
+     * @param isAdaptive True to adjust the number of segments adaptively.
+     * @returns An interpolated points of the given control points.
+     */
+    UtilCurve.interpolate = function (length, values, segments, toParameter, isClosed, nsegment, isAdaptive, result) {
+        var rvalues = result.values;
+        var rsegments = result.segments;
+        if (length <= 2) {
+            acopy(values, rvalues);
+            acopy(segments, rsegments);
+            return result;
+        }
+        var c0 = this.WORK_P0 || pnew();
+        var c1 = this.WORK_P1 || pnew();
+        var c2 = this.WORK_P2 || pnew();
+        this.WORK_P0 = c0;
+        this.WORK_P1 = c1;
+        this.WORK_P2 = c2;
+        var rvaluesCount = -1;
+        var rsegmentCount = -1;
+        if (isClosed) {
+            toParameter(0, length, values, c0);
+            pcopy(c0, c1);
+            for (var i = 1; i < length; ++i) {
+                toParameter(i, length, values, c2);
+                if (0 <= toIndexOf(segments, i)) {
+                    var index = (i - 1) << 1;
+                    rvalues[++rvaluesCount] = values[index + 0];
+                    rvalues[++rvaluesCount] = values[index + 1];
+                    rsegments[++rsegmentCount] = (rvaluesCount + 1) >> 1;
+                }
+                else {
+                    rvaluesCount = this.set(c1.center, c1.angle[1], c1.angle[2], c1.axis1, c1.axis2, c2.center, c2.angle[0], c2.angle[1], c2.axis1, c2.axis2, nsegment, isAdaptive, false, rvalues, rvaluesCount);
+                }
+                var c3 = c1;
+                c1 = c2;
+                c2 = c3;
+            }
+            if (0 <= toIndexOf(segments, 0)) {
+                var index = (length - 1) << 1;
+                rvalues[++rvaluesCount] = values[index + 0];
+                rvalues[++rvaluesCount] = values[index + 1];
+                rsegments.unshift(0);
+                rsegmentCount += 1;
+            }
+            else {
+                rvaluesCount = this.set(c1.center, c1.angle[1], c1.angle[2], c1.axis1, c1.axis2, c0.center, c0.angle[0], c0.angle[1], c0.axis1, c0.axis2, nsegment, isAdaptive, false, rvalues, rvaluesCount);
+            }
+        }
+        else {
+            toParameter(1, length, values, c0);
+            if (0 <= toIndexOf(segments, 1)) {
+                rvalues[++rvaluesCount] = values[0];
+                rvalues[++rvaluesCount] = values[1];
+                rsegments[++rsegmentCount] = 1;
+            }
+            else {
+                rvaluesCount = this.set(c0.center, c0.angle[0], c0.angle[1], c0.axis1, c0.axis2, c0.center, c0.angle[0], c0.angle[1], c0.axis1, c0.axis2, nsegment, isAdaptive, false, rvalues, rvaluesCount);
+            }
+            pcopy(c0, c1);
+            for (var i = 2, imax = length - 1; i < imax; ++i) {
+                toParameter(i, length, values, c2);
+                if (0 <= toIndexOf(segments, i)) {
+                    var index = (i - 1) << 1;
+                    rvalues[++rvaluesCount] = values[index + 0];
+                    rvalues[++rvaluesCount] = values[index + 1];
+                    rsegments[++rsegmentCount] = (rvaluesCount + 1) >> 1;
+                }
+                else {
+                    rvaluesCount = this.set(c1.center, c1.angle[1], c1.angle[2], c1.axis1, c1.axis2, c2.center, c2.angle[0], c2.angle[1], c2.axis1, c2.axis2, nsegment, isAdaptive, false, rvalues, rvaluesCount);
+                }
+                var c3 = c1;
+                c1 = c2;
+                c2 = c3;
+            }
+            if (0 <= toIndexOf(segments, length - 1)) {
+                var index = (length - 2) << 1;
+                rvalues[++rvaluesCount] = values[index + 0];
+                rvalues[++rvaluesCount] = values[index + 1];
+                rsegments[++rsegmentCount] = (rvaluesCount + 1) >> 1;
+            }
+            else {
+                rvaluesCount = this.set(c1.center, c1.angle[1], c1.angle[2], c1.axis1, c1.axis2, c1.center, c1.angle[1], c1.angle[2], c1.axis1, c1.axis2, nsegment, isAdaptive, true, rvalues, rvaluesCount);
+            }
+        }
+        rvaluesCount += 1;
         if (rvalues.length !== rvaluesCount) {
             rvalues.length = rvaluesCount;
         }
@@ -18567,425 +18942,98 @@ var UtilCurve = /** @class */ (function () {
                 n3y = -e3x;
             }
             else {
-                n3x = -e3y;
-                n3y = +e3x;
-            }
-            var we = -(b * b) / l2;
-            var wn = -(b * a) / l2;
-            var a1x = we * e3x + wn * n3x;
-            var a1y = we * e3y + wn * n3y;
-            var cx = x1 - a1x;
-            var cy = y1 - a1y;
-            var a2x = x2 - cx;
-            var a2y = y2 - cy;
-            return pset(cx, cy, a1x, a1y, a2x, a2y, -beta, 0, PIH, result);
-        }
-        else {
-            var e0x = d10x / l0;
-            var e0y = d10y / l0;
-            var n3x = void 0, n3y = void 0;
-            if (vcross(d10x, d10y, d12x, d12y) < 0) {
-                n3x = +e0y;
-                n3y = -e0x;
-            }
-            else {
-                n3x = -e0y;
-                n3y = +e0x;
-            }
-            var we = -(b * b) / l0;
-            var wn = -(b * a) / l0;
-            var a1x = we * e0x + wn * n3x;
-            var a1y = we * e0y + wn * n3y;
-            var cx = x1 - a1x;
-            var cy = y1 - a1y;
-            var a2x = x0 - cx;
-            var a2y = y0 - cy;
-            return pset(cx, cy, a1x, a1y, -a2x, -a2y, -PIH, 0, beta, result);
-        }
-    };
-    UtilCurve.toHybrid = function (index, length, values, result) {
-        var circle = UtilCurve.toCircle(index, length, values, result);
-        var a0 = circle.angle[0];
-        var a2 = circle.angle[2];
-        var amin = Math.min(a0, a2);
-        var amax = Math.max(a0, a2);
-        if (amin < -PIH || PIH < amax) {
-            return UtilCurve.toEllipse(index, length, values, result);
-        }
-        return circle;
-    };
-    return UtilCurve;
-}());
-
-/*
- * Copyright (C) 2019 Toshiba Corporation
- * SPDX-License-Identifier: Apache-2.0
- */
-var eShapePointsFormatterCurve = function (length, values, segments, style, result) {
-    UtilCurve.interpolate(length, values, segments, UtilCurve.toHybrid, !!(style & EShapePointsStyle.CLOSED), EShapeDefaults.CURVE_SEGMENT_COUNT, true, result);
-    result.length = result.values.length >> 1;
-    result.style = style;
-    return result;
-};
-
-/*
- * Copyright (C) 2019 Toshiba Corporation
- * SPDX-License-Identifier: Apache-2.0
- */
-var toPointsBoundary = function (values, result) {
-    var valuesLength = values.length;
-    if (2 <= valuesLength) {
-        var xmin = values[0];
-        var ymin = values[1];
-        var xmax = xmin;
-        var ymax = ymin;
-        for (var i = 2, imax = values.length; i < imax; i += 2) {
-            var x = values[i];
-            var y = values[i + 1];
-            xmin = Math.min(xmin, x);
-            ymin = Math.min(ymin, y);
-            xmax = Math.max(xmax, x);
-            ymax = Math.max(ymax, y);
-        }
-        result[0] = xmin;
-        result[1] = ymin;
-        result[2] = xmax;
-        result[3] = ymax;
-    }
-    else {
-        result[0] = 0;
-        result[1] = 0;
-        result[2] = 0;
-        result[3] = 0;
-    }
-    return result;
-};
-
-/*
- * Copyright (C) 2019 Toshiba Corporation
- * SPDX-License-Identifier: Apache-2.0
- */
-var EShapePointsMarkerBase = /** @class */ (function () {
-    function EShapePointsMarkerBase(parent) {
-        var _this = this;
-        this._parent = parent;
-        this._lockCount = 0;
-        this._isTypeChanged = false;
-        this._isSizeChanged = false;
-        this._isFillChanged = false;
-        this._type = EShapePointsMarkerType.NONE;
-        this._size = new pixi_js.ObservablePoint(function () {
-            _this.onSizeChange();
-        }, undefined, EShapeDefaults.SIZE_X * 0.15, EShapeDefaults.SIZE_Y * 0.15);
-        this._fill = this.newFill();
-        this._transformId = 0;
-    }
-    EShapePointsMarkerBase.prototype.newFill = function () {
-        return new EShapeFillImpl(this, true, EShapeDefaults.FILL_COLOR, 1);
-    };
-    EShapePointsMarkerBase.prototype.lock = function () {
-        this._lockCount += 1;
-        if (this._lockCount === 1) {
-            this._isTypeChanged = false;
-            this._isSizeChanged = false;
-            this._isFillChanged = false;
-        }
-        return this;
-    };
-    EShapePointsMarkerBase.prototype.unlock = function () {
-        this._lockCount -= 1;
-        if (this._lockCount === 0) {
-            if (this._isTypeChanged) {
-                this.onTypeChange();
-            }
-            else if (this._isSizeChanged) {
-                this.onSizeChange();
-            }
-            else if (this._isFillChanged) {
-                this.onFillChange();
-            }
-            this._isTypeChanged = false;
-            this._isSizeChanged = false;
-            this._isFillChanged = false;
-        }
-        return this;
-    };
-    Object.defineProperty(EShapePointsMarkerBase.prototype, "type", {
-        get: function () {
-            return this._type;
-        },
-        set: function (type) {
-            if (this._type !== type) {
-                this._type = type;
-                this.onTypeChange();
-            }
-        },
-        enumerable: false,
-        configurable: true
-    });
-    EShapePointsMarkerBase.prototype.onTypeChange = function () {
-        if (0 < this._lockCount) {
-            this._isTypeChanged = true;
-            return;
-        }
-        this._parent.onTypeChange();
-    };
-    Object.defineProperty(EShapePointsMarkerBase.prototype, "size", {
-        get: function () {
-            return this._size;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    EShapePointsMarkerBase.prototype.onSizeChange = function () {
-        if (0 < this._lockCount) {
-            this._isSizeChanged = true;
-            return;
-        }
-        this._parent.onSizeChange();
-    };
-    Object.defineProperty(EShapePointsMarkerBase.prototype, "transform", {
-        get: function () {
-            return this.updateTransform();
-        },
-        enumerable: false,
-        configurable: true
-    });
-    EShapePointsMarkerBase.prototype.updateTransform = function () {
-        var result = this._transform;
-        if (result == null) {
-            result = new pixi_js.Matrix();
-            this._transform = result;
-        }
-        var parentParent = this._parent.parent;
-        var id = parentParent.id;
-        if (this._transformId !== id) {
-            this._transformId = id;
-            var formatted = parentParent.formatted;
-            if (2 <= formatted.length) {
-                this.toTransform(formatted.values, result);
-            }
-            else {
-                result.identity();
+                n3x = -e3y;
+                n3y = +e3x;
             }
-        }
-        return result;
-    };
-    EShapePointsMarkerBase.prototype.toTransformMatrix = function (x0, y0, x1, y1, result) {
-        var dx = x0 - x1;
-        var dy = y0 - y1;
-        var n = dx * dx + dy * dy;
-        if (0.00001 < n) {
-            var f = 1 / Math.sqrt(n);
-            var nx = dx * f;
-            var ny = dy * f;
-            result.set(ny, -nx, -nx, -ny, x0, y0);
+            var we = -(b * b) / l2;
+            var wn = -(b * a) / l2;
+            var a1x = we * e3x + wn * n3x;
+            var a1y = we * e3y + wn * n3y;
+            var cx = x1 - a1x;
+            var cy = y1 - a1y;
+            var a2x = x2 - cx;
+            var a2y = y2 - cy;
+            return pset(cx, cy, a1x, a1y, a2x, a2y, -beta, 0, PIH, result);
         }
         else {
-            result.set(1, 0, 0, 1, x0, y0);
-        }
-        return result;
-    };
-    Object.defineProperty(EShapePointsMarkerBase.prototype, "fill", {
-        get: function () {
-            return this._fill;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    EShapePointsMarkerBase.prototype.onFillChange = function () {
-        if (0 < this._lockCount) {
-            this._isFillChanged = true;
-            return;
-        }
-        this._parent.onFillChange();
-    };
-    EShapePointsMarkerBase.prototype.updateUploaded = function () {
-        this.onFillChange();
-    };
-    EShapePointsMarkerBase.prototype.copy = function (source) {
-        var size = source.size;
-        this.set(source.type, size.x, size.y);
-        return this;
-    };
-    EShapePointsMarkerBase.prototype.set = function (type, sizeX, sizeY) {
-        this.lock();
-        if (type != null) {
-            this.type = type;
-        }
-        this.size.set(sizeX, sizeY);
-        this.unlock();
-        return this;
-    };
-    EShapePointsMarkerBase.prototype.serialize = function (manager) {
-        var size = this._size;
-        var fillId = this._fill.serialize(manager);
-        return manager.addResource("[".concat(this._type, ",").concat(size.x, ",").concat(size.y, ",").concat(fillId, "]"));
-    };
-    EShapePointsMarkerBase.prototype.deserialize = function (resourceId, manager) {
-        var resources = manager.resources;
-        if (0 <= resourceId && resourceId < resources.length) {
-            var parsed = manager.getExtension(resourceId);
-            if (parsed == null) {
-                parsed = JSON.parse(resources[resourceId]);
-                manager.setExtension(resourceId, parsed);
+            var e0x = d10x / l0;
+            var e0y = d10y / l0;
+            var n3x = void 0, n3y = void 0;
+            if (vcross(d10x, d10y, d12x, d12y) < 0) {
+                n3x = +e0y;
+                n3y = -e0x;
             }
-            this.lock();
-            this.type = parsed[0];
-            this._size.set(parsed[1], parsed[2]);
-            this._fill.deserialize(parsed[3], manager);
-            this.unlock();
+            else {
+                n3x = -e0y;
+                n3y = +e0x;
+            }
+            var we = -(b * b) / l0;
+            var wn = -(b * a) / l0;
+            var a1x = we * e0x + wn * n3x;
+            var a1y = we * e0y + wn * n3y;
+            var cx = x1 - a1x;
+            var cy = y1 - a1y;
+            var a2x = x0 - cx;
+            var a2y = y0 - cy;
+            return pset(cx, cy, a1x, a1y, -a2x, -a2y, -PIH, 0, beta, result);
         }
     };
-    return EShapePointsMarkerBase;
-}());
-
-var EShapePointsMarkerHead = /** @class */ (function (_super) {
-    __extends(EShapePointsMarkerHead, _super);
-    function EShapePointsMarkerHead() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    EShapePointsMarkerHead.prototype.toTransform = function (values, result) {
-        var valuesLength = values.length;
-        if (4 <= valuesLength) {
-            return this.toTransformMatrix(values[valuesLength - 2], values[valuesLength - 1], values[valuesLength - 4], values[valuesLength - 3], result);
-        }
-        else {
-            result.identity();
+    UtilCurve.toHybrid = function (index, length, values, result) {
+        var circle = UtilCurve.toCircle(index, length, values, result);
+        var a0 = circle.angle[0];
+        var a2 = circle.angle[2];
+        var amin = Math.min(a0, a2);
+        var amax = Math.max(a0, a2);
+        if (amin < -PIH || PIH < amax) {
+            return UtilCurve.toEllipse(index, length, values, result);
         }
-        return result;
+        return circle;
     };
-    return EShapePointsMarkerHead;
-}(EShapePointsMarkerBase));
+    return UtilCurve;
+}());
 
-var EShapePointsMarkerTail = /** @class */ (function (_super) {
-    __extends(EShapePointsMarkerTail, _super);
-    function EShapePointsMarkerTail() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    EShapePointsMarkerTail.prototype.toTransform = function (values, result) {
-        var valuesLength = values.length;
-        if (4 <= valuesLength) {
-            return this.toTransformMatrix(values[0], values[1], values[2], values[3], result);
-        }
-        else {
-            result.identity();
-        }
-        return result;
-    };
-    return EShapePointsMarkerTail;
-}(EShapePointsMarkerBase));
+/*
+ * Copyright (C) 2019 Toshiba Corporation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+var eShapePointsFormatterCurve = function (length, values, segments, style, result) {
+    UtilCurve.interpolate(length, values, segments, UtilCurve.toHybrid, !!(style & EShapePointsStyle.CLOSED), EShapeDefaults.CURVE_SEGMENT_COUNT, true, result);
+    result.length = result.values.length >> 1;
+    result.style = style;
+    return result;
+};
 
 /*
  * Copyright (C) 2019 Toshiba Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-var EShapePointsMarkerContainerImpl = /** @class */ (function () {
-    function EShapePointsMarkerContainerImpl(parent) {
-        this._parent = parent;
-        this._lockCount = 0;
-        this._isTypeChanged = false;
-        this._isSizeChanged = false;
-        this._isFillChanged = false;
-        this._head = new EShapePointsMarkerHead(this);
-        this._tail = new EShapePointsMarkerTail(this);
+var EShapePointsFormatters = /** @class */ (function () {
+    function EShapePointsFormatters() {
     }
-    EShapePointsMarkerContainerImpl.prototype.lock = function () {
-        this._lockCount += 1;
-        if (this._lockCount === 1) {
-            this._isTypeChanged = false;
-            this._isSizeChanged = false;
-            this._isFillChanged = false;
-        }
-        return this;
-    };
-    EShapePointsMarkerContainerImpl.prototype.unlock = function () {
-        this._lockCount -= 1;
-        if (this._lockCount === 0) {
-            if (this._isTypeChanged) {
-                this.onTypeChange();
-            }
-            else if (this._isSizeChanged) {
-                this.onSizeChange();
-            }
-            else if (this._isFillChanged) {
-                this.onFillChange();
-            }
-            this._isTypeChanged = false;
-            this._isSizeChanged = false;
-            this._isFillChanged = false;
-        }
-        return this;
-    };
-    Object.defineProperty(EShapePointsMarkerContainerImpl.prototype, "parent", {
-        get: function () {
-            return this._parent;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(EShapePointsMarkerContainerImpl.prototype, "head", {
-        get: function () {
-            return this._head;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(EShapePointsMarkerContainerImpl.prototype, "tail", {
-        get: function () {
-            return this._tail;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    EShapePointsMarkerContainerImpl.prototype.onTypeChange = function () {
-        if (0 < this._lockCount) {
-            this._isTypeChanged = true;
-            return;
-        }
-        this._parent.onMarkerTypeChange();
-    };
-    EShapePointsMarkerContainerImpl.prototype.onSizeChange = function () {
-        if (0 < this._lockCount) {
-            this._isSizeChanged = true;
-            return;
+    EShapePointsFormatters.set = function (id, datum) {
+        if (this.data == null) {
+            this.data = this.newData();
         }
-        this._parent.onMarkerSizeChange();
+        this.data.set(id, datum);
     };
-    EShapePointsMarkerContainerImpl.prototype.onFillChange = function () {
-        if (0 < this._lockCount) {
-            this._isFillChanged = true;
-            return;
+    EShapePointsFormatters.get = function (index) {
+        if (this.data == null) {
+            this.data = this.newData();
         }
-        this._parent.onMarkerFillChange();
-    };
-    EShapePointsMarkerContainerImpl.prototype.copy = function (source) {
-        this.lock();
-        this._head.copy(source.head);
-        this._tail.copy(source.tail);
-        this.unlock();
-        return this;
+        return this.data.get(index);
     };
-    EShapePointsMarkerContainerImpl.prototype.serialize = function (manager) {
-        var headId = this._head.serialize(manager);
-        var tailId = this._tail.serialize(manager);
-        return manager.addResource("[".concat(headId, ",").concat(tailId, "]"));
+    EShapePointsFormatters.find = function (style) {
+        return this.get((style & EShapePointsStyle.FORMATTER_MASK) >> EShapePointsStyle.FORMATTER_SHIFT);
     };
-    EShapePointsMarkerContainerImpl.prototype.deserialize = function (resourceId, manager) {
-        var resources = manager.resources;
-        if (0 <= resourceId && resourceId < resources.length) {
-            var parsed = manager.getExtension(resourceId);
-            if (parsed == null) {
-                parsed = JSON.parse(resources[resourceId]);
-                manager.setExtension(resourceId, parsed);
-            }
-            this.lock();
-            this._head.deserialize(parsed[0], manager);
-            this._tail.deserialize(parsed[1], manager);
-            this.unlock();
-        }
+    EShapePointsFormatters.newData = function () {
+        var result = new Map();
+        result.set(EShapePointsStyle.FORMATTER_CURVE, {
+            label: "Curve",
+            formatter: eShapePointsFormatterCurve
+        });
+        return result;
     };
-    return EShapePointsMarkerContainerImpl;
+    return EShapePointsFormatters;
 }());
 
 /*
@@ -19194,18 +19242,14 @@ var EShapeLinePoints = /** @class */ (function () {
     });
     Object.defineProperty(EShapeLinePoints.prototype, "formatted", {
         get: function () {
+            var _a, _b;
             this.fit();
             var id = this._id;
             var result = this._formatted;
             if (this._formattedId !== id) {
                 this._formattedId = id;
                 var style = this._style;
-                var formatter = this._formatter;
-                if (formatter == null) {
-                    if (style & EShapePointsStyle.CURVE) {
-                        formatter = eShapePointsFormatterCurve;
-                    }
-                }
+                var formatter = (_a = this._formatter) !== null && _a !== void 0 ? _a : (_b = EShapePointsFormatters.find(style)) === null || _b === void 0 ? void 0 : _b.formatter;
                 if (formatter != null) {
                     if (result == null) {
                         result = {