igniteui-webcomponents-charts 6.3.1 → 7.0.0

package/esm5/lib/ShapeSeriesBase_combined.js

@@ -63,69 +63,69 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(ShapeSeriesBase, _super);
     function ShapeSeriesBase() {
         var _this = _super.call(this) || this;
-        _this.ye = null;
+        _this.yf = null;
+        _this.yk = false;
         _this.yj = false;
-        _this.yi = false;
-        _this.yc = null;
         _this.yd = null;
-        _this.x2 = 1;
-        _this.xn = null;
+        _this.ye = null;
+        _this.x3 = 1;
         _this.xo = null;
+        _this.xp = null;
         _this.assigningShapeStyle = null;
         _this.assigningShapeMarkerStyle = null;
-        _this.x6 = null;
-        _this.yf = null;
-        _this.xy = null;
-        _this.x0 = null;
-        _this.y5 = 0;
-        _this.y1 = null;
-        _this.xk = null;
-        _this.xm = null;
+        _this.x7 = null;
+        _this.yg = null;
+        _this.xz = null;
+        _this.x1 = null;
+        _this.y6 = 0;
+        _this.y2 = null;
         _this.xl = null;
-        _this.xj = null;
-        _this.aap = null;
-        _this.xw = null;
-        _this.x8 = null;
-        _this.xr = null;
-        _this.y8 = 0;
+        _this.xn = null;
+        _this.xm = null;
+        _this.xk = null;
+        _this.aaq = null;
+        _this.xx = null;
+        _this.x9 = null;
+        _this.xs = null;
+        _this.y9 = 0;
         _this.styleShape = null;
-        _this.x6 = new ShapeSeriesRenderManager();
+        _this.x7 = new ShapeSeriesRenderManager();
         FastItemObjectColumn.m();
-        _this.y8 = _this.y7;
-        _this.aap = Rect.empty;
+        _this.y9 = _this.y8;
+        _this.aaq = Rect.empty;
         return _this;
     }
-    ShapeSeriesBase.prototype.pf = function () {
-        _super.prototype.pf.call(this);
-        this.xz = null;
-        this.x1 = null;
+    ShapeSeriesBase.prototype.pg = function () {
+        _super.prototype.pg.call(this);
+        this.x0 = null;
+        this.x2 = null;
     };
     ShapeSeriesBase.prototype.ai = function () {
-        return [this.xz, this.x1];
+        return [this.x0, this.x2];
     };
-    ShapeSeriesBase.prototype.kz = function (a, b) {
-        var c = this.no(b);
+    ShapeSeriesBase.prototype.k0 = function (a, b) {
+        var c = this.np(b);
         if (c == ShapeSeriesBase.$$p[9]) {
-            return this.k0(a, b, this.zs);
+            return this.k1(a, b, this.zt);
         }
         return null;
     };
-    ShapeSeriesBase.prototype.mo = function (a) {
-        var b = this.no(a);
+    ShapeSeriesBase.prototype.mp = function (a) {
+        var b = this.np(a);
         if (b == ShapeSeriesBase.$$p[9]) {
-            return this.zs;
+            return this.zt;
         }
-        return _super.prototype.mo.call(this, a);
+        return _super.prototype.mp.call(this, a);
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "yg", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "yh", {
         get: function () {
-            return this.ye;
+            return this.yf;
         },
         set: function (a) {
-            if (this.ye != a) {
-                var b = this.yg;
-                this.ye = a;
-                this.raisePropertyChanged("FillColumn", b, this.yg);
+            if (this.yf != a) {
+                var b = this.yh;
+                this.yf = a;
+                this.raisePropertyChanged("FillColumn", b, this.yh);
             }
         },
         enumerable: false,
@@ -137,12 +137,12 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
     ShapeSeriesBase.prototype.get_ef = function () {
         return true;
     };
-    ShapeSeriesBase.prototype.ya = function (a, b, c) {
+    ShapeSeriesBase.prototype.yb = function (a, b, c) {
         if (this.dp == null) {
             return null;
         }
-        var d = this.wr(b);
-        var e = this.x7.df(d, false);
+        var d = this.ws(b);
+        var e = this.x8.df(d, false);
         var f = -1;
         if (e == null) {
             if (a != null) {
@@ -168,11 +168,11 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return g;
     };
-    ShapeSeriesBase.prototype.yb = function (a, b, c) {
+    ShapeSeriesBase.prototype.yc = function (a, b, c) {
         if (this.dp == null) {
             return null;
         }
-        var d = this.x7.ch(this.wr(b));
+        var d = this.x8.ch(this.ws(b));
         var e = -1;
         if (d == null) {
             if (a != null) {
@@ -199,52 +199,52 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return f;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "x3", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "x4", {
         get: function () {
-            return this.x2;
+            return this.x3;
         },
         set: function (a) {
-            var b = this.x2;
-            this.x2 = a;
-            if (b != this.x2) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ShapeItemSearchMode_$type, b), enumGetBox(ShapeItemSearchMode_$type, this.x2));
+            var b = this.x3;
+            this.x3 = a;
+            if (b != this.x3) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ShapeItemSearchMode_$type, b), enumGetBox(ShapeItemSearchMode_$type, this.x3));
             }
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.x4 = function () {
-        if (this.x5 != 0) {
-            return this.x5;
+    ShapeSeriesBase.prototype.x5 = function () {
+        if (this.x6 != 0) {
+            return this.x6;
         }
         return 1;
     };
-    ShapeSeriesBase.prototype.iy = function (a) {
-        switch (this.x3) {
-            case 1: return this.zy(a).c;
-            case 2: return this.y6(a);
-            case 3: return this.y6(a);
+    ShapeSeriesBase.prototype.iz = function (a) {
+        switch (this.x4) {
+            case 1: return this.zz(a).c;
+            case 2: return this.y7(a);
+            case 3: return this.y7(a);
         }
         return -1;
     };
-    ShapeSeriesBase.prototype.zy = function (a) {
-        var b = this.wr(a);
+    ShapeSeriesBase.prototype.zz = function (a) {
+        var b = this.ws(a);
         var c = { $type: Point_$type, x: NaN, y: NaN };
-        var d = this.x7.cr;
+        var d = this.x8.cr;
         if (d == null) {
             return new Tuple$2(Number_$type, Point_$type, -1, c);
         }
-        var e = this.x7.ci(b, false, !this.yl);
+        var e = this.x8.ci(b, false, !this.ym);
         if (e != null) {
             c = RectUtil.l(e.d);
             return new Tuple$2(Number_$type, Point_$type, e.b, c);
         }
         var f = b.x;
         var g = b.y;
-        if (this.dp == null || this.xz == null || this.x1 == null || this.y1 == null) {
+        if (this.dp == null || this.x0 == null || this.x2 == null || this.y2 == null) {
             return new Tuple$2(Number_$type, Point_$type, -1, c);
         }
-        if (this.dp.count > this.zb) {
+        if (this.dp.count > this.zc) {
             return new Tuple$2(Number_$type, Point_$type, -1, c);
         }
         var h = 1.7976931348623157E+308;
@@ -260,26 +260,26 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return new Tuple$2(Number_$type, Point_$type, i, c);
     };
-    ShapeSeriesBase.prototype.zx = function (a) {
-        var b = this.wr(a);
+    ShapeSeriesBase.prototype.zy = function (a) {
+        var b = this.ws(a);
         var c = b.x;
         var d = b.y;
         var e = { $type: Point_$type, x: NaN, y: NaN };
-        if (this.dp == null || this.xz == null || this.x1 == null || this.y1 == null) {
+        if (this.dp == null || this.x0 == null || this.x2 == null || this.y2 == null) {
             return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
         }
-        if (this.dp.count > this.zb) {
+        if (this.dp.count > this.zc) {
             return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
         }
         var f = 1.7976931348623157E+308;
-        var g = this.x7.cr;
+        var g = this.x8.cr;
         if (g == null) {
             return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
         }
-        var h = this.x7.ci(b, false, !this.yl);
+        var h = this.x8.ci(b, false, !this.ym);
         if (h != null) {
             var i = RectUtil.l(h.d);
-            var j = this.zw(b, h.a, this.yl);
+            var j = this.zx(b, h.a, this.ym);
             return new Tuple$3(Number_$type, Point_$type, Point_$type, h.b, j.d, i);
         }
         for (var k = 0; k < g.count; k++) {
@@ -296,7 +296,7 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             var r = g._inner[q].d;
             var s = RectUtil.g(r, b);
             if (s < f) {
-                var t = this.zw(b, g._inner[q].a, this.yl);
+                var t = this.zx(b, g._inner[q].a, this.ym);
                 if (t.c < o) {
                     o = t.c;
                     e = t.d;
@@ -309,17 +309,17 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
     };
-    ShapeSeriesBase.prototype.get_yl = function () {
+    ShapeSeriesBase.prototype.get_ym = function () {
         return true;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "yl", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "ym", {
         get: function () {
-            return this.get_yl();
+            return this.get_ym();
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.zw = function (a, b, c) {
+    ShapeSeriesBase.prototype.zx = function (a, b, c) {
         var d = { $type: Point_$type, x: NaN, y: NaN };
         var e = 1.7976931348623157E+308;
         var f = { $type: Point_$type, x: NaN, y: NaN };
@@ -355,34 +355,34 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return new Tuple$2(Number_$type, Point_$type, e, f);
     };
-    ShapeSeriesBase.prototype.y6 = function (a) {
-        return this.zx(a).c;
+    ShapeSeriesBase.prototype.y7 = function (a) {
+        return this.zy(a).c;
     };
-    ShapeSeriesBase.prototype.ww = function (a, b, c) {
-        if (this.xz == null || this.x1 == null || this.y1 == null) {
+    ShapeSeriesBase.prototype.wx = function (a, b, c) {
+        if (this.x0 == null || this.x2 == null || this.y2 == null) {
             return { $type: Point_$type, x: NaN, y: NaN };
         }
-        switch (this.x3) {
+        switch (this.x4) {
             case 1:
-                var d = this.zy(a);
+                var d = this.zz(a);
                 return d.d;
             case 2:
-                var e = this.zx(a);
+                var e = this.zy(a);
                 return e.e;
             case 3:
-                var f = this.zx(a);
+                var f = this.zy(a);
                 return f.d;
         }
         return { $type: Point_$type, x: NaN, y: NaN };
     };
-    ShapeSeriesBase.prototype.kw = function (a) {
-        var b = this.kc(a);
+    ShapeSeriesBase.prototype.kx = function (a) {
+        var b = this.kd(a);
         if (this.dp != null && b >= 0 && b < this.dp.count) {
             return this.dp.item(b);
         }
         return null;
     };
-    ShapeSeriesBase.prototype.x9 = function (a, b, c) {
+    ShapeSeriesBase.prototype.ya = function (a, b, c) {
         var d = new HighlightingInfo();
         d.i = this;
         d.g = 0;
@@ -394,51 +394,51 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         return d;
     };
     ShapeSeriesBase.prototype.dh = function (a, b, c) {
-        if (this.ef && this.f2(this.by) && !c) {
-            var d = this.ya(a, b, this.yc);
-            this.yc = d;
+        if (this.ef && this.f3(this.by) && !c) {
+            var d = this.yb(a, b, this.yd);
+            this.yd = d;
             return d;
         }
         else {
-            var e = this.x9(a, b, this.yc);
-            this.yc = e;
+            var e = this.ya(a, b, this.yd);
+            this.yd = e;
             return e;
         }
     };
     ShapeSeriesBase.prototype.di = function (a, b, c) {
-        if (this.f2(this.by) && !c) {
-            var d = this.yb(a, b, this.yd);
-            this.yd = d;
+        if (this.f3(this.by) && !c) {
+            var d = this.yc(a, b, this.ye);
+            this.ye = d;
             return d;
         }
         else {
-            var e = this.x9(a, b, this.yd);
+            var e = this.ya(a, b, this.ye);
             e.d = true;
-            this.yd = e;
+            this.ye = e;
             return e;
         }
     };
-    ShapeSeriesBase.prototype.yz = function () {
-        return (this.assigningShapeStyle != null && this.yj) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1) || (this.yg != null && this.xv != null);
+    ShapeSeriesBase.prototype.y0 = function () {
+        return (this.assigningShapeStyle != null && this.yk) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1) || (this.yh != null && this.xw != null);
     };
-    ShapeSeriesBase.prototype.yy = function () {
-        return (this.assigningShapeMarkerStyle != null && this.yi) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
+    ShapeSeriesBase.prototype.yz = function () {
+        return (this.assigningShapeMarkerStyle != null && this.yj) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "zj", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "zk", {
         get: function () {
-            return this.c(ShapeSeriesBase.aaf);
+            return this.c(ShapeSeriesBase.aag);
         },
         set: function (a) {
-            this.h(ShapeSeriesBase.aaf, a);
+            this.h(ShapeSeriesBase.aag, a);
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.gh = function () {
-        return this.highlightedItemsSource != null || this.zj != null;
+    ShapeSeriesBase.prototype.gi = function () {
+        return this.highlightedItemsSource != null || this.zk != null;
     };
-    ShapeSeriesBase.prototype.hz = function () {
-        var a = _super.prototype.hz.call(this);
+    ShapeSeriesBase.prototype.h0 = function () {
+        var a = _super.prototype.h0.call(this);
         {
             var b = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
@@ -448,7 +448,7 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.z1));
+            b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.z2));
             a.add(b);
         }
         {
@@ -461,7 +461,7 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.si));
+            c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.sj));
             a.add(c);
         }
         {
@@ -474,38 +474,38 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            d.valueResolving = delegateCombine(d.valueResolving, runOn(this, this.si));
+            d.valueResolving = delegateCombine(d.valueResolving, runOn(this, this.sj));
             a.add(d);
         }
         return a;
     };
-    ShapeSeriesBase.prototype.z1 = function (a, b) {
-        if (this.zj != null) {
-            b.value = this.zj;
+    ShapeSeriesBase.prototype.z2 = function (a, b) {
+        if (this.zk != null) {
+            b.value = this.zk;
             return;
         }
-        b.value = this.zs;
+        b.value = this.zt;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "yh", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "yi", {
         get: function () {
-            return this.yf;
+            return this.yg;
         },
         set: function (a) {
-            var b = this.yh != a;
+            var b = this.yi != a;
             if (b) {
-                var c = this.yh;
-                this.yf = a;
-                this.raisePropertyChanged("ShapeColumn", c, this.yh);
+                var c = this.yi;
+                this.yg = a;
+                this.raisePropertyChanged("ShapeColumn", c, this.yi);
             }
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.yq = function (array_) {
+    ShapeSeriesBase.prototype.yr = function (array_) {
         var a = (Array.isArray(array_));
         return a;
     };
-    ShapeSeriesBase.yu = function (a) {
+    ShapeSeriesBase.yv = function (a) {
         if (a == null) {
             return true;
         }
@@ -540,10 +540,10 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     e = (curr_.y);
                 }
                 if (!g) {
-                    if ((isNaN_(d) || ShapeSeriesBase.yu(d)) && (isNaN_(e) || ShapeSeriesBase.yu(e))) {
+                    if ((isNaN_(d) || ShapeSeriesBase.yv(d)) && (isNaN_(e) || ShapeSeriesBase.yv(e))) {
                         d = (curr_.X);
                         e = (curr_.Y);
-                        if (!isNaN_(d) && !ShapeSeriesBase.yu(d) && !isNaN_(e) && !ShapeSeriesBase.yu(e)) {
+                        if (!isNaN_(d) && !ShapeSeriesBase.yv(d) && !isNaN_(e) && !ShapeSeriesBase.yv(e)) {
                             g = true;
                             f = true;
                         }
@@ -559,7 +559,7 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         return b;
     };
     ShapeSeriesBase.prototype.dn = function (a) {
-        if (this.dp != null && this.yq(this.itemsSource) && a != null && a.split('!').length != 2) {
+        if (this.dp != null && this.yr(this.itemsSource) && a != null && a.split('!').length != 2) {
             if (this.coercionMethods == null) {
                 this.coercionMethods = {};
             }
@@ -569,153 +569,153 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return _super.prototype.dn.call(this, a);
     };
-    ShapeSeriesBase.prototype.rq = function (a, b, c, d) {
-        _super.prototype.rq.call(this, a, b, c, d);
+    ShapeSeriesBase.prototype.rr = function (a, b, c, d) {
+        _super.prototype.rr.call(this, a, b, c, d);
         var e = false;
         var f = false;
         switch (b) {
             case ShapeSeriesBase.$$p[5]:
-                this.x3 = this.x4();
+                this.x4 = this.x5();
                 break;
             case "FastItemsSource":
                 var g = typeCast(IFastItemsSource_$type, c);
                 if (g != null) {
-                    if (this.yg != null) {
-                        g.deregisterColumn(this.yg);
-                    }
                     if (this.yh != null) {
                         g.deregisterColumn(this.yh);
                     }
-                    this.yh = null;
+                    if (this.yi != null) {
+                        g.deregisterColumn(this.yi);
+                    }
+                    this.yi = null;
                 }
                 var h = typeCast(IFastItemsSource_$type, d);
                 if (h != null) {
-                    if (this.zs != null) {
-                        this.yh = this.dn(this.zs);
+                    if (this.zt != null) {
+                        this.yi = this.dn(this.zt);
                     }
-                    if (this.zf != null) {
-                        this.yg = this.dl(this.zf);
+                    if (this.zg != null) {
+                        this.yh = this.dl(this.zg);
                     }
                 }
-                e = this.xz != null && !this.xz.ed();
-                f = this.x1 != null && !this.x1.ed();
+                e = this.x0 != null && !this.x0.ee();
+                f = this.x2 != null && !this.x2.ee();
                 if (e || f) {
-                    this.r8(this.gm && c != null);
+                    this.r9(this.gn && c != null);
                 }
                 break;
             case ShapeSeriesBase.$$p[9]:
                 if (this.dp != null) {
-                    this.dp.deregisterColumn(this.yh);
-                    this.yh = this.dn(this.zs);
+                    this.dp.deregisterColumn(this.yi);
+                    this.yi = this.dn(this.zt);
                 }
                 break;
             case "ShapeColumn":
-                this.z9();
-                e = this.xz != null && !this.xz.ed();
-                f = this.x1 != null && !this.x1.ed();
+                this.aaa();
+                e = this.x0 != null && !this.x0.ee();
+                f = this.x2 != null && !this.x2.ee();
                 if (e || f) {
-                    this.r8(this.gm && this.d9);
+                    this.r9(this.gn && this.d9);
                 }
-                this.q0();
+                this.q1();
                 break;
             case ShapeSeriesBase.$$p[10]:
             case ShapeSeriesBase.$$p[11]:
-                this.xy = this.xz;
-                this.x0 = this.x1;
+                this.xz = this.x0;
+                this.x1 = this.x2;
                 var i = c;
                 var j = d;
-                this.aaa(i);
-                this.z2(j);
-                if ((j != null && !j.ed()) || (j == null && i != null)) {
-                    this.r8(false);
+                this.aab(i);
+                this.z3(j);
+                if ((j != null && !j.ee()) || (j == null && i != null)) {
+                    this.r9(false);
                 }
-                this.q0();
+                this.q1();
                 break;
             case "ActualResolution":
-                this.y5 = this.ik;
-                this.q0();
+                this.y6 = this.il;
+                this.q1();
                 break;
             case "ActualBrush":
-                this.r8(false);
+                this.r9(false);
                 break;
             case ShapeSeriesBase.$$p[8]:
-                this.y8 = this.y7;
-                this.r8(false);
-                this.q0();
+                this.y9 = this.y8;
+                this.r9(false);
+                this.q1();
                 break;
             case ShapeSeriesBase.$$p[2]:
             case "ActualThickness":
-                this.r8(false);
-                this.q0();
+                this.r9(false);
+                this.q1();
                 break;
             case ShapeSeriesBase.$$p[4]:
-                this.yj = this.yx();
-                this.r8(false);
+                this.yk = this.yy();
+                this.r9(false);
                 break;
             case ShapeSeriesBase.$$p[3]:
-                this.yi = this.yw();
-                this.r8(false);
+                this.yj = this.yx();
+                this.r9(false);
                 break;
             case ShapeSeriesBase.$$p[1]:
                 if (c != null) {
                     c.o.remove(this);
                     c.x();
-                    this.xw = null;
-                    this.x8 = null;
+                    this.xx = null;
+                    this.x9 = null;
                 }
                 if (d != null) {
                     d.o.add(this);
                     d.x();
-                    this.xw = typeCast(CustomPaletteBrushScale.$, d);
-                    this.x8 = typeCast(ValueBrushScale.$, d);
+                    this.xx = typeCast(CustomPaletteBrushScale.$, d);
+                    this.x9 = typeCast(ValueBrushScale.$, d);
                 }
-                this.r8(false);
-                this.q0();
+                this.r9(false);
+                this.q1();
                 break;
             case "FillColumn":
-                this.r8(this.gm && this.d9);
-                this.q0();
+                this.r9(this.gn && this.d9);
+                this.q1();
                 break;
             case ShapeSeriesBase.$$p[0]:
-                if (this.xv != null) {
-                    this.xv.x();
+                if (this.xw != null) {
+                    this.xw.x();
                 }
                 if (this.dp != null) {
-                    this.dp.deregisterColumn(this.yg);
-                    this.yg = this.dl(this.zf);
+                    this.dp.deregisterColumn(this.yh);
+                    this.yh = this.dl(this.zg);
                 }
                 break;
         }
     };
+    ShapeSeriesBase.prototype.yy = function () {
+        return this.yu;
+    };
     ShapeSeriesBase.prototype.yx = function () {
         return this.yt;
     };
-    ShapeSeriesBase.prototype.yw = function () {
-        return this.ys;
-    };
-    ShapeSeriesBase.prototype.yn = function (a) {
+    ShapeSeriesBase.prototype.yo = function (a) {
         if (typeCast(NumericYAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ShapeSeriesBase.prototype.ym = function (a) {
+    ShapeSeriesBase.prototype.yn = function (a) {
         if (typeCast(NumericXAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ShapeSeriesBase.prototype.z9 = function () {
-        this.y1 = null;
-        if (this.yh == null) {
+    ShapeSeriesBase.prototype.aaa = function () {
+        this.y2 = null;
+        if (this.yi == null) {
             return;
         }
-        this.y1 = new List$1(Rect.$, 2, this.yh.count);
-        for (var a = 0; a < this.yh.count; a++) {
-            this.y1.add(PointCollectionUtil.j(this.yh.item(a)));
+        this.y2 = new List$1(Rect.$, 2, this.yi.count);
+        for (var a = 0; a < this.yi.count; a++) {
+            this.y2.add(PointCollectionUtil.j(this.yi.item(a)));
         }
     };
-    ShapeSeriesBase.prototype.aaq = function (a) {
+    ShapeSeriesBase.prototype.aar = function (a) {
         if (typeCast(IEnumerable$1_$type.specialize(IEnumerable$1_$type.specialize(Point_$type)), a) !== null) {
             return PointCollectionUtil.h(a);
         }
@@ -724,11 +724,11 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return Rect.empty;
     };
-    ShapeSeriesBase.prototype.y3 = function (a, b, c, d, e, f, g) {
+    ShapeSeriesBase.prototype.y4 = function (a, b, c, d, e, f, g) {
         var e_1, _a;
-        return this.y4(a, b, c, d, e, f, g);
+        return this.y5(a, b, c, d, e, f, g);
         if (typeCast(List$1.$.specialize(List$1.$.specialize(Point_$type)), c) !== null) {
-            return this.y4(a, b, c, d, e, f, g);
+            return this.y5(a, b, c, d, e, f, g);
         }
         else if (typeCast(IEnumerable$1_$type.specialize(IEnumerable$1_$type.specialize(Point_$type)), c) !== null) {
             var h = c;
@@ -737,7 +737,7 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             try {
                 for (var _b = __values(fromEnum(h)), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var k = _c.value;
-                    j = this.xx(a, b, PointCollectionUtil.b(k), d, e, f, g);
+                    j = this.xy(a, b, PointCollectionUtil.b(k), d, e, f, g);
                     if (j == null) {
                         continue;
                     }
@@ -761,7 +761,7 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         else if (typeCast(IEnumerable$1_$type.specialize(Point_$type), c) !== null) {
             var l = c;
-            var m = this.xx(a, b, PointCollectionUtil.b(l), d, e, f, g);
+            var m = this.xy(a, b, PointCollectionUtil.b(l), d, e, f, g);
             var n = new List$1(FlattenedShape.$, 0);
             if (m != null) {
                 n.add(m);
@@ -772,51 +772,51 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             throw new InvalidOperationException(1, "Unrecognized data in ShapeColumn");
         }
     };
-    ShapeSeriesBase.prototype.get_yr = function () {
+    ShapeSeriesBase.prototype.get_ys = function () {
         return true;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "yr", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "ys", {
         get: function () {
-            return this.get_yr();
+            return this.get_ys();
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.y0 = function () {
+    ShapeSeriesBase.prototype.y1 = function () {
         return false;
     };
-    ShapeSeriesBase.prototype.r9 = function (a) {
-        this.z8(this.cw);
+    ShapeSeriesBase.prototype.sa = function (a) {
+        this.z9(this.cw);
     };
-    ShapeSeriesBase.prototype.r7 = function (a, b, c, d, e) {
-        _super.prototype.r7.call(this, a, b, c, d, e);
+    ShapeSeriesBase.prototype.r8 = function (a, b, c, d, e) {
+        _super.prototype.r8.call(this, a, b, c, d, e);
         var f = this.ba.a$k.item(d);
         var g = f;
         f.bd(c);
         if (this.d7(f)) {
             return;
         }
-        this.z8(f);
+        this.z9(f);
     };
     ShapeSeriesBase.prototype.updateFillScaleGlobals = function () {
         var a = new ActualRange();
         a.b = NaN;
         a.a = NaN;
-        if (this.yg != null) {
-            a.b = this.yg.minimum;
-            a.a = this.yg.maximum;
+        if (this.yh != null) {
+            a.b = this.yh.minimum;
+            a.a = this.yh.maximum;
         }
-        if (this.xv != null) {
-            this.xv.z(a.b, a.a);
+        if (this.xw != null) {
+            this.xw.z(a.b, a.a);
         }
     };
-    ShapeSeriesBase.prototype.z8 = function (a) {
+    ShapeSeriesBase.prototype.z9 = function (a) {
         var _this = this;
         if (this.d7(a)) {
             return;
         }
-        if (this.xv != null) {
-            this.xr = this.xs();
+        if (this.xw != null) {
+            this.xs = this.xt();
         }
         var b;
         var c;
@@ -824,62 +824,62 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         var e = a.getViewInfo(c, b);
         c = e.p0;
         b = e.p1;
-        if (c.width < 1 || c.height < 1 || this.yh == null) {
+        if (c.width < 1 || c.height < 1 || this.yi == null) {
             return;
         }
-        var f = this.xz;
-        var g = this.x1;
+        var f = this.x0;
+        var g = this.x2;
         var h = this.getEffectiveViewport1(a);
         var i = new ScalerParams(1, b, c, f.dn);
         i.c = h;
         var j = new ScalerParams(1, b, c, g.dn);
         j.c = h;
-        if (!this.gx) {
+        if (!this.gy) {
             d.c7();
             var k = new Rect(0, 0, 0, 0, 0);
             var l = void 0;
             var m = void 0;
             var n = void 0;
             var o = void 0;
-            var p = this.yh.count;
-            if (this.xm == null || this.xm.length != p) {
+            var p = this.yi.count;
+            if (this.xn == null || this.xn.length != p) {
+                this.xn = new Array(p);
+                this.xl = new Array(p);
                 this.xm = new Array(p);
                 this.xk = new Array(p);
-                this.xl = new Array(p);
-                this.xj = new Array(p);
             }
-            var q = this.xm;
-            var r = this.xk;
-            var s = this.xl;
-            var t = this.xj;
+            var q = this.xn;
+            var r = this.xl;
+            var s = this.xm;
+            var t = this.xk;
             var u = void 0;
             for (var v = 0; v < p; v++) {
-                u = this.y1._inner[v];
+                u = this.y2._inner[v];
                 q[v] = u.top;
                 r[v] = u.left;
                 s[v] = u.right;
                 t[v] = u.bottom;
             }
-            this.xy.k1(boxArray$1(r), 0, r.length, i);
-            this.xy.k1(boxArray$1(s), 0, s.length, i);
-            this.x0.k1(boxArray$1(q), 0, q.length, j);
-            this.x0.k1(boxArray$1(t), 0, t.length, j);
+            this.xz.k3(boxArray$1(r), 0, r.length, i);
+            this.xz.k3(boxArray$1(s), 0, s.length, i);
+            this.x1.k3(boxArray$1(q), 0, q.length, j);
+            this.x1.k3(boxArray$1(t), 0, t.length, j);
             d.c8(r, q, s, t);
-            var w = this.yh;
+            var w = this.yi;
             var x = this.dp;
-            this.aab(d);
+            this.aac(d);
             var y = c.left;
             var z = c.right;
             var aa = c.top;
             var ab = c.bottom;
             var ac = null;
-            if (this.aap.isEmpty) {
+            if (this.aaq.isEmpty) {
                 ac = null;
             }
             else {
-                ac = new Clipper(1, this.aap.left, this.aap.bottom, this.aap.right, this.aap.top, this.yr);
+                ac = new Clipper(1, this.aaq.left, this.aaq.bottom, this.aaq.right, this.aaq.top, this.ys);
             }
-            var ad = this.y0();
+            var ad = this.y1();
             if (ad) {
                 d.cp.clear();
             }
@@ -910,9 +910,9 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     else {
                         ai = null;
                     }
-                    var ak = this.y3(a, ai, w.item(aj), i, j, 0, ag);
+                    var ak = this.y4(a, ai, w.item(aj), i, j, 0, ag);
                     if (ad) {
-                        ShapeSeriesBase.z7(d, aj, ak);
+                        ShapeSeriesBase.z8(d, aj, ak);
                     }
                     d.cv(aj, x.item(aj), k, ak);
                 }
@@ -925,9 +925,9 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                         else {
                             ai = null;
                         }
-                        var al = this.y3(a, ai, w.item(aj), i, j, ag, ag);
+                        var al = this.y4(a, ai, w.item(aj), i, j, ag, ag);
                         if (ad) {
-                            ShapeSeriesBase.z7(d, aj, al);
+                            ShapeSeriesBase.z8(d, aj, al);
                         }
                         d.cv(aj, x.item(aj), k, al);
                     }
@@ -935,82 +935,82 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             d.c6();
         }
-        var am = this.yz();
-        this.x6.az(this, this.yz(), runOn(this, this.xp));
+        var am = this.y0();
+        this.x7.az(this, this.y0(), runOn(this, this.xq));
         var an = false;
-        var ao = this.x6.b;
+        var ao = this.x7.b;
         if (ao != null) {
             an = true;
         }
         var ap = a.t;
-        var aq = this.f1;
+        var aq = this.f2;
         var ar = d.cn;
         d.c2(function (as) {
             var at = as.dataContext != null ? as.dataContext.item : null;
             var au = as.dataContext != null ? as.dataContext.c : -1;
             d.cz(as, at, am);
             if (an) {
-                _this.z4(as, aq, au, _this.yh.count, ap, ar);
+                _this.z5(as, aq, au, _this.yi.count, ap, ar);
             }
             else {
                 if (ar) {
                     {
-                        _this.x6.a1(as, _this.ii, ar);
+                        _this.x7.a1(as, _this.ij, ar);
                     }
                 }
             }
             {
-                _this.x6.ad(as, false, false, false, false);
+                _this.x7.ad(as, false, false, false, false);
             }
         });
     };
-    ShapeSeriesBase.prototype.xs = function () {
+    ShapeSeriesBase.prototype.xt = function () {
         var a = new ActualRange();
         a.b = NaN;
         a.a = NaN;
-        if (this.yg != null) {
-            a.b = this.yg.minimum;
-            a.a = this.yg.maximum;
+        if (this.yh != null) {
+            a.b = this.yh.minimum;
+            a.a = this.yh.maximum;
         }
-        var b = typeCast(ValueBrushScale.$, this.xv);
+        var b = typeCast(ValueBrushScale.$, this.xw);
         if (b != null) {
             b.s();
-            if (this.yo && this.xv.o.count > 1) {
+            if (this.yp && this.xw.o.count > 1) {
                 a.b = b.q;
                 a.a = b.p;
             }
         }
         return a;
     };
-    ShapeSeriesBase.prototype.z4 = function (a, b, c, d, e, f) {
+    ShapeSeriesBase.prototype.z5 = function (a, b, c, d, e, f) {
         var g = this.by != 1;
         var h = this.cq != 1;
         var i = this.cp != 1;
-        this.x6.a0(this.x6.b, c, d, false);
+        this.x7.a0(this.x7.b, c, d, false);
         {
-            this.x6.a1(a, this.ii, f);
+            this.x7.a1(a, this.ij, f);
         }
-        var j = this.x6.ax;
+        var j = this.x7.ax;
         var k = null;
         var l = null;
         var m = null;
         var n = this.dp;
-        if (this.yg != null && this.xv != null) {
-            if (j.z >= 0 && j.z < this.yg.count) {
-                var o = this.yg.item(j.z);
-                var p = this.xr;
+        if (this.yh != null && this.xw != null) {
+            if (j.z >= 0 && j.z < this.yh.count) {
+                var o = this.yh.item(j.z);
+                var p = this.xs;
                 var q = p.b;
                 var r = p.a;
                 var s = j.aa;
-                if (this.xw != null) {
-                    s = this.xw.getBrush1(j.z, this.yg.count);
+                if (this.xx != null) {
+                    s = this.xx.getBrush1(j.z, this.yh.count);
                 }
-                else if (this.x8 != null && this.yg != null) {
-                    var t = this.yg.item(j.z);
-                    s = this.x8.getBrushByRange(t, q, r);
+                else if (this.x9 != null && this.yh != null) {
+                    var t = this.yh.item(j.z);
+                    s = this.x9.getBrushByRange(t, q, r);
                 }
-                else if (this.xv != null) {
-                    s = this.xv.getBrush(j.z);
+                else if (this.xw != null) {
+                    s = this.xw.getBrush(j.z);
                 }
                 j.aa = s;
             }
@@ -1034,16 +1034,16 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             j.b = m;
         }
         j.h = e;
-        this.z6(j);
-        this.x6.z(this, k, l, m, e, g, h, i, false);
+        this.z7(j);
+        this.x7.z(this, k, l, m, e, g, h, i, false);
     };
-    ShapeSeriesBase.prototype.z3 = function (a, b, c) {
+    ShapeSeriesBase.prototype.z4 = function (a, b, c) {
         var d = this.by != 1;
         var e = this.cq != 1;
         var f = this.cp != 1;
-        this.x6.a0(this.x6.d, a, b, true);
-        this.x6.aa(this.ii);
-        var g = this.x6.aw;
+        this.x7.a0(this.x7.d, a, b, true);
+        this.x7.aa(this.ij);
+        var g = this.x7.aw;
         var h = null;
         var i = null;
         var j = null;
@@ -1076,24 +1076,24 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             g.b = i;
         }
         g.h = c;
-        this.z5(g);
-        this.x6.y(this, h, i, j, c, d, e, f, g.v, this.dc.d7.totalHighWaterMark, g.x, this.dc.d8.totalHighWaterMark, g.t, this.dc.d6.totalHighWaterMark);
+        this.z6(g);
+        this.x7.y(this, h, i, j, c, d, e, f, g.v, this.dc.d7.totalHighWaterMark, g.x, this.dc.d8.totalHighWaterMark, g.t, this.dc.d6.totalHighWaterMark);
     };
-    ShapeSeriesBase.prototype.z6 = function (a) {
-        if (this.assigningShapeStyle != null && this.yj) {
+    ShapeSeriesBase.prototype.z7 = function (a) {
+        if (this.assigningShapeStyle != null && this.yk) {
             this.assigningShapeStyle(this, a);
         }
     };
-    ShapeSeriesBase.prototype.z5 = function (a) {
-        if (this.assigningShapeMarkerStyle != null && this.yi) {
+    ShapeSeriesBase.prototype.z6 = function (a) {
+        if (this.assigningShapeMarkerStyle != null && this.yj) {
             this.assigningShapeMarkerStyle(this, a);
         }
     };
-    ShapeSeriesBase.prototype.xp = function (a, b) {
-        return this.xq(a, b);
-    };
     ShapeSeriesBase.prototype.xq = function (a, b) {
-        if (b < a || a < 0 || a > this.yh.count || b < 0 || b > this.yh.count) {
+        return this.xr(a, b);
+    };
+    ShapeSeriesBase.prototype.xr = function (a, b) {
+        if (b < a || a < 0 || a > this.yi.count || b < 0 || b > this.yi.count) {
             return null;
         }
         var c = new Array((b - a) + 1);
@@ -1103,7 +1103,7 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return c;
     };
-    ShapeSeriesBase.z7 = function (a, b, c) {
+    ShapeSeriesBase.z8 = function (a, b, c) {
         var d = 0;
         var e = null;
         for (var f = 0; f < c.count; f++) {
@@ -1116,76 +1116,76 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         a.cp.addItem(b, e);
     };
-    ShapeSeriesBase.prototype.qp = function () {
-        _super.prototype.qp.call(this);
-        if (this.xz != null) {
-            this.xz.lx();
+    ShapeSeriesBase.prototype.qq = function () {
+        _super.prototype.qq.call(this);
+        if (this.x0 != null) {
+            this.x0.lz();
         }
-        if (this.x1 != null) {
-            this.x1.lx();
+        if (this.x2 != null) {
+            this.x2.lz();
         }
     };
-    ShapeSeriesBase.prototype.s9 = function (a, b) {
-        this.r8(false);
+    ShapeSeriesBase.prototype.ta = function (a, b) {
+        this.r9(false);
     };
-    ShapeSeriesBase.prototype.s8 = function (a, b) {
-        this.r8(false);
+    ShapeSeriesBase.prototype.s9 = function (a, b) {
+        this.r9(false);
     };
-    ShapeSeriesBase.prototype.po = function (a, b, c, d) {
-        _super.prototype.po.call(this, a, b, c, d);
+    ShapeSeriesBase.prototype.pp = function (a, b, c, d) {
+        _super.prototype.pp.call(this, a, b, c, d);
         switch (a) {
             case 3:
-                if (d == this.zs) {
-                    this.y1._inner[b] = this.aaq(this.yh.item(b));
+                if (d == this.zt) {
+                    this.y2._inner[b] = this.aar(this.yi.item(b));
                 }
                 break;
             case 1:
                 for (var e = b; e < b + c; e++) {
-                    this.y1.insert(e, this.aaq(this.yh.item(e)));
+                    this.y2.insert(e, this.aar(this.yi.item(e)));
                 }
                 break;
             case 0:
-                this.y1.v(b, c);
+                this.y2.v(b, c);
                 break;
             case 2:
                 for (var f = b; f < b + c; f++) {
-                    this.y1._inner[f] = this.aaq(this.yh.item(f));
+                    this.y2._inner[f] = this.aar(this.yi.item(f));
                 }
                 break;
             case 4:
-                this.z9();
+                this.aaa();
                 break;
         }
-        this.r8(false);
+        this.r9(false);
     };
-    ShapeSeriesBase.prototype.hk = function (a, b, c) {
+    ShapeSeriesBase.prototype.hl = function (a, b, c) {
         var d = true;
-        if (!_super.prototype.hk.call(this, a, b, c) || (this.yv && this.yh == null) || b.isEmpty || a.isEmpty || this.xz == null || this.x1 == null || this.xz.b7 == null || this.x1.b7 == null || this.xz.qw == this.xz.qv || this.x1.qw == this.x1.qv || this.yh == null || this.yh.count == 0 || this.y1 == null || this.y1.count == 0 || this.y1.count != this.yh.count) {
+        if (!_super.prototype.hl.call(this, a, b, c) || (this.yw && this.yi == null) || b.isEmpty || a.isEmpty || this.x0 == null || this.x2 == null || this.x0.b7 == null || this.x2.b7 == null || this.x0.qy == this.x0.qx || this.x2.qy == this.x2.qx || this.yi == null || this.yi.count == 0 || this.y2 == null || this.y2.count == 0 || this.y2.count != this.yi.count) {
             d = false;
         }
         return d;
     };
-    ShapeSeriesBase.prototype.get_yv = function () {
+    ShapeSeriesBase.prototype.get_yw = function () {
         return true;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "yv", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "yw", {
         get: function () {
-            return this.get_yv();
+            return this.get_yw();
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.rh = function (a) {
-        _super.prototype.rh.call(this, a);
-        this.x7 = typeCast(ShapeSeriesViewBase.$, a);
+    ShapeSeriesBase.prototype.ri = function (a) {
+        _super.prototype.ri.call(this, a);
+        this.x8 = typeCast(ShapeSeriesViewBase.$, a);
     };
-    ShapeSeriesBase.prototype.y4 = function (a, b, c, d, e, f, g) {
+    ShapeSeriesBase.prototype.y5 = function (a, b, c, d, e, f, g) {
         var h = new List$1(FlattenedShape.$, 0);
         var i;
         var j = c.count;
         for (var k = 0; k < j; k++) {
             i = c._inner[k];
-            var l = this.xx(a, b, i, d, e, f, g);
+            var l = this.xy(a, b, i, d, e, f, g);
             if (l == null) {
                 continue;
             }
@@ -1193,8 +1193,8 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return h;
     };
-    ShapeSeriesBase.prototype.xx = function (a, b, c, d, e, f, g) {
-        var h = this.zz(c, d, e);
+    ShapeSeriesBase.prototype.xy = function (a, b, c, d, e, f, g) {
+        var h = this.z0(c, d, e);
         var i = h.c;
         var j = h.d;
         var k = i.length;
@@ -1217,7 +1217,7 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             n = p > n ? p : n;
             o = q > o ? q : o;
         }
-        var t = !(l > this.aap.right || n < this.aap.left || m > this.aap.bottom || o < this.aap.top);
+        var t = !(l > this.aaq.right || n < this.aaq.left || m > this.aaq.bottom || o < this.aaq.top);
         if (!t && f == 0 && g != 0) {
             if (g != 0) {
                 for (var u = 0; u < k; u++) {
@@ -1232,22 +1232,22 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 n = p > n ? p : n;
                 o = q > o ? q : o;
             }
-            t = !(l > this.aap.right || n < this.aap.left || m > this.aap.bottom || o < this.aap.top);
+            t = !(l > this.aaq.right || n < this.aaq.left || m > this.aaq.bottom || o < this.aaq.top);
         }
         if (!t) {
             return null;
         }
-        var w = b != null && (l < this.aap.left || m < this.aap.top || n > this.aap.right || o > this.aap.bottom);
+        var w = b != null && (l < this.aaq.left || m < this.aaq.top || n > this.aaq.right || o > this.aaq.bottom);
         var x = new Rect(0, l, m, n - l, o - m);
         if (!a.co(x)) {
             return null;
         }
-        l = l < this.aap.left ? this.aap.left : l;
-        n = n > this.aap.right ? this.aap.right : n;
-        m = m < this.aap.top ? this.aap.top : m;
-        o = o > this.aap.bottom ? this.aap.bottom : o;
-        var y = PolySimplification.b(h, this.ik);
-        var z = new DefaultFlattener().c(h.c, h.d, y, this.y5);
+        l = l < this.aaq.left ? this.aaq.left : l;
+        n = n > this.aaq.right ? this.aaq.right : n;
+        m = m < this.aaq.top ? this.aaq.top : m;
+        o = o > this.aaq.bottom ? this.aaq.bottom : o;
+        var y = PolySimplification.b(h, this.il);
+        var z = new DefaultFlattener().c(h.c, h.d, y, this.y6);
         var aa = z.count;
         if (w) {
             var ab = new List$1(Point_$type, 0);
@@ -1267,9 +1267,9 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         ad.c = x;
         return ad;
     };
-    ShapeSeriesBase.prototype.zz = function (a, b, c) {
-        var d = this.xy;
-        var e = this.x0;
+    ShapeSeriesBase.prototype.z0 = function (a, b, c) {
+        var d = this.xz;
+        var e = this.x1;
         var f = a.count;
         var g = new Array(f);
         var h = new Array(f);
@@ -1277,61 +1277,61 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             g[i] = a._inner[i].x;
             h[i] = a._inner[i].y;
         }
-        d.k1(boxArray$1(g), 0, g.length, b);
-        e.k1(boxArray$1(h), 0, h.length, c);
+        d.k3(boxArray$1(g), 0, g.length, b);
+        e.k3(boxArray$1(h), 0, h.length, c);
         return new Tuple$2(Array_$type, Array_$type, g, h);
     };
-    ShapeSeriesBase.prototype.aab = function (a) {
+    ShapeSeriesBase.prototype.aac = function (a) {
         a.dd();
     };
-    ShapeSeriesBase.prototype.pi = function (a, b) {
-        _super.prototype.pi.call(this, a, b);
+    ShapeSeriesBase.prototype.pj = function (a, b) {
+        _super.prototype.pj.call(this, a, b);
         var c = b;
         c.c0();
     };
-    ShapeSeriesBase.prototype.z2 = function (a) {
+    ShapeSeriesBase.prototype.z3 = function (a) {
         if (a != null) {
-            a.d3(this);
+            a.d4(this);
         }
     };
-    ShapeSeriesBase.prototype.aaa = function (a) {
+    ShapeSeriesBase.prototype.aab = function (a) {
         if (a != null) {
             a.cx(this);
         }
     };
-    ShapeSeriesBase.prototype.z0 = function (a, b, c) {
+    ShapeSeriesBase.prototype.z1 = function (a, b, c) {
         var d = this.cw;
         var e = d.b9;
         var f = this.dc.y6(this.dc.yw(a));
-        if (e.width < 1 || e.height < 1 || this.yh == null) {
+        if (e.width < 1 || e.height < 1 || this.yi == null) {
             return;
         }
         var g = this.getEffectiveViewport1(d);
-        var h = new ScalerParams(0, f, e, this.xz.dn, g);
-        var i = new ScalerParams(0, f, e, this.x1.dn, g);
+        var h = new ScalerParams(0, f, e, this.x0.dn, g);
+        var i = new ScalerParams(0, f, e, this.x2.dn, g);
         d.c7();
-        var j = this.yh.count;
+        var j = this.yi.count;
         var k = new Array(j);
         var l = new Array(j);
         var m = new Array(j);
         var n = new Array(j);
         var o;
         for (var p = 0; p < j; p++) {
-            o = this.y1._inner[p];
+            o = this.y2._inner[p];
             k[p] = o.top;
             l[p] = o.left;
             m[p] = o.right;
             n[p] = o.bottom;
         }
-        this.xz.k1(boxArray$1(l), 0, l.length, h);
-        this.xz.k1(boxArray$1(m), 0, m.length, h);
-        this.x1.k1(boxArray$1(k), 0, k.length, i);
-        this.x1.k1(boxArray$1(n), 0, n.length, i);
+        this.x0.k3(boxArray$1(l), 0, l.length, h);
+        this.x0.k3(boxArray$1(m), 0, m.length, h);
+        this.x2.k3(boxArray$1(k), 0, k.length, i);
+        this.x2.k3(boxArray$1(n), 0, n.length, i);
         d.c8(l, k, m, n);
         d.dd();
         var q = null;
-        if (!this.aap.isEmpty) {
-            q = new Clipper(1, this.aap.left, this.aap.bottom, this.aap.right, this.aap.top, this.yr);
+        if (!this.aaq.isEmpty) {
+            q = new Clipper(1, this.aaq.left, this.aaq.bottom, this.aaq.right, this.aaq.top, this.ys);
         }
         var r = false;
         var s = 0;
@@ -1359,14 +1359,14 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             if (!y.intersectsWith(e)) {
                 continue;
             }
-            var aa = this.y3(d, q, this.yh.item(z), h, i, s, s);
+            var aa = this.y4(d, q, this.yi.item(z), h, i, s, s);
             if (aa.count <= 0) {
                 continue;
             }
-            this.yk(b, c, z);
+            this.yl(b, c, z);
         }
     };
-    ShapeSeriesBase.prototype.yk = function (a, b, c) {
+    ShapeSeriesBase.prototype.yl = function (a, b, c) {
         var _this = this;
         if (b == 7 || b == 6) {
             a.add(((function () {
@@ -1395,7 +1395,7 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     ShapeSeriesBase.prototype.a2 = function (a, b) {
-        var c = this.x7.df(a, b);
+        var c = this.x8.df(a, b);
         var d = null;
         if (c != null) {
             d = c.dataContext;
@@ -1413,34 +1413,34 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return _super.prototype.b3.call(this);
         }
     };
-    ShapeSeriesBase.prototype.g2 = function (a, b) {
-        if (this.g5(a, b)) {
+    ShapeSeriesBase.prototype.g3 = function (a, b) {
+        if (this.g6(a, b)) {
             return true;
         }
         return false;
     };
-    ShapeSeriesBase.prototype.g5 = function (a, b) {
+    ShapeSeriesBase.prototype.g6 = function (a, b) {
         if (this.a2(a, b) != null) {
             return true;
         }
         return false;
     };
-    ShapeSeriesBase.prototype.zc = function (a) {
+    ShapeSeriesBase.prototype.zd = function (a) {
         return this.dp.item(a);
     };
-    ShapeSeriesBase.prototype.get_hd = function () {
+    ShapeSeriesBase.prototype.get_he = function () {
         return true;
     };
-    ShapeSeriesBase.prototype.set_hd = function (a) {
-        _super.prototype.set_hd.call(this, a);
+    ShapeSeriesBase.prototype.set_he = function (a) {
+        _super.prototype.set_he.call(this, a);
     };
     ShapeSeriesBase.prototype.ay = function (a) {
         var e_2, _a, e_3, _b;
-        if (typeCast(NumericXAxis.$, a) !== null && this.y1 != null) {
+        if (typeCast(NumericXAxis.$, a) !== null && this.y2 != null) {
             var b = 1.7976931348623157E+308;
             var c = -1.7976931348623157E+308;
             try {
-                for (var _c = __values(fromEnum(this.y1)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                for (var _c = __values(fromEnum(this.y2)), _d = _c.next(); !_d.done; _d = _c.next()) {
                     var d = _d.value;
                     b = Math.min(b, d.left);
                     c = Math.max(c, d.right);
@@ -1461,11 +1461,11 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             return new AxisRange(b, c);
         }
-        if (typeCast(NumericYAxis.$, a) !== null && this.y1 != null) {
+        if (typeCast(NumericYAxis.$, a) !== null && this.y2 != null) {
             var e = 1.7976931348623157E+308;
             var f = -1.7976931348623157E+308;
             try {
-                for (var _e = __values(fromEnum(this.y1)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                for (var _e = __values(fromEnum(this.y2)), _f = _e.next(); !_f.done; _f = _e.next()) {
                     var g = _f.value;
                     e = Math.min(e, g.top);
                     f = Math.max(f, g.bottom);
@@ -1488,24 +1488,24 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return null;
     };
-    ShapeSeriesBase.prototype.get_f0 = function () {
+    ShapeSeriesBase.prototype.get_f1 = function () {
         return true;
     };
-    ShapeSeriesBase.prototype.get_fo = function () {
+    ShapeSeriesBase.prototype.get_fp = function () {
         return true;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "yp", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "yq", {
         get: function () {
             return this.styleShape != null;
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.aar = function (a, b, c) {
+    ShapeSeriesBase.prototype.aas = function (a, b, c) {
         if (this.styleShape != null) {
-            if (this.x7.dm != null && c == this.x7.dm) {
+            if (this.x8.dm != null && c == this.x8.dm) {
                 c = new Style();
-                var d = this.x7.dm;
+                var d = this.x8.dm;
                 c.fill = d.fill;
                 c.opacity = d.opacity;
                 c.stroke = d.stroke;
@@ -1531,8 +1531,8 @@ export var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         return c;
     };
     ShapeSeriesBase.$t = markType(ShapeSeriesBase, 'ShapeSeriesBase', Series.$, [ISupportsFillScale_$type]);
-    ShapeSeriesBase.aaf = DependencyProperty.i("HighlightedValueMemberPath", String_$type, ShapeSeriesBase.$, new PropertyMetadata(2, null, function (a, b) { return a.raisePropertyChanged("HighlightedValueMemberPath", b.oldValue, b.newValue); }));
-    ShapeSeriesBase.$$p = markDep(DependencyProperty, PropertyMetadata, ShapeSeriesBase, 'raisePropertyChanged', ['FillMemberPath:zf:aac', [2], 'FillScale:xv:aad', [BrushScale.$], 'FillScaleUseGlobalValues:yo:aae', [0, false], 'IsCustomShapeMarkerStyleAllowed:ys:aag', [0, false], 'IsCustomShapeStyleAllowed:yt:aah', [0, false], 'ItemSearchMode:x5:aai', [ShapeItemSearchMode_$type, enumGetBox(ShapeItemSearchMode_$type, 0)], 'ItemSearchPointsThreshold:za:aaj', [1, 10000], 'ItemSearchThreshold:zb:aak', [1, 10000], 'ShapeFilterResolution:y7:aal', [1, 2], 'ShapeMemberPath:zs:aam', [2, null], 'XAxis:xz:aan', [NumericXAxis.$, null], 'YAxis:x1:aao', [NumericYAxis.$, null]]);
+    ShapeSeriesBase.aag = DependencyProperty.i("HighlightedValueMemberPath", String_$type, ShapeSeriesBase.$, new PropertyMetadata(2, null, function (a, b) { return a.raisePropertyChanged("HighlightedValueMemberPath", b.oldValue, b.newValue); }));
+    ShapeSeriesBase.$$p = markDep(DependencyProperty, PropertyMetadata, ShapeSeriesBase, 'raisePropertyChanged', ['FillMemberPath:zg:aad', [2], 'FillScale:xw:aae', [BrushScale.$], 'FillScaleUseGlobalValues:yp:aaf', [0, false], 'IsCustomShapeMarkerStyleAllowed:yt:aah', [0, false], 'IsCustomShapeStyleAllowed:yu:aai', [0, false], 'ItemSearchMode:x6:aaj', [ShapeItemSearchMode_$type, enumGetBox(ShapeItemSearchMode_$type, 0)], 'ItemSearchPointsThreshold:zb:aak', [1, 10000], 'ItemSearchThreshold:zc:aal', [1, 10000], 'ShapeFilterResolution:y8:aam', [1, 2], 'ShapeMemberPath:zt:aan', [2, null], 'XAxis:x0:aao', [NumericXAxis.$, null], 'YAxis:x2:aap', [NumericYAxis.$, null]]);
     return ShapeSeriesBase;
 }(Series));
 /**
@@ -1664,7 +1664,7 @@ export var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super)
         })());
     };
     ShapeSeriesViewBase.prototype.co = function (a) {
-        return a.width >= this.cj.y8 && a.height >= this.cj.y8;
+        return a.width >= this.cj.y9 && a.height >= this.cj.y9;
     };
     ShapeSeriesViewBase.cs = function (a) {
         var b = new List$1(PointCollection.$, 0);
@@ -1679,7 +1679,7 @@ export var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super)
     };
     Object.defineProperty(ShapeSeriesViewBase.prototype, "cn", {
         get: function () {
-            return this.dl != null || this.ck != null || this.cj.yp;
+            return this.dl != null || this.ck != null || this.cj.yq;
         },
         enumerable: false,
         configurable: true
@@ -1718,13 +1718,13 @@ export var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super)
     };
     ShapeSeriesViewBase.cy = function (a, b, c) {
         if (b._fill == null) {
-            b._fill = a.f.vt;
+            b._fill = a.f.vu;
         }
         if (b._stroke == null) {
-            b._stroke = a.f.vx;
+            b._stroke = a.f.vy;
         }
         if (b.y == null) {
-            b.ad = a.f.il;
+            b.ad = a.f.im;
         }
     };
     ShapeSeriesViewBase.prototype.c2 = function (a) {
@@ -1755,7 +1755,7 @@ export var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super)
                 this.m.j(a, a.y);
             }
         }
-        var f = this.cj.aar(b, a, a.y);
+        var f = this.cj.aas(b, a, a.y);
         if (a.y != f) {
             a.y = f;
             this.m.j(a, a.y);
@@ -1846,7 +1846,7 @@ export var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super)
         var c = this.b4(a);
         this.dk._fill = c;
         this.dk._stroke = c;
-        this.dk.ad = this.f.il + 3;
+        this.dk.ad = this.f.im + 3;
         return this.dk;
     };
     ShapeSeriesViewBase.prototype.bj = function (a, b) {
@@ -1897,7 +1897,7 @@ export var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super)
             }
             if (d >= h.d.left && d <= h.d.right && e >= h.d.top && e <= h.d.bottom) {
                 if (c) {
-                    var j = this.cj.il / 2 + this.cj.i1(b);
+                    var j = this.cj.im / 2 + this.cj.i2(b);
                     if (CoreGeometryUtil.l(a, h.a._inner[0], h.a, j)) {
                         return h;
                     }
@@ -1930,7 +1930,7 @@ export var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super)
         if (this.m != null) {
             this.m.j(b, b.y);
         }
-        this.cj.aap = RectUtil.r(a, b.ad);
+        this.cj.aaq = RectUtil.r(a, b.ad);
     };
     ShapeSeriesViewBase.prototype.ax = function (a) {
         _super.prototype.ax.call(this, a);