igniteui-angular-maps 12.1.2 → 13.1.1

package/esm5/lib/XamGeographicMap_combined.js

@@ -18,7 +18,6 @@ import { SphericalMercatorVerticalScaler } from "./SphericalMercatorVerticalScal
 import { Control } from "igniteui-angular-core";
 import { SphericalMercatorHorizontalScaler } from "./SphericalMercatorHorizontalScaler";
 import { ScalerParams } from "igniteui-angular-charts";
-import { Brush } from "igniteui-angular-core";
 import { SeriesViewerView } from "igniteui-angular-charts";
 import { Tuple$2 } from "igniteui-angular-core";
 import { MathUtil } from "igniteui-angular-core";
@@ -34,7 +33,10 @@ import { ImagesChangedEventArgs } from "./ImagesChangedEventArgs";
 import { HostSeriesView } from "./HostSeriesView";
 import { GeographicMapSeriesHost } from "./GeographicMapSeriesHost";
 import { ScatterAreaSeries } from "igniteui-angular-charts";
+import { BrushCollection } from "igniteui-angular-core";
+import { Defaults } from "igniteui-angular-charts";
 import { OpenStreetMapTileSource } from "igniteui-angular-core";
+import { ColorScale } from "igniteui-angular-charts";
 /**
  * @hidden
  */
@@ -42,22 +44,22 @@ var XamGeographicMap = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(XamGeographicMap, _super);
     function XamGeographicMap() {
         var _this = _super.call(this) || this;
-        _this.p4 = null;
-        _this.pt = false;
-        _this.pl = 1;
-        _this.p0 = 0;
-        _this.rb = null;
-        _this.pi = null;
-        _this.pe = null;
-        _this.pg = null;
-        _this.pk = null;
-        _this.q7 = { $type: Point_$type, x: NaN, y: NaN };
-        _this.re = null;
-        _this.pz = 1;
+        _this.tc = null;
+        _this.s1 = false;
+        _this.st = 1;
+        _this.s8 = 0;
+        _this.uj = null;
+        _this.sq = null;
+        _this.sm = null;
+        _this.so = null;
+        _this.ss = null;
+        _this.uf = { $type: Point_$type, x: NaN, y: NaN };
+        _this.um = null;
+        _this.s7 = 1;
         _this.imageTilesReady = null;
-        _this.ps = null;
-        _this.rd = Rect.empty;
-        _this.p0 = SphericalMercatorVerticalScaler.am(XamGeographicMap.rc.bottom) - SphericalMercatorVerticalScaler.am(XamGeographicMap.rc.top);
+        _this.s0 = null;
+        _this.ul = Rect.empty;
+        _this.s8 = SphericalMercatorVerticalScaler.am(XamGeographicMap.uk.bottom) - SphericalMercatorVerticalScaler.am(XamGeographicMap.uk.top);
         _this.ab = XamGeographicMap.$;
         _this.backgroundContent = new OpenStreetMapImagery();
         var a = ((function () {
@@ -65,80 +67,80 @@ var XamGeographicMap = /** @class */ /*@__PURE__*/ (function (_super) {
             $ret.bh = _this;
             return $ret;
         })());
-        a.b8 = true;
-        _this.pf = a;
-        _this.pf.lp = new SphericalMercatorHorizontalScaler();
+        a.cd = true;
+        _this.sn = a;
+        _this.sn.mr = new SphericalMercatorHorizontalScaler();
         var b = ((function () {
             var $ret = new NumericYAxis();
             $ret.bh = _this;
             return $ret;
         })());
-        b.b8 = true;
-        _this.ph = b;
-        _this.ph.lp = new SphericalMercatorVerticalScaler();
-        _this.qm();
-        _this.qt();
-        _this.i7();
+        b.cd = true;
+        _this.sp = b;
+        _this.sp.mr = new SphericalMercatorVerticalScaler();
+        _this.tu();
+        _this.t1();
+        _this.k8();
         return _this;
     }
     XamGeographicMap.prototype.provideContainer = function (a) {
         _super.prototype.provideContainer.call(this, a);
-        this.pf.provideRenderer(a);
-        this.ph.provideRenderer(a);
+        this.sn.provideRenderer(a);
+        this.sp.provideRenderer(a);
     };
-    XamGeographicMap.prototype.i7 = function () {
-        _super.prototype.i7.call(this);
-        this.pr.fq(this.e8);
+    XamGeographicMap.prototype.k8 = function () {
+        _super.prototype.k8.call(this);
+        this.sz.fv(this.fy);
     };
-    XamGeographicMap.prototype.dx = function () {
-        return this.px;
+    XamGeographicMap.prototype.eh = function () {
+        return this.s5;
     };
-    XamGeographicMap.prototype.dy = function () {
-        return this.px;
+    XamGeographicMap.prototype.ei = function () {
+        return this.s5;
     };
-    XamGeographicMap.prototype.po = function () {
-        if (this.pm == 0) {
-            if (this.pt) {
+    XamGeographicMap.prototype.sw = function () {
+        if (this.su == 0) {
+            if (this.s1) {
                 return 2;
             }
         }
         return 1;
     };
-    Object.defineProperty(XamGeographicMap.prototype, "pn", {
+    Object.defineProperty(XamGeographicMap.prototype, "sv", {
         get: function () {
-            return this.pl;
+            return this.st;
         },
         set: function (a) {
-            this.pl = a;
+            this.st = a;
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XamGeographicMap.prototype, "rg", {
+    Object.defineProperty(XamGeographicMap.prototype, "uo", {
         get: function () {
-            return this.rb;
+            return this.uj;
         },
         set: function (a) {
-            var b = Rect.l_op_Inequality(this.rb, a);
+            var b = Rect.l_op_Inequality(this.uj, a);
             if (b) {
-                var c = this.rb;
-                this.rb = a;
-                this.k5("ActualWorldRect", c, a);
+                var c = this.uj;
+                this.uj = a;
+                this.nb("ActualWorldRect", c, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    XamGeographicMap.prototype.rk = function () {
-        return this.rg;
+    XamGeographicMap.prototype.us = function () {
+        return this.uo;
     };
-    XamGeographicMap.prototype.qm = function () {
-        if (this.rs.isEmpty) {
+    XamGeographicMap.prototype.tu = function () {
+        if (this.u0.isEmpty) {
             return;
         }
-        this.rg = this.rq(this.rs, this.br == 1);
+        this.uo = this.uy(this.u0, this.b5 == 1);
     };
-    XamGeographicMap.prototype.rq = function (a, b) {
+    XamGeographicMap.prototype.uy = function (a, b) {
         var c = a.top;
         var d = a.left;
         var e = a.width;
@@ -146,25 +148,25 @@ var XamGeographicMap = /** @class */ /*@__PURE__*/ (function (_super) {
         var g = SphericalMercatorVerticalScaler.am(a.bottom);
         var h = SphericalMercatorVerticalScaler.am(a.top);
         var i = g - h;
-        var j = a.width / XamGeographicMap.rc.width;
-        var k = SphericalMercatorVerticalScaler.am(XamGeographicMap.rc.top);
+        var j = a.width / XamGeographicMap.uk.width;
+        var k = SphericalMercatorVerticalScaler.am(XamGeographicMap.uk.top);
         var l = i / j;
-        if (i / j > this.p0) {
-            var m = i / this.p0;
+        if (i / j > this.s8) {
+            var m = i / this.s8;
             var n = m - j;
-            d = d - (n / 2) * XamGeographicMap.rc.width;
-            e = m * XamGeographicMap.rc.width;
+            d = d - (n / 2) * XamGeographicMap.uk.width;
+            e = m * XamGeographicMap.uk.width;
             if (b) {
-                if (d < XamGeographicMap.rc.left) {
-                    d += (XamGeographicMap.rc.left - d);
+                if (d < XamGeographicMap.uk.left) {
+                    d += (XamGeographicMap.uk.left - d);
                 }
-                else if ((d + e) > XamGeographicMap.rc.right) {
-                    d -= ((d + e) - XamGeographicMap.rc.right);
+                else if ((d + e) > XamGeographicMap.uk.right) {
+                    d -= ((d + e) - XamGeographicMap.uk.right);
                 }
             }
         }
-        else if (i / j < this.p0) {
-            var o = this.p0 * j;
+        else if (i / j < this.s8) {
+            var o = this.s8 * j;
             var p = o - i;
             var q = h - (p / 2);
             var r = g + (p / 2);
@@ -173,9 +175,9 @@ var XamGeographicMap = /** @class */ /*@__PURE__*/ (function (_super) {
                     q += (k - q);
                     r += (k - q);
                 }
-                else if (r > (k + this.p0)) {
-                    q -= ((r) - (k + this.p0));
-                    r -= ((r) - (k + this.p0));
+                else if (r > (k + this.s8)) {
+                    q -= ((r) - (k + this.s8));
+                    r -= ((r) - (k + this.s8));
                 }
             }
             c = SphericalMercatorVerticalScaler.aq(q);
@@ -186,44 +188,44 @@ var XamGeographicMap = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     Object.defineProperty(XamGeographicMap.prototype, "backgroundContent", {
         get: function () {
-            return this.pi;
+            return this.sq;
         },
         set: function (a) {
             var b = a != this.backgroundContent;
             if (b) {
                 var c = this.backgroundContent;
-                this.pi = a;
-                this.k5("BackgroundContent", c, a);
+                this.sq = a;
+                this.nb("BackgroundContent", c, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XamGeographicMap.prototype, "pf", {
+    Object.defineProperty(XamGeographicMap.prototype, "sn", {
         get: function () {
-            return this.pe;
+            return this.sm;
         },
         set: function (a) {
-            var b = a != this.pf;
+            var b = a != this.sn;
             if (b) {
-                var c = this.pf;
-                this.pe = a;
-                this.k5("XAxis", c, a);
+                var c = this.sn;
+                this.sm = a;
+                this.nb("XAxis", c, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XamGeographicMap.prototype, "ph", {
+    Object.defineProperty(XamGeographicMap.prototype, "sp", {
         get: function () {
-            return this.pg;
+            return this.so;
         },
         set: function (a) {
-            var b = a != this.ph;
+            var b = a != this.sp;
             if (b) {
-                var c = this.ph;
-                this.pg = a;
-                this.k5("YAxis", c, a);
+                var c = this.sp;
+                this.so = a;
+                this.nb("YAxis", c, a);
             }
         },
         enumerable: false,
@@ -232,41 +234,41 @@ var XamGeographicMap = /** @class */ /*@__PURE__*/ (function (_super) {
     XamGeographicMap.prototype.getZoomRectFromGeoRect = function (a) {
         return this.getZoomFromGeographicRect(a);
     };
-    XamGeographicMap.prototype.qw = function (a) {
-        this.o8 = a;
+    XamGeographicMap.prototype.t4 = function (a) {
+        this.sg = a;
     };
-    XamGeographicMap.prototype.qv = function (a) {
-        this.rs = a;
+    XamGeographicMap.prototype.t3 = function (a) {
+        this.u0 = a;
     };
     XamGeographicMap.prototype.getZoomFromGeographicRect = function (a) {
-        return this.ri(a, true, 0);
+        return this.uq(a, true, 0);
     };
-    XamGeographicMap.prototype.rh = function (a, b) {
-        return this.ri(a, false, b);
+    XamGeographicMap.prototype.up = function (a, b) {
+        return this.uq(a, false, b);
     };
-    XamGeographicMap.prototype.ri = function (a, b, c) {
+    XamGeographicMap.prototype.uq = function (a, b, c) {
         var d = a;
         if (b) {
-            d = this.rq(a, false);
-        }
-        var e = this.pf;
-        var f = this.ph;
-        var g = new ScalerParams(1, XamGeographicMap.rf, this.o7, e.ca);
-        g.c = this.ow;
-        var h = new ScalerParams(1, XamGeographicMap.rf, this.o7, f.ca);
-        h.c = this.ow;
-        var i = this.pf.dz(d.left, g);
-        var j = this.pf.dz(d.right, g);
-        var k = this.ph.dz(d.top, h);
-        var l = this.ph.dz(d.bottom, h);
-        var m = (i - c) / this.o7.width;
-        var n = (l - c) / this.o7.height;
-        var o = (j - i + (c * 2)) / this.o7.width;
-        var p = (k - l + (c * 2)) / this.o7.height;
+            d = this.uy(a, false);
+        }
+        var e = this.sn;
+        var f = this.sp;
+        var g = new ScalerParams(1, XamGeographicMap.un, this.sf, e.cf);
+        g.c = this.r4;
+        var h = new ScalerParams(1, XamGeographicMap.un, this.sf, f.cf);
+        h.c = this.r4;
+        var i = this.sn.ef(d.left, g);
+        var j = this.sn.ef(d.right, g);
+        var k = this.sp.ef(d.top, h);
+        var l = this.sp.ef(d.bottom, h);
+        var m = (i - c) / this.sf.width;
+        var n = (l - c) / this.sf.height;
+        var o = (j - i + (c * 2)) / this.sf.width;
+        var p = (k - l + (c * 2)) / this.sf.height;
         var q = new Rect(0, m, n, o, p);
-        q.intersect(XamGeographicMap.rf);
+        q.intersect(XamGeographicMap.un);
         if (q.isEmpty) {
-            q = XamGeographicMap.rf;
+            q = XamGeographicMap.un;
         }
         return q;
     };
@@ -276,73 +278,67 @@ var XamGeographicMap = /** @class */ /*@__PURE__*/ (function (_super) {
         var e = b.x - a.x;
         var f = a.y - b.y;
         if (e < 0 || f < 0) {
-            return XamGeographicMap.rf;
+            return XamGeographicMap.un;
         }
         else {
             var g = new Rect(0, c, d, e, f);
             return this.getZoomFromGeographicRect(g);
         }
     };
-    XamGeographicMap.prototype.rm = function (a) {
-        var b = this.pf;
-        var c = this.ph;
-        var d = new ScalerParams(1, a, this.o7, b.ca);
-        d.c = this.ow;
-        var e = new ScalerParams(1, a, this.o7, c.ca);
-        e.c = this.ow;
-        var f = this.ov;
-        var g = b.d2(f.left, d);
-        var h = c.d2(f.top, e);
-        var i = b.d2(f.right, d);
-        var j = c.d2(f.bottom, e);
+    XamGeographicMap.prototype.uu = function (a) {
+        var b = this.sn;
+        var c = this.sp;
+        var d = new ScalerParams(1, a, this.sf, b.cf);
+        d.c = this.r4;
+        var e = new ScalerParams(1, a, this.sf, c.cf);
+        e.c = this.r4;
+        var f = this.r3;
+        var g = b.ei(f.left, d);
+        var h = c.ei(f.top, e);
+        var i = b.ei(f.right, d);
+        var j = c.ei(f.bottom, e);
         var k = i - g;
         var l = h - j;
         var m = new Rect(0, g, j, k, l);
-        if (this.br == 1) {
-            m.intersect(XamGeographicMap.rc);
+        if (this.b5 == 1) {
+            m.intersect(XamGeographicMap.uk);
             if (m.isEmpty) {
-                m = XamGeographicMap.rc;
+                m = XamGeographicMap.uk;
             }
         }
         return m;
     };
-    XamGeographicMap.prototype.q8 = function (a) {
-        var b = this.pf.ko(a.x);
-        var c = this.ph.ko(a.y);
+    XamGeographicMap.prototype.ug = function (a) {
+        var b = this.sn.lo(a.x);
+        var c = this.sp.lo(a.y);
         return { $type: Point_$type, x: b, y: c };
     };
-    XamGeographicMap.prototype.q9 = function (a) {
-        var b = this.pf.ee(a.x);
-        var c = this.ph.ee(a.y);
+    XamGeographicMap.prototype.uh = function (a) {
+        var b = this.sn.e0(a.x);
+        var c = this.sp.e0(a.y);
         return { $type: Point_$type, x: b, y: c };
     };
-    XamGeographicMap.prototype.ra = function (a) {
-        return this.q9(a);
+    XamGeographicMap.prototype.ui = function (a) {
+        return this.uh(a);
     };
-    XamGeographicMap.prototype.qj = function () {
+    XamGeographicMap.prototype.tr = function () {
         var a = typeCast(GeographicMapImagery.$, this.backgroundContent);
         if (a != null) {
             a.clearTileCache();
         }
     };
-    XamGeographicMap.prototype.qp = function (a) {
+    XamGeographicMap.prototype.tx = function (a) {
     };
-    XamGeographicMap.prototype.oa = function (a) {
-        return this.pr.fu(a);
-    };
-    XamGeographicMap.prototype.ob = function (a) {
-        return this.pr.fv(a);
-    };
-    XamGeographicMap.prototype.eg = function () {
+    XamGeographicMap.prototype.e4 = function () {
         return true;
     };
-    XamGeographicMap.prototype.qr = function () {
+    XamGeographicMap.prototype.tz = function () {
         var e_1, _a;
-        this.pr.eb();
+        this.sz.ee();
         try {
             for (var _b = __values(fromEnum(this.series)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var a = _c.value;
-                a.lc();
+                a.mg();
             }
         }
         catch (e_1_1) {
@@ -359,128 +355,128 @@ var XamGeographicMap = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    XamGeographicMap.prototype.qu = function () {
-        if (this.pq == 2) {
-            if (!this.o7.isEmpty && this.o7.width > 0 && this.o7.height > 0) {
-                var a = this.pf.ko(this.o7.left + (this.o7.width / 2));
-                var b = this.ph.ko(this.o7.top + (this.o7.height / 2));
-                this.q7 = { $type: Point_$type, x: a, y: b };
+    XamGeographicMap.prototype.t2 = function () {
+        if (this.sy == 2) {
+            if (!this.sf.isEmpty && this.sf.width > 0 && this.sf.height > 0) {
+                var a = this.sn.lo(this.sf.left + (this.sf.width / 2));
+                var b = this.sp.lo(this.sf.top + (this.sf.height / 2));
+                this.uf = { $type: Point_$type, x: a, y: b };
             }
         }
         else {
-            if (!this.o7.isEmpty && this.o7.width > 0 && this.o7.height > 0) {
-                var c = this.pf.ko(this.o7.left);
-                var d = this.ph.ko(this.o7.top);
-                this.q7 = { $type: Point_$type, x: c, y: d };
+            if (!this.sf.isEmpty && this.sf.width > 0 && this.sf.height > 0) {
+                var c = this.sn.lo(this.sf.left);
+                var d = this.sp.lo(this.sf.top);
+                this.uf = { $type: Point_$type, x: c, y: d };
             }
         }
     };
-    XamGeographicMap.prototype.qq = function () {
-        if (isNaN_(this.q7.x) || isNaN_(this.q7.y)) {
-            this.qu();
+    XamGeographicMap.prototype.ty = function () {
+        if (isNaN_(this.uf.x) || isNaN_(this.uf.y)) {
+            this.t2();
         }
-        var a = this.q7.x;
-        var b = this.q7.y;
+        var a = this.uf.x;
+        var b = this.uf.y;
         if (!isNaN_(a) && !isNaN_(b)) {
-            var c = this.os.left;
-            var d = this.os.top;
-            var e = this.os.width;
-            var f = this.os.height;
-            if (e > this.re.width) {
+            var c = this.r0.left;
+            var d = this.r0.top;
+            var e = this.r0.width;
+            var f = this.r0.height;
+            if (e > this.um.width) {
             }
             else {
-                var g = new ScalerParams(1, XamGeographicMap.rf, this.o7, this.pf.ca);
-                g.c = this.ow;
-                var h = this.pf.dz(a, g);
-                if (this.pq == 2) {
-                    var i = h / this.o7.width;
+                var g = new ScalerParams(1, XamGeographicMap.un, this.sf, this.sn.cf);
+                g.c = this.r4;
+                var h = this.sn.ef(a, g);
+                if (this.sy == 2) {
+                    var i = h / this.sf.width;
                     c = i - (e / 2);
                 }
                 else {
-                    c = h / this.o7.width;
+                    c = h / this.sf.width;
                 }
-                if (c + e > this.re.right) {
-                    c = this.re.right - e;
+                if (c + e > this.um.right) {
+                    c = this.um.right - e;
                 }
-                else if (c < this.re.left) {
-                    c = this.re.left;
+                else if (c < this.um.left) {
+                    c = this.um.left;
                 }
             }
-            if (f > this.re.height) {
+            if (f > this.um.height) {
             }
             else {
-                var j = new ScalerParams(1, XamGeographicMap.rf, this.o7, this.ph.ca);
-                j.c = this.ow;
-                var k = this.ph.dz(b, j);
-                if (this.pq == 2) {
-                    var l = k / this.o7.height;
+                var j = new ScalerParams(1, XamGeographicMap.un, this.sf, this.sp.cf);
+                j.c = this.r4;
+                var k = this.sp.ef(b, j);
+                if (this.sy == 2) {
+                    var l = k / this.sf.height;
                     d = l - (f / 2);
                 }
                 else {
-                    d = k / this.o7.height;
+                    d = k / this.sf.height;
                 }
-                if (d + f > this.re.bottom) {
-                    d = this.re.bottom - f;
+                if (d + f > this.um.bottom) {
+                    d = this.um.bottom - f;
                 }
-                else if (d < this.re.top) {
-                    d = this.re.top;
+                else if (d < this.um.top) {
+                    d = this.um.top;
                 }
             }
-            this.mc(new Rect(0, c, d, e, f), false);
+            this.oi(new Rect(0, c, d, e, f), false);
         }
     };
-    XamGeographicMap.prototype.get_dq = function () {
+    XamGeographicMap.prototype.get_ea = function () {
         return true;
     };
-    XamGeographicMap.prototype.ot = function () {
-        var a = _super.prototype.ot.call(this);
-        if (this.pf == null || this.ph == null) {
+    XamGeographicMap.prototype.r1 = function () {
+        var a = _super.prototype.r1.call(this);
+        if (this.sn == null || this.sp == null) {
             return a;
         }
-        this.o3();
+        this.sb();
         var b = a.left;
         var c = a.top;
-        if (this.br == 1) {
-            if (this.o8.width > this.re.width) {
-                b = 0.5 - (this.o8.width / 2);
+        if (this.b5 == 1) {
+            if (this.sg.width > this.um.width) {
+                b = 0.5 - (this.sg.width / 2);
             }
-            else if (b + a.width > this.re.right) {
-                b = this.re.right - this.o8.width;
+            else if (b + a.width > this.um.right) {
+                b = this.um.right - this.sg.width;
             }
-            else if (b < this.re.left) {
-                b = this.re.left;
+            else if (b < this.um.left) {
+                b = this.um.left;
             }
-            if (this.o8.height > this.re.height) {
-                c = 0.5 - (this.o8.height / 2);
+            if (this.sg.height > this.um.height) {
+                c = 0.5 - (this.sg.height / 2);
             }
-            else if (c + this.o8.height > this.re.bottom) {
-                c = this.re.bottom - this.o8.height;
+            else if (c + this.sg.height > this.um.bottom) {
+                c = this.um.bottom - this.sg.height;
             }
-            else if (c < this.re.top) {
-                c = this.re.top;
+            else if (c < this.um.top) {
+                c = this.um.top;
             }
         }
         var d = false;
-        if (!this.pw && this.br == 2 && this.pt) {
+        if (!this.s4 && this.b5 == 2 && this.s1) {
             if (b > 1) {
                 b = (b - Math.floor(b)) + 1;
             }
             if (b < 0) {
                 b = 0 - (Math.ceil(b) - b);
             }
-            if ((a.right - this.re.right) > 0 && ((a.right - this.re.right) / a.width) > 0.8) {
-                b = this.re.left - (a.width - (a.right - this.re.right));
+            if ((a.right - this.um.right) > 0 && ((a.right - this.um.right) / a.width) > 0.8) {
+                b = this.um.left - (a.width - (a.right - this.um.right));
                 d = true;
             }
-            else if (a.left < this.re.left && (Math.abs(a.left - this.re.left) / a.width) > 0.8) {
-                b = this.re.right - (Math.abs(a.left - this.re.left));
+            else if (a.left < this.um.left && (Math.abs(a.left - this.um.left) / a.width) > 0.8) {
+                b = this.um.right - (Math.abs(a.left - this.um.left));
                 d = true;
             }
         }
         var e = new Rect(0, b, c, a.width, a.height);
-        if (this.pw) {
-            var f = this.rh(this.rs, 1);
-            f = this.rj(f);
+        if (this.s4) {
+            var f = this.up(this.u0, 1);
+            f = this.ur(f);
             var g = e.left + e.width / 2;
             var h = e.top + e.height / 2;
             if (e.width > f.width) {
@@ -515,17 +511,17 @@ var XamGeographicMap = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
         if (d) {
-            this.dc = true;
-            this.o8 = e;
-            this.dc = false;
+            this.dx = true;
+            this.sg = e;
+            this.dx = false;
         }
         return e;
     };
-    XamGeographicMap.prototype.ik = function (a, b) {
+    XamGeographicMap.prototype.km = function (a, b) {
         var c = true;
         var d = true;
         var e = 0;
-        var f = this.o3();
+        var f = this.sb();
         var g = 0;
         var h = 0;
         if ((a.right - f.right) > 0) {
@@ -542,39 +538,39 @@ var XamGeographicMap = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         if (c) {
             if (d) {
-                var i = this.pe.dz(-180, b);
-                var j = this.pe.dz(180, b);
+                var i = this.sm.ef(-180, b);
+                var j = this.sm.ef(180, b);
                 e = j - i;
             }
             else {
-                var k = this.pe.dz(-180, b);
-                var l = this.pe.dz(180, b);
+                var k = this.sm.ef(-180, b);
+                var l = this.sm.ef(180, b);
                 e = k - l;
             }
         }
         return new Tuple$2(Boolean_$type, Number_$type, c, e);
     };
-    XamGeographicMap.prototype.o3 = function () {
-        var a = new ScalerParams(1, XamGeographicMap.rf, this.o7, this.pf.ca);
-        a.c = this.ow;
-        var b = new ScalerParams(1, XamGeographicMap.rf, this.o7, this.ph.ca);
-        b.c = this.ow;
-        var c = this.pf.dz(XamGeographicMap.rc.left, a);
-        var d = this.pf.dz(XamGeographicMap.rc.right, a);
-        var e = this.ph.dz(XamGeographicMap.rc.top, b);
-        var f = this.ph.dz(XamGeographicMap.rc.bottom, b);
-        this.re = new Rect(0, c / this.o7.width, f / this.o7.height, (d - c) / this.o7.width, (e - f) / this.o7.height);
-        return this.re;
-    };
-    XamGeographicMap.prototype.rj = function (a) {
-        var b = this.fw;
+    XamGeographicMap.prototype.sb = function () {
+        var a = new ScalerParams(1, XamGeographicMap.un, this.sf, this.sn.cf);
+        a.c = this.r4;
+        var b = new ScalerParams(1, XamGeographicMap.un, this.sf, this.sp.cf);
+        b.c = this.r4;
+        var c = this.sn.ef(XamGeographicMap.uk.left, a);
+        var d = this.sn.ef(XamGeographicMap.uk.right, a);
+        var e = this.sp.ef(XamGeographicMap.uk.top, b);
+        var f = this.sp.ef(XamGeographicMap.uk.bottom, b);
+        this.um = new Rect(0, c / this.sf.width, f / this.sf.height, (d - c) / this.sf.width, (e - f) / this.sf.height);
+        return this.um;
+    };
+    XamGeographicMap.prototype.ur = function (a) {
+        var b = this.g0;
         var c = 0.5 * (a.left + a.right);
         var d = 0.5 * (a.top + a.bottom);
         var e = a.width;
         var f = a.height;
         var g = MathUtil.b(a.width, b, 1);
         var h = MathUtil.b(a.height, b, 1);
-        var i = this.o7;
+        var i = this.sf;
         var j = i.width / i.height;
         var k = g * i.width;
         var l = h * i.height;
@@ -613,8 +609,8 @@ var XamGeographicMap = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return new Rect(0, p, q, r - p, s - q);
     };
-    XamGeographicMap.prototype.ou = function (a) {
-        _super.prototype.ou.call(this, this.o7);
+    XamGeographicMap.prototype.r2 = function (a) {
+        _super.prototype.r2.call(this, this.sf);
         if (a.isEmpty) {
             return Rect.empty;
         }
@@ -629,143 +625,137 @@ var XamGeographicMap = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return b;
     };
-    XamGeographicMap.prototype.rl = function (a) {
-        return this.ou(a);
+    XamGeographicMap.prototype.ut = function (a) {
+        return this.r2(a);
     };
-    XamGeographicMap.prototype.b7 = function () {
+    XamGeographicMap.prototype.cl = function () {
         return new XamGeographicMapView(this);
     };
-    XamGeographicMap.prototype.n6 = function (a) {
-        return this.pr.ft(a);
-    };
-    XamGeographicMap.prototype.oc = function (a) {
-        return this.pr.fw(a);
-    };
-    XamGeographicMap.prototype.ql = function (a) {
+    XamGeographicMap.prototype.tt = function (a) {
         if (a != null) {
             a.bh = this;
         }
     };
-    XamGeographicMap.prototype.kp = function (a) {
-        _super.prototype.kp.call(this, a);
-        this.pr = a;
+    XamGeographicMap.prototype.mv = function (a) {
+        _super.prototype.mv.call(this, a);
+        this.sz = a;
     };
-    XamGeographicMap.prototype.k0 = function (a, b) {
-        _super.prototype.k0.call(this, a, b);
-        this.l0(this.pf);
-        this.l0(this.ph);
+    XamGeographicMap.prototype.m6 = function (a, b) {
+        _super.prototype.m6.call(this, a, b);
+        this.n6(this.sn);
+        this.n6(this.sp);
         if (Rect.l_op_Inequality(a, b)) {
-            this.qq();
+            this.ty();
         }
-        if (this.pw) {
-            this.os = this.ot();
+        if (this.s4) {
+            this.r0 = this.r1();
         }
-        this.qx();
+        this.t5();
     };
-    Object.defineProperty(XamGeographicMap.prototype, "p1", {
+    Object.defineProperty(XamGeographicMap.prototype, "s9", {
         get: function () {
-            return this.pz;
+            return this.s7;
         },
         set: function (a) {
-            var b = this.pz;
-            this.pz = a;
-            this.k5("ActualWindowScale", b, this.pz);
+            var b = this.s7;
+            this.s7 = a;
+            this.nb("ActualWindowScale", b, this.s7);
         },
         enumerable: false,
         configurable: true
     });
-    XamGeographicMap.prototype.fe = function () {
-        return this.p1;
+    XamGeographicMap.prototype.f4 = function () {
+        return this.s9;
     };
-    XamGeographicMap.prototype.ff = function () {
-        return this.p1;
+    XamGeographicMap.prototype.f5 = function () {
+        return this.s9;
     };
-    XamGeographicMap.prototype.lz = function () {
-        _super.prototype.lz.call(this);
-        var a = Math.min(this.os.width, this.os.height);
-        this.p1 = a;
+    XamGeographicMap.prototype.n5 = function () {
+        _super.prototype.n5.call(this);
+        var a = Math.min(this.r0.width, this.r0.height);
+        this.s9 = a;
     };
-    XamGeographicMap.prototype.ea = function () {
-        return this.pt;
+    XamGeographicMap.prototype.ex = function () {
+        return this.s1;
     };
-    XamGeographicMap.prototype.bs = function () {
-        if (this.bt == 0) {
-            if (this.pu) {
+    XamGeographicMap.prototype.b6 = function () {
+        if (this.b7 == 0) {
+            if (this.s2) {
                 return 2;
             }
         }
-        return this.bt;
+        return this.b7;
     };
-    XamGeographicMap.prototype.k1 = function (a, b, c, d) {
-        var e_2, _a;
-        _super.prototype.k1.call(this, a, b, c, d);
+    XamGeographicMap.prototype.m7 = function (a, b, c, d) {
+        var e_2, _a, e_3, _b;
+        _super.prototype.m7.call(this, a, b, c, d);
         switch (b) {
             case "ZoomCoercionMode":
-                this.qm();
+                this.tu();
                 break;
             case "WindowRect":
-                this.qu();
+                this.t2();
                 break;
             case XamGeographicMap.$$p[0]:
-                this.pn = this.po();
-                if (this.pk != null) {
-                    this.pk.isHorizontalWrappingEnabled = this.pn == 2;
+                this.sv = this.sw();
+                if (this.ss != null) {
+                    this.ss.isHorizontalWrappingEnabled = this.sv == 2;
                 }
                 break;
             case XamGeographicMap.$$p[1]:
-                this.pt = this.pu;
-                this.pn = this.po();
-                this.br = this.bs();
-                if (this.pk != null) {
-                    this.pk.isHorizontalWrappingEnabled = this.pn == 2;
+                this.s1 = this.s2;
+                this.sv = this.sw();
+                this.b5 = this.b6();
+                if (this.ss != null) {
+                    this.ss.isHorizontalWrappingEnabled = this.sv == 2;
                 }
                 break;
             case XamGeographicMap.$$p[4]:
-                this.os = this.ot();
+                this.r0 = this.r1();
                 break;
             case "BackgroundContent":
-                if (this.pk != null) {
-                    var e = this.pk;
-                    e.imageTilesReady = delegateRemove(e.imageTilesReady, runOn(this, this.qn));
-                    this.pk.deferralHandler = null;
+                if (this.ss != null) {
+                    var e = this.ss;
+                    e.imageTilesReady = delegateRemove(e.imageTilesReady, runOn(this, this.tv));
+                    this.ss.deferralHandler = null;
                 }
-                this.pk = typeCast(GeographicMapImagery.$, this.backgroundContent);
-                if (this.pk != null) {
-                    var f = this.pk;
-                    f.imageTilesReady = delegateCombine(f.imageTilesReady, runOn(this, this.qn));
-                    this.pk.deferralHandler = this;
-                    this.pk.isHorizontalWrappingEnabled = this.pn == 2;
+                this.ss = typeCast(GeographicMapImagery.$, this.backgroundContent);
+                if (this.ss != null) {
+                    var f = this.ss;
+                    f.imageTilesReady = delegateCombine(f.imageTilesReady, runOn(this, this.tv));
+                    this.ss.deferralHandler = this;
+                    this.ss.isHorizontalWrappingEnabled = this.sv == 2;
                 }
-                this.pr.fp(typeCast(GeographicMapImagery.$, c), typeCast(GeographicMapImagery.$, d));
-                if (this.pk != null) {
-                    this.pk.geographicMap = this;
-                    this.pr.fm(this.os);
-                    this.pr.fq(this.e8);
+                this.sz.fu(typeCast(GeographicMapImagery.$, c), typeCast(GeographicMapImagery.$, d));
+                if (this.ss != null) {
+                    this.ss.geographicMap = this;
+                    this.sz.fr(this.r0);
+                    this.sz.fv(this.fy);
                 }
                 break;
             case "YAxis":
             case "XAxis":
-                this.qs(c);
-                this.ql(d);
+                this.t0(c);
+                this.tt(d);
                 break;
             case XamGeographicMap.$$p[6]:
-                if (!this.pv) {
-                    this.o8 = XamGeographicMap.rf;
+                if (!this.s3) {
+                    this.sg = XamGeographicMap.un;
                 }
-                this.qm();
-                this.qt();
-                this.qu();
-                this.os = this.ot();
-                this.pr.fn();
+                this.tu();
+                this.t1();
+                this.t2();
+                this.r0 = this.r1();
+                this.sz.fs();
                 break;
             case "ActualWindowRect":
-                this.pr.fm(this.os);
+                this.sz.fr(this.r0);
                 break;
             case "ActualWorldRect":
                 try {
-                    for (var _b = __values(fromEnum(this.series)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                        var g = _c.value;
-                        g.k3(false);
+                    for (var _c = __values(fromEnum(this.series)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                        var g = _d.value;
+                        g.l7(false);
                     }
                 }
                 catch (e_2_1) {
@@ -773,8 +763,8 @@ var XamGeographicMap = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
                 finally {
                     try {
-                        if (_c && !_c.done && (_a = _b.return))
-                            _a.call(_b);
+                        if (_d && !_d.done && (_a = _c.return))
+                            _a.call(_c);
                     }
                     finally {
                         if (e_2)
@@ -783,138 +773,159 @@ var XamGeographicMap = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
                 break;
             case XamGeographicMap.$$p[5]:
-                this.p1 = this.p2;
+                this.s9 = this.ta;
                 break;
             case "ActualWindowScale":
-                if (!this.ef) {
-                    this.mb(this.fe(), this.ff());
+                if (!this.e3) {
+                    this.oh(this.f4(), this.f5());
                 }
                 break;
             case "ActualPixelScalingRatio":
-                this.pr.fq(this.e8);
+                this.sz.fv(this.fy);
                 break;
             case XamGeographicMap.$$p[7]:
-                this.l7();
+                this.od();
+                break;
+            case "MarkerAutomaticBehavior":
+                try {
+                    for (var _e = __values(fromEnum(this.series)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                        var h = _f.value;
+                        h.k9();
+                    }
+                }
+                catch (e_3_1) {
+                    e_3 = { error: e_3_1 };
+                }
+                finally {
+                    try {
+                        if (_f && !_f.done && (_b = _e.return))
+                            _b.call(_e);
+                    }
+                    finally {
+                        if (e_3)
+                            throw e_3.error;
+                    }
+                }
                 break;
         }
     };
-    XamGeographicMap.prototype.qn = function (a, b) {
+    XamGeographicMap.prototype.tv = function (a, b) {
         if (this.imageTilesReady != null) {
             this.imageTilesReady(this, new ImageTilesReadyEventArgs());
         }
     };
-    XamGeographicMap.prototype.qs = function (a) {
+    XamGeographicMap.prototype.t0 = function (a) {
         if (a != null) {
             a.bh = null;
         }
     };
-    XamGeographicMap.prototype.qt = function () {
-        if (this.pf != null) {
-            this.pf.kl = this.rg.left;
-            this.pf.kk = this.rg.right;
+    XamGeographicMap.prototype.t1 = function () {
+        if (this.sn != null) {
+            this.sn.ll = this.uo.left;
+            this.sn.lk = this.uo.right;
         }
-        if (this.ph != null) {
-            this.ph.kl = this.rg.top;
-            this.ph.kk = this.rg.bottom;
+        if (this.sp != null) {
+            this.sp.ll = this.uo.top;
+            this.sp.lk = this.uo.bottom;
         }
-        this.pf.co(true);
-        this.ph.co(true);
+        this.sn.cz(true);
+        this.sp.cz(true);
     };
     XamGeographicMap.prototype.getFontInfo = function () {
-        this.ps = this.pr.fj;
-        return this.ps;
+        this.s0 = this.sz.fo;
+        return this.s0;
     };
-    XamGeographicMap.prototype.n5 = function () {
-        return this.pr.fr;
+    XamGeographicMap.prototype.q7 = function () {
+        return this.sz.fw;
     };
     XamGeographicMap.prototype.getFontBrush = function () {
-        return this.pr.fs;
+        return this.sz.fx;
     };
-    XamGeographicMap.prototype.ls = function (a, b) {
+    XamGeographicMap.prototype.ny = function (a, b) {
         if (typeCast(ItfConverter.$, b) !== null) {
             var c = b;
             var d = a;
             d.itemsSource = c.triangulationSource.points;
-            d.ok = c.triangulationSource.triangles;
+            d.p2 = c.triangulationSource.triangles;
         }
         else {
-            _super.prototype.ls.call(this, a, b);
+            _super.prototype.ny.call(this, a, b);
         }
     };
     XamGeographicMap.prototype.register = function (a, b) {
-        this.li(a, b);
+        this.no(a, b);
     };
     XamGeographicMap.prototype.unRegister = function (a) {
-        this.ly(a);
+        this.n4(a);
     };
     XamGeographicMap.prototype.deferredRefresh = function () {
-        this.iv();
+        this.kw();
     };
     XamGeographicMap.prototype.deferAction = function (a) {
-        if (this.p4 != null) {
-            this.p4.setTimeout(a, 0);
+        if (this.tc != null) {
+            this.tc.setTimeout(a, 0);
         }
         else {
             window.setTimeout(a, 0);
         }
     };
-    XamGeographicMap.prototype.qk = function (a) {
-        this.l6(a);
+    XamGeographicMap.prototype.ts = function (a) {
+        this.oc(a);
     };
-    XamGeographicMap.prototype.p5 = function () {
+    XamGeographicMap.prototype.td = function () {
         var a = new ChartVisualData();
-        var b = this.pf.e6();
-        var c = this.ph.e6();
+        var b = this.sn.fs();
+        var c = this.sp.fs();
         a.axes.add1(b);
         a.axes.add1(c);
         for (var d = 0; d < this.series.count; d++) {
-            var e = this.series._inner[d].gp();
+            var e = this.series._inner[d].hj();
             a.series.add1(e);
         }
         a.name = this.name;
-        a.contentArea = RectData.b(this.o7);
-        a.centralArea = RectData.b(this.o7);
-        a.plotArea = RectData.b(this.o7);
+        a.contentArea = RectData.b(this.sf);
+        a.centralArea = RectData.b(this.sf);
+        a.plotArea = RectData.b(this.sf);
         return a;
     };
-    XamGeographicMap.prototype.oz = function (a, b, c) {
+    XamGeographicMap.prototype.r7 = function (a, b, c) {
         return a;
     };
-    XamGeographicMap.prototype.qo = function () {
+    XamGeographicMap.prototype.tw = function () {
     };
-    Object.defineProperty(XamGeographicMap.prototype, "rr", {
+    Object.defineProperty(XamGeographicMap.prototype, "uz", {
         get: function () {
-            return this.rd;
+            return this.ul;
         },
         set: function (a) {
-            this.rd = a;
+            this.ul = a;
         },
         enumerable: false,
         configurable: true
     });
-    XamGeographicMap.prototype.qy = function (a) {
-        this.rr = a;
-        this.qx();
+    XamGeographicMap.prototype.t6 = function (a) {
+        this.uz = a;
+        this.t5();
     };
-    XamGeographicMap.prototype.qx = function () {
-        if (this.py && !this.rr.isEmpty) {
-            var a = this.getZoomFromGeographicRect(this.rr);
-            this.rr = Rect.empty;
-            this.mc(a, false);
+    XamGeographicMap.prototype.t5 = function () {
+        if (this.s6 && !this.uz.isEmpty) {
+            var a = this.getZoomFromGeographicRect(this.uz);
+            this.uz = Rect.empty;
+            this.oi(a, false);
         }
     };
-    Object.defineProperty(XamGeographicMap.prototype, "py", {
+    Object.defineProperty(XamGeographicMap.prototype, "s6", {
         get: function () {
-            return !this.o7.isEmpty && !this.ow.isEmpty;
+            return !this.sf.isEmpty && !this.r4.isEmpty;
         },
         enumerable: false,
         configurable: true
     });
     XamGeographicMap.$t = markType(XamGeographicMap, 'XamGeographicMap', SeriesViewer.$, [IMapRenderDeferralHandler_$type]);
-    XamGeographicMap.pp = 0;
-    XamGeographicMap.rc = new Rect(2, { $type: Point_$type, x: -180, y: -85.05112878 }, { $type: Point_$type, x: 180, y: 85.05112878 });
-    XamGeographicMap.rf = new Rect(0, 0, 0, 1, 1);
-    XamGeographicMap.$$p = markDep(DependencyProperty, PropertyMetadata, XamGeographicMap, 'k5', ['BackgroundTilingMode:pm:qz', [MapBackgroundTilingMode_$type, enumGetBox(MapBackgroundTilingMode_$type, 0)], 'IsHorizontalWrappingEnabled:pu:q0', [0, false], 'ResizeBehavior:pq:q1', [MapResizeBehavior_$type, enumGetBox(MapResizeBehavior_$type, XamGeographicMap.pp)], 'SuppressZoomResetOnWorldRectChange:pv:q2', [0, false], 'UseWorldRectForZoomBounds:pw:q3', [0, false], 'WindowScale:p2:q4', [1, NaN], 'WorldRect:rs:q5', [Rect.$, XamGeographicMap.rc], 'Zoomable:px:q6', [0, true]]);
+    XamGeographicMap.sx = 0;
+    XamGeographicMap.uk = new Rect(2, { $type: Point_$type, x: -180, y: -85.05112878 }, { $type: Point_$type, x: 180, y: 85.05112878 });
+    XamGeographicMap.un = new Rect(0, 0, 0, 1, 1);
+    XamGeographicMap.$$p = markDep(DependencyProperty, PropertyMetadata, XamGeographicMap, 'nb', ['BackgroundTilingMode:su:t7', [MapBackgroundTilingMode_$type, enumGetBox(MapBackgroundTilingMode_$type, 0)], 'IsHorizontalWrappingEnabled:s2:t8', [0, false], 'ResizeBehavior:sy:t9', [MapResizeBehavior_$type, enumGetBox(MapResizeBehavior_$type, XamGeographicMap.sx)], 'SuppressZoomResetOnWorldRectChange:s3:ua', [0, false], 'UseWorldRectForZoomBounds:s4:ub', [0, false], 'WindowScale:ta:uc', [1, NaN], 'WorldRect:u0:ud', [Rect.$, XamGeographicMap.uk], 'Zoomable:s5:ue', [0, true]]);
     return XamGeographicMap;
 }(SeriesViewer));
 export { XamGeographicMap };
@@ -1058,20 +1069,20 @@ var GeographicMapImagery = /** @class */ /*@__PURE__*/ (function (_super) {
             return a;
         }
         var b = new Rect(0, 0, 0, a.width, a.height);
-        var c = this.geographicMap.rl(b);
-        var d = XamGeographicMap.rc;
-        var e = this.geographicMap.rg;
+        var c = this.geographicMap.ut(b);
+        var d = XamGeographicMap.uk;
+        var e = this.geographicMap.uo;
         var f = Math.min(this.windowRect.height, this.windowRect.width);
         var g = e.width / d.width;
         this.ao.a5 = (b.width / c.width) * f * g;
-        var h = this.geographicMap.pf;
-        var i = this.geographicMap.ph;
-        var j = new ScalerParams(1, this.windowRect, b, h.ca);
+        var h = this.geographicMap.sn;
+        var i = this.geographicMap.sp;
+        var j = new ScalerParams(1, this.windowRect, b, h.cf);
         j.c = c;
-        var k = new ScalerParams(1, this.windowRect, b, i.ca);
+        var k = new ScalerParams(1, this.windowRect, b, i.cf);
         k.c = c;
-        var l = h.dz(d.left, j);
-        var m = i.dz(d.bottom, k);
+        var l = h.ef(d.left, j);
+        var m = i.ef(d.bottom, k);
         var n = (-l / b.width) * this.ao.a5;
         var o = (-m / b.height) * this.ao.a5 * (b.height / b.width);
         this.ao.cm = { $type: Point_$type, x: n, y: o };
@@ -1165,47 +1176,47 @@ var GeographicXYTriangulatingSeriesView = /** @class */ /*@__PURE__*/ (function
     __extends(GeographicXYTriangulatingSeriesView, _super);
     function GeographicXYTriangulatingSeriesView(a) {
         var _this = _super.call(this, a) || this;
-        _this.b3 = null;
-        _this.b3 = a;
+        _this.ce = null;
+        _this.ce = a;
         return _this;
     }
-    GeographicXYTriangulatingSeriesView.prototype.by = function () {
-        _super.prototype.by.call(this);
-        var a = this.b3.ob;
-        a.o7 = this.b3.on;
-        a.pb = this.b3.ol;
-        a.trianglesSource = this.b3.ok;
-        a.oz = this.b3.oq;
-        a.o1 = this.b3.os;
-        a.o3 = this.b3.ou;
-    };
-    GeographicXYTriangulatingSeriesView.prototype.b6 = function () {
-        var a = this.b3.ob;
-        if (this.b3.b6 == null) {
-            a.n9 = null;
-            a.oa = null;
+    GeographicXYTriangulatingSeriesView.prototype.b2 = function () {
+        _super.prototype.b2.call(this);
+        var a = this.ce.pt;
+        a.qp = this.ce.p5;
+        a.qt = this.ce.p3;
+        a.trianglesSource = this.ce.p2;
+        a.qh = this.ce.p8;
+        a.qj = this.ce.qa;
+        a.ql = this.ce.qc;
+    };
+    GeographicXYTriangulatingSeriesView.prototype.ch = function () {
+        var a = this.ce.pt;
+        if (this.ce.cb == null) {
+            a.pr = null;
+            a.ps = null;
             return;
         }
-        a.n9 = this.b3.b6.pf;
-        a.oa = this.b3.b6.ph;
+        a.pr = this.ce.cb.sn;
+        a.ps = this.ce.cb.sp;
     };
-    GeographicXYTriangulatingSeriesView.prototype.b5 = function () {
-        this.b3.ob.o7 = this.b3.on;
+    GeographicXYTriangulatingSeriesView.prototype.cg = function () {
+        this.ce.pt.qp = this.ce.p5;
     };
-    GeographicXYTriangulatingSeriesView.prototype.b4 = function () {
-        this.b3.ob.pb = this.b3.ol;
+    GeographicXYTriangulatingSeriesView.prototype.cf = function () {
+        this.ce.pt.qt = this.ce.p3;
     };
-    GeographicXYTriangulatingSeriesView.prototype.b7 = function () {
-        this.b3.ob.trianglesSource = this.b3.ok;
+    GeographicXYTriangulatingSeriesView.prototype.ci = function () {
+        this.ce.pt.trianglesSource = this.ce.p2;
     };
-    GeographicXYTriangulatingSeriesView.prototype.b8 = function () {
-        this.b3.ob.oz = this.b3.oq;
+    GeographicXYTriangulatingSeriesView.prototype.cj = function () {
+        this.ce.pt.qh = this.ce.p8;
     };
-    GeographicXYTriangulatingSeriesView.prototype.b9 = function () {
-        this.b3.ob.o1 = this.b3.os;
+    GeographicXYTriangulatingSeriesView.prototype.ck = function () {
+        this.ce.pt.qj = this.ce.qa;
     };
-    GeographicXYTriangulatingSeriesView.prototype.ca = function () {
-        this.b3.ob.o3 = this.b3.ou;
+    GeographicXYTriangulatingSeriesView.prototype.cl = function () {
+        this.ce.pt.ql = this.ce.qc;
     };
     GeographicXYTriangulatingSeriesView.$t = markType(GeographicXYTriangulatingSeriesView, 'GeographicXYTriangulatingSeriesView', HostSeriesView.$);
     return GeographicXYTriangulatingSeriesView;
@@ -1218,25 +1229,30 @@ var GeographicScatterAreaSeriesView = /** @class */ /*@__PURE__*/ (function (_su
     __extends(GeographicScatterAreaSeriesView, _super);
     function GeographicScatterAreaSeriesView(a) {
         var _this = _super.call(this, a) || this;
-        _this.cb = null;
-        _this.cb = a;
+        _this.cm = null;
+        _this.cm = a;
         return _this;
     }
-    GeographicScatterAreaSeriesView.prototype.by = function () {
-        _super.prototype.by.call(this);
-        if (this.cb.o4 != null) {
-            this.cb.o4.p2 = this.cb.o7;
-            this.cb.o4.pu = this.cb.o3;
+    GeographicScatterAreaSeriesView.prototype.as = function () {
+        _super.prototype.as.call(this);
+        if (!this.q) {
+        }
+    };
+    GeographicScatterAreaSeriesView.prototype.b2 = function () {
+        _super.prototype.b2.call(this);
+        if (this.cm.qn != null) {
+            this.cm.qn.rk = this.cm.qr;
+            this.cm.qn.rc = this.cm.qm;
         }
     };
-    GeographicScatterAreaSeriesView.prototype.cc = function () {
-        if (this.cb.o4 != null) {
-            this.cb.o4.p2 = this.cb.o7;
+    GeographicScatterAreaSeriesView.prototype.cn = function () {
+        if (this.cm.qn != null) {
+            this.cm.qn.rk = this.cm.qr;
         }
     };
-    GeographicScatterAreaSeriesView.prototype.cd = function () {
-        if (this.cb.o4 != null) {
-            this.cb.o4.pu = this.cb.o3;
+    GeographicScatterAreaSeriesView.prototype.co = function () {
+        if (this.cm.qn != null) {
+            this.cm.qn.rc = this.cm.qm;
         }
     };
     GeographicScatterAreaSeriesView.$t = markType(GeographicScatterAreaSeriesView, 'GeographicScatterAreaSeriesView', GeographicXYTriangulatingSeriesView.$);
@@ -1250,16 +1266,16 @@ var XamGeographicMapView = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(XamGeographicMapView, _super);
     function XamGeographicMapView(a) {
         var _this = _super.call(this, a) || this;
-        _this.fi = null;
-        _this.fy = null;
-        _this.fs = null;
-        _this.fr = null;
-        _this.fj = null;
-        _this.fk = NaN;
-        _this.fy = Rect.empty;
-        _this.fi = a;
-        _this.fi.n0 = 2;
-        _this.fi.fw = 5E-06;
+        _this.fn = null;
+        _this.fz = null;
+        _this.fx = null;
+        _this.fw = null;
+        _this.fo = null;
+        _this.fp = NaN;
+        _this.fz = Rect.empty;
+        _this.fn = a;
+        _this.fn.q2 = 2;
+        _this.fn.g0 = 5E-06;
         return _this;
     }
     XamGeographicMapView.prototype.m = function (a) {
@@ -1267,13 +1283,13 @@ var XamGeographicMapView = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     XamGeographicMapView.prototype.bk = function (a) {
         this.j.bv(a);
-        this.fi.qk(a);
-        this.ei();
+        this.fn.ts(a);
+        this.el();
     };
     XamGeographicMapView.prototype.get_ap = function () {
         return true;
     };
-    XamGeographicMapView.prototype.d1 = function () {
+    XamGeographicMapView.prototype.d4 = function () {
         var a;
         var b;
         var c;
@@ -1285,76 +1301,63 @@ var XamGeographicMapView = /** @class */ /*@__PURE__*/ (function (_super) {
         c = f.p2;
         d = f.p3;
         e = f.p4;
-        this.fs = c;
-        this.fj = d;
-        this.fr = e;
-    };
-    XamGeographicMapView.prototype.fu = function (a) {
-        return ((function () {
-            var $ret = new Brush();
-            $ret.fill = "#8bdc5c";
-            return $ret;
-        })());
-    };
-    XamGeographicMapView.prototype.fv = function (a) {
-        return ((function () {
-            var $ret = new Brush();
-            $ret.fill = "#8bdc5c";
-            return $ret;
-        })());
-    };
-    XamGeographicMapView.prototype.ft = function (a) {
-        return ((function () {
-            var $ret = new Brush();
-            $ret.fill = "rgba(50,50,50,.5)";
-            return $ret;
-        })());
-    };
-    XamGeographicMapView.prototype.fw = function (a) {
-        return ((function () {
-            var $ret = new Brush();
-            $ret.fill = "white";
-            return $ret;
-        })());
+        this.fx = c;
+        this.fo = d;
+        this.fw = e;
+        var g = this.j.e();
+        this.fn.ag = g.a;
+        this.fn.aj = g.f;
+        this.fn.ah = g.b != null ? g.b : new BrushCollection();
+        this.fn.ai = g.c != null ? g.c : new BrushCollection();
+        if (this.fn.ah.count == 0) {
+            for (var h = 0; h < g.a.count; h++) {
+                this.fn.ah.add(g.a.item(h));
+            }
+        }
+        if (g.c.count == 0) {
+            for (var i = 0; i < g.f.count; i++) {
+                this.fn.ai.add(g.f.item(i));
+            }
+        }
     };
-    XamGeographicMapView.prototype.dr = function (a) {
-        _super.prototype.dr.call(this, a);
-        if (this.fi.backgroundContent != null) {
-            var b = this.fi.backgroundContent;
+    XamGeographicMapView.prototype.du = function (a) {
+        _super.prototype.du.call(this, a);
+        if (this.fn.backgroundContent != null) {
+            var b = this.fn.backgroundContent;
             b.be(this.j.ae);
             b.bd(a);
         }
     };
-    XamGeographicMapView.prototype.ds = function (a) {
-        _super.prototype.ds.call(this, a);
-        this.fy = a;
-        if (this.fi.backgroundContent != null) {
-            var b = this.fi.backgroundContent;
-            b.bf(this.fy);
+    XamGeographicMapView.prototype.dv = function (a) {
+        _super.prototype.dv.call(this, a);
+        this.fz = a;
+        if (this.fn.backgroundContent != null) {
+            var b = this.fn.backgroundContent;
+            b.bf(this.fz);
         }
     };
-    XamGeographicMapView.prototype.fx = function () {
-        return new Rect(0, 0, 0, this.fy.width, this.fy.height);
+    XamGeographicMapView.prototype.fy = function () {
+        return new Rect(0, 0, 0, this.fz.width, this.fz.height);
     };
-    XamGeographicMapView.prototype.fn = function () {
-        if (this.fi.backgroundContent != null) {
-            var a = this.fi.backgroundContent;
+    XamGeographicMapView.prototype.fs = function () {
+        if (this.fn.backgroundContent != null) {
+            var a = this.fn.backgroundContent;
             a.a6();
         }
     };
-    XamGeographicMapView.prototype.fm = function (a) {
-        if (this.fi.pk != null) {
-            this.fi.pk.windowRect = a;
+    XamGeographicMapView.prototype.fr = function (a) {
+        if (this.fn.ss != null) {
+            this.fn.ss.windowRect = a;
         }
     };
-    XamGeographicMapView.prototype.fp = function (a, b) {
-        if (this.fi.pk != null) {
-            this.fi.pk.windowRect = this.fi.os;
+    XamGeographicMapView.prototype.fu = function (a, b) {
+        if (this.fn.ss != null) {
+            this.fn.ss.windowRect = this.fn.r0;
         }
         if (a != null) {
             var c = a.ao;
             if (c != null) {
-                this.fi.ah.e.remove(c.ag);
+                this.fn.al.e.remove(c.ag);
             }
             a.bd(null);
             a.be(null);
@@ -1362,49 +1365,49 @@ var XamGeographicMapView = /** @class */ /*@__PURE__*/ (function (_super) {
         if (b != null) {
             var d = b.ao;
             if (d != null) {
-                this.fi.ah.e.add(d.ag);
+                this.fn.al.e.add(d.ag);
             }
-            if (!this.fy.isEmpty) {
-                this.ds(this.fy);
+            if (!this.fz.isEmpty) {
+                this.dv(this.fz);
             }
             if (this.w != null) {
-                this.dr(this.w);
+                this.du(this.w);
             }
         }
         if (b == null) {
-            this.fo(this.w);
+            this.ft(this.w);
         }
     };
-    XamGeographicMapView.prototype.fo = function (a) {
-        var b = this.fi.e8;
+    XamGeographicMapView.prototype.ft = function (a) {
+        var b = this.fn.fy;
         if (b != 1) {
             a.z();
             a.aa(b, b);
         }
-        a.k(this.fy.left, this.fy.top, this.fy.width, this.fy.height);
+        a.k(this.fz.left, this.fz.top, this.fz.width, this.fz.height);
         if (b != 1) {
             a.y();
         }
     };
-    XamGeographicMapView.prototype.dy = function () {
-        this.fa.ac = 1;
-        this.fb.ac = 1;
-        this.fa._stroke = this.fs;
-        this.fb._stroke = this.fs;
-        _super.prototype.dy.call(this);
+    XamGeographicMapView.prototype.d1 = function () {
+        this.fd.ac = Defaults.j;
+        this.fe.ac = Defaults.j;
+        this.fd._stroke = Defaults.ae;
+        this.fe._stroke = Defaults.ae;
+        _super.prototype.d1.call(this);
     };
-    XamGeographicMapView.prototype.fq = function (a) {
-        this.fk = a;
-        if (this.fi.backgroundContent != null) {
-            this.fi.backgroundContent.bc(a);
+    XamGeographicMapView.prototype.fv = function (a) {
+        this.fp = a;
+        if (this.fn.backgroundContent != null) {
+            this.fn.backgroundContent.bc(a);
         }
     };
-    Object.defineProperty(XamGeographicMapView.prototype, "fl", {
+    Object.defineProperty(XamGeographicMapView.prototype, "fq", {
         get: function () {
-            return this.fk;
+            return this.fp;
         },
         set: function (a) {
-            this.fk = a;
+            this.fp = a;
         },
         enumerable: false,
         configurable: true
@@ -1456,41 +1459,41 @@ var GeographicXYTriangulatingSeries = /** @class */ /*@__PURE__*/ (function (_su
     function GeographicXYTriangulatingSeries() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    GeographicXYTriangulatingSeries.prototype.bp = function () {
+    GeographicXYTriangulatingSeries.prototype.bv = function () {
         return new GeographicXYTriangulatingSeriesView(this);
     };
-    GeographicXYTriangulatingSeries.prototype.kk = function (a) {
-        _super.prototype.kk.call(this, a);
-        this.oj = a;
+    GeographicXYTriangulatingSeries.prototype.lo = function (a) {
+        _super.prototype.lo.call(this, a);
+        this.p1 = a;
     };
-    GeographicXYTriangulatingSeries.prototype.kp = function (a, b, c, d) {
-        _super.prototype.kp.call(this, a, b, c, d);
+    GeographicXYTriangulatingSeries.prototype.lt = function (a, b, c, d) {
+        _super.prototype.lt.call(this, a, b, c, d);
         switch (b) {
             case "SeriesViewer":
-                this.oj.b6();
+                this.p1.ch();
                 break;
             case GeographicXYTriangulatingSeries.$$p[1]:
-                this.oj.b5();
+                this.p1.cg();
                 break;
             case GeographicXYTriangulatingSeries.$$p[0]:
-                this.oj.b4();
+                this.p1.cf();
                 break;
             case GeographicXYTriangulatingSeries.$$p[2]:
-                this.oj.b7();
+                this.p1.ci();
                 break;
             case GeographicXYTriangulatingSeries.$$p[3]:
-                this.oj.b8();
+                this.p1.cj();
                 break;
             case GeographicXYTriangulatingSeries.$$p[4]:
-                this.oj.b9();
+                this.p1.ck();
                 break;
             case GeographicXYTriangulatingSeries.$$p[5]:
-                this.oj.ca();
+                this.p1.cl();
                 break;
         }
     };
     GeographicXYTriangulatingSeries.$t = markType(GeographicXYTriangulatingSeries, 'GeographicXYTriangulatingSeries', GeographicMapSeriesHost.$);
-    GeographicXYTriangulatingSeries.$$p = markDep(DependencyProperty, PropertyMetadata, GeographicXYTriangulatingSeries, 'raisePropertyChanged', ['LatitudeMemberPath:ol:ow', [2, "pointY"], 'LongitudeMemberPath:on:ox', [2, "pointX"], 'TrianglesSource:ok:oy', [IEnumerable_$type, null], 'TriangleVertexMemberPath1:oq:oz', [2, "v1"], 'TriangleVertexMemberPath2:os:o0', [2, "v2"], 'TriangleVertexMemberPath3:ou:o1', [2, "v3"]]);
+    GeographicXYTriangulatingSeries.$$p = markDep(DependencyProperty, PropertyMetadata, GeographicXYTriangulatingSeries, 'raisePropertyChanged', ['LatitudeMemberPath:p3:qe', [2, "pointY"], 'LongitudeMemberPath:p5:qf', [2, "pointX"], 'TrianglesSource:p2:qg', [IEnumerable_$type, null], 'TriangleVertexMemberPath1:p8:qh', [2, "v1"], 'TriangleVertexMemberPath2:qa:qi', [2, "v2"], 'TriangleVertexMemberPath3:qc:qj', [2, "v3"]]);
     return GeographicXYTriangulatingSeries;
 }(GeographicMapSeriesHost));
 export { GeographicXYTriangulatingSeries };
@@ -1501,67 +1504,92 @@ var GeographicScatterAreaSeries = /** @class */ /*@__PURE__*/ (function (_super)
     __extends(GeographicScatterAreaSeries, _super);
     function GeographicScatterAreaSeries() {
         var _this = _super.call(this) || this;
-        _this.o2 = null;
+        _this.qk = null;
         _this.triangulationStatusChanged = null;
         _this.ab = GeographicScatterAreaSeries.$;
         return _this;
     }
-    Object.defineProperty(GeographicScatterAreaSeries.prototype, "o3", {
+    GeographicScatterAreaSeries.prototype.get_c9 = function () {
+        return true;
+    };
+    Object.defineProperty(GeographicScatterAreaSeries.prototype, "qm", {
         get: function () {
-            return this.o2;
+            return this.qk;
         },
         set: function (a) {
-            var b = this.o2 != a;
+            var b = this.qk != a;
             if (b) {
-                var c = this.o2;
-                this.o2 = a;
-                this.raisePropertyChanged("ColorScale", c, this.o2);
-                if (this.o4 != null) {
-                    this.o4.pu = a;
+                var c = this.qk;
+                if (this.qk != null) {
+                    var d = this.qk;
+                    d.propertyChanged = delegateRemove(d.propertyChanged, runOn(this, this.qu));
+                }
+                this.qk = a;
+                if (this.qk != null) {
+                    var e = this.qk;
+                    e.propertyChanged = delegateCombine(e.propertyChanged, runOn(this, this.qu));
+                }
+                this.raisePropertyChanged("ColorScale", c, this.qk);
+                if (this.qn != null) {
+                    this.qn.rc = a;
                 }
             }
         },
         enumerable: false,
         configurable: true
     });
-    GeographicScatterAreaSeries.prototype.oa = function () {
-        this.o4 = new ScatterAreaSeries();
-        var a = this.o4;
-        a.triangulationStatusChanged = delegateCombine(a.triangulationStatusChanged, runOn(this, this.pa));
-        return this.o4;
+    GeographicScatterAreaSeries.prototype.qu = function (a, b) {
+        this.qp.co();
+        this.qw();
+        this.l7(false);
+    };
+    GeographicScatterAreaSeries.prototype.qw = function () {
+        if (this.qn != null) {
+            this.ql = this.qn.rb;
+        }
+    };
+    GeographicScatterAreaSeries.prototype.mk = function () {
+        _super.prototype.mk.call(this);
+        this.qw();
+    };
+    GeographicScatterAreaSeries.prototype.ps = function () {
+        this.qn = new ScatterAreaSeries();
+        var a = this.qn;
+        a.triangulationStatusChanged = delegateCombine(a.triangulationStatusChanged, runOn(this, this.qv));
+        return this.qn;
     };
-    GeographicScatterAreaSeries.prototype.pa = function (a, b) {
+    GeographicScatterAreaSeries.prototype.qv = function (a, b) {
         if (this.triangulationStatusChanged != null) {
             this.triangulationStatusChanged(this, b);
         }
     };
-    GeographicScatterAreaSeries.prototype.bp = function () {
+    GeographicScatterAreaSeries.prototype.bv = function () {
         return new GeographicScatterAreaSeriesView(this);
     };
-    GeographicScatterAreaSeries.prototype.kk = function (a) {
-        _super.prototype.kk.call(this, a);
-        this.o6 = a;
+    GeographicScatterAreaSeries.prototype.lo = function (a) {
+        _super.prototype.lo.call(this, a);
+        this.qp = a;
     };
-    GeographicScatterAreaSeries.prototype.kp = function (a, b, c, d) {
-        _super.prototype.kp.call(this, a, b, c, d);
+    GeographicScatterAreaSeries.prototype.lt = function (a, b, c, d) {
+        _super.prototype.lt.call(this, a, b, c, d);
         switch (b) {
-            case GeographicScatterAreaSeries.$$p[0]:
-                this.o6.cc();
+            case GeographicScatterAreaSeries.$$p[1]:
+                this.qp.cn();
                 break;
             case "ColorScale":
-                this.o6.cd();
+                this.qp.co();
+                this.qw();
                 break;
         }
     };
-    GeographicScatterAreaSeries.prototype.get_d6 = function () {
+    GeographicScatterAreaSeries.prototype.get_ez = function () {
         return true;
     };
-    GeographicScatterAreaSeries.prototype.set_d6 = function (a) {
-        _super.prototype.set_d6.call(this, a);
+    GeographicScatterAreaSeries.prototype.set_ez = function (a) {
+        _super.prototype.set_ez.call(this, a);
     };
     GeographicScatterAreaSeries.$t = markType(GeographicScatterAreaSeries, 'GeographicScatterAreaSeries', GeographicXYTriangulatingSeries.$);
-    GeographicScatterAreaSeries.$$p = markDep(DependencyProperty, PropertyMetadata, GeographicScatterAreaSeries, 'raisePropertyChanged', ['ColorMemberPath:o7:pb', [2, "value"]]);
+    GeographicScatterAreaSeries.$$p = markDep(DependencyProperty, PropertyMetadata, GeographicScatterAreaSeries, 'raisePropertyChanged', ['ActualColorScale:ql:qx', [ColorScale.$, null], 'ColorMemberPath:qr:qy', [2, "value"]]);
     return GeographicScatterAreaSeries;
 }(GeographicXYTriangulatingSeries));
 export { GeographicScatterAreaSeries };
-//# sourceMappingURL=XamGeographicMap_combined.js.map