highcharts 9.2.2 → 9.3.0

package/es-modules/Series/MapBubble/MapBubblePoint.js

@@ -65,9 +65,6 @@ var MapBubblePoint = /** @class */ (function (_super) {
     };
     return MapBubblePoint;
 }(BubbleSeries.prototype.pointClass));
-extend(MapBubblePoint.prototype, {
-    ttBelow: false
-});
 /* *
  *
  *  Default Export

package/es-modules/Series/MapBubble/MapBubbleSeries.js

@@ -25,6 +25,7 @@ import BubbleSeries from '../Bubble/BubbleSeries.js';
 import MapBubblePoint from './MapBubblePoint.js';
 import MapSeries from '../Map/MapSeries.js';
 import SeriesRegistry from '../../Core/Series/SeriesRegistry.js';
+var MapPointSeries = SeriesRegistry.seriesTypes.mappoint;
 import U from '../../Core/Utilities.js';
 var extend = U.extend, merge = U.merge;
 import '../../Core/DefaultOptions.js';
@@ -56,6 +57,11 @@ var MapBubbleSeries = /** @class */ (function (_super) {
         _this.points = void 0;
         return _this;
     }
+    MapBubbleSeries.prototype.translate = function () {
+        MapPointSeries.prototype.translate.call(this);
+        this.getRadii();
+        this.translateBubble();
+    };
     /* *
      *
      *  Static Properties
@@ -191,12 +197,15 @@ var MapBubbleSeries = /** @class */ (function (_super) {
 }(BubbleSeries));
 extend(MapBubbleSeries.prototype, {
     type: 'mapbubble',
-    getBox: MapSeries.prototype.getBox,
+    axisTypes: ['colorAxis'],
+    getProjectedBounds: MapSeries.prototype.getProjectedBounds,
+    isCartesian: false,
     // If one single value is passed, it is interpreted as z
     pointArrayMap: ['z'],
     pointClass: MapBubblePoint,
     setData: MapSeries.prototype.setData,
     setOptions: MapSeries.prototype.setOptions,
+    useMapGeometry: true,
     xyFromShape: true
 });
 SeriesRegistry.registerSeriesType('mapbubble', MapBubbleSeries);

package/es-modules/Series/MapPoint/MapPointPoint.js

@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
 import SeriesRegistry from '../../Core/Series/SeriesRegistry.js';
 var ScatterSeries = SeriesRegistry.seriesTypes.scatter;
 import U from '../../Core/Utilities.js';
-var merge = U.merge;
+var isNumber = U.isNumber, merge = U.merge;
 /* *
  *
  *  Class
@@ -57,6 +57,10 @@ var MapPointPoint = /** @class */ (function (_super) {
             options);
         return _super.prototype.applyOptions.call(this, mergedOptions, x);
     };
+    MapPointPoint.prototype.isValid = function () {
+        return Boolean(this.options.geometry ||
+            (isNumber(this.x) && isNumber(this.y)));
+    };
     return MapPointPoint;
 }(ScatterSeries.prototype.pointClass));
 /* *

package/es-modules/Series/MapPoint/MapPointSeries.js

@@ -21,12 +21,13 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+import H from '../../Core/Globals.js';
+var noop = H.noop;
 import MapPointPoint from './MapPointPoint.js';
-import palette from '../../Core/Color/Palette.js';
 import SeriesRegistry from '../../Core/Series/SeriesRegistry.js';
 var ScatterSeries = SeriesRegistry.seriesTypes.scatter;
 import U from '../../Core/Utilities.js';
-var extend = U.extend, merge = U.merge;
+var extend = U.extend, fireEvent = U.fireEvent, isNumber = U.isNumber, merge = U.merge;
 import '../../Core/DefaultOptions.js';
 import '../Scatter/ScatterSeries.js';
 /* *
@@ -73,6 +74,49 @@ var MapPointSeries = /** @class */ (function (_super) {
             this.dataLabelsGroup.clip(this.chart.clipRect);
         }
     };
+    MapPointSeries.prototype.translate = function () {
+        var _this = this;
+        var mapView = this.chart.mapView;
+        if (!this.processedXData) {
+            this.processData();
+        }
+        this.generatePoints();
+        // Create map based translation
+        if (mapView) {
+            var _a = mapView.projection, forward_1 = _a.forward, hasCoordinates_1 = _a.hasCoordinates;
+            this.points.forEach(function (p) {
+                var _a = p.x, x = _a === void 0 ? void 0 : _a, _b = p.y, y = _b === void 0 ? void 0 : _b;
+                var geometry = p.options.geometry, coordinates = (geometry &&
+                    geometry.type === 'Point' &&
+                    geometry.coordinates);
+                if (coordinates) {
+                    var xy = forward_1(coordinates);
+                    x = xy[0];
+                    y = xy[1];
+                    // Map bubbles getting geometry from shape
+                }
+                else if (p.bounds) {
+                    x = p.bounds.midX;
+                    y = p.bounds.midY;
+                }
+                if (isNumber(x) && isNumber(y)) {
+                    var plotCoords = mapView.projectedUnitsToPixels({ x: x, y: y });
+                    p.plotX = plotCoords.x;
+                    p.plotY = hasCoordinates_1 ?
+                        plotCoords.y :
+                        _this.chart.plotHeight - plotCoords.y;
+                }
+                else {
+                    p.plotX = void 0;
+                    p.plotY = void 0;
+                }
+                p.isInside = _this.isPointInside(p);
+                // Find point zone
+                p.zone = _this.zones.length ? p.getZone() : void 0;
+            });
+        }
+        fireEvent(this, 'afterTranslate');
+    };
     /**
      * A mappoint series is a special form of scatter series where the points
      * can be laid out in map coordinates on top of a map.
@@ -95,7 +139,7 @@ var MapPointSeries = /** @class */ (function (_super) {
             overflow: false,
             style: {
                 /** @internal */
-                color: palette.neutralColor100
+                color: "#000000" /* neutralColor100 */
             }
         }
     });
@@ -103,8 +147,11 @@ var MapPointSeries = /** @class */ (function (_super) {
 }(ScatterSeries));
 extend(MapPointSeries.prototype, {
     type: 'mappoint',
+    axisTypes: ['colorAxis'],
     forceDL: true,
-    pointClass: MapPointPoint
+    isCartesian: false,
+    pointClass: MapPointPoint,
+    searchPoint: noop
 });
 SeriesRegistry.registerSeriesType('mappoint', MapPointSeries);
 /* *
@@ -177,6 +224,42 @@ export default MapPointSeries;
  * @product   highmaps
  * @apioption series.mappoint.data
  */
+/**
+ * The geometry of a point.
+ *
+ * To achieve a better separation between the structure and the data,
+ * it is recommended to use `mapData` to define the geometry instead
+ * of defining it on the data points themselves.
+ *
+ * The geometry object is compatible to that of a `feature` in geoJSON, so
+ * features of geoJSON can be passed directly into the `data`, optionally
+ * after first filtering and processing it.
+ *
+ * @sample maps/series/data-geometry/
+ *         geometry defined in data
+ *
+ * @type      {Object}
+ * @since 9.3.0
+ * @product   highmaps
+ * @apioption series.mappoint.data.geometry
+ */
+/**
+ * The geometry type, which in case of the `mappoint` series is always `Point`.
+ *
+ * @type      {string}
+ * @since 9.3.0
+ * @product   highmaps
+ * @validvalue ["Point"]
+ * @apioption series.mappoint.data.geometry.type
+ */
+/**
+ * The geometry coordinates in terms of `[longitude, latitude]`.
+ *
+ * @type      {Highcharts.LonLatArray}
+ * @since 9.3.0
+ * @product   highmaps
+ * @apioption series.mappoint.data.geometry.coordinates
+ */
 /**
  * The latitude of the point. Must be combined with the `lon` option
  * to work. Overrides `x` and `y` values.

package/es-modules/Series/Networkgraph/Networkgraph.js

@@ -24,7 +24,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 import H from '../../Core/Globals.js';
-import NodesMixin from '../../Mixins/Nodes.js';
+import NodesComposition from '../NodesComposition.js';
 import Point from '../../Core/Series/Point.js';
 import Series from '../../Core/Series/Series.js';
 import SeriesRegistry from '../../Core/Series/SeriesRegistry.js';
@@ -497,12 +497,12 @@ extend(NetworkgraphSeries.prototype, {
      * links.
      * @private
      */
-    createNode: NodesMixin.createNode,
+    createNode: NodesComposition.createNode,
     destroy: function () {
         if (this.layout) {
             this.layout.removeElementFromCollection(this, this.layout.series);
         }
-        NodesMixin.destroy.call(this);
+        NodesComposition.destroy.call(this);
     },
     /* eslint-disable no-invalid-this, valid-jsdoc */
     /**
@@ -534,7 +534,7 @@ extend(NetworkgraphSeries.prototype, {
      */
     generatePoints: function () {
         var node, i;
-        NodesMixin.generatePoints.apply(this, arguments);
+        NodesComposition.generatePoints.apply(this, arguments);
         // In networkgraph, it's fine to define stanalone nodes, create
         // them:
         if (this.options.nodes) {
@@ -789,7 +789,7 @@ var NetworkgraphPoint = /** @class */ (function (_super) {
     return NetworkgraphPoint;
 }(Series.prototype.pointClass));
 extend(NetworkgraphPoint.prototype, {
-    setState: NodesMixin.setNodeState,
+    setState: NodesComposition.setNodeState,
     /**
      * Basic `point.init()` and additional styles applied when
      * `series.draggable` is enabled.

package/es-modules/{Mixins/Nodes.js → Series/NodesComposition.js}

@@ -4,28 +4,61 @@
  *
  * */
 'use strict';
-import H from '../Core/Globals.js';
 import Point from '../Core/Series/Point.js';
 import Series from '../Core/Series/Series.js';
 import U from '../Core/Utilities.js';
 var defined = U.defined, extend = U.extend, find = U.find, pick = U.pick;
-var NodesMixin = H.NodesMixin = {
+/* *
+ *
+ *  Composition
+ *
+ * */
+var NodesComposition;
+(function (NodesComposition) {
+    /* *
+     *
+     *  Declarations
+     *
+     * */
+    /* *
+     *
+     *  Constants
+     *
+     * */
+    var composedClasses = [];
+    /* *
+     *
+     *  Functions
+     *
+     * */
     /* eslint-disable valid-jsdoc */
+    /**
+     * @private
+     */
+    function compose(PointClass, SeriesClass) {
+        if (composedClasses.indexOf(PointClass) === -1) {
+            composedClasses.push(PointClass);
+            var pointProto = PointClass.prototype;
+            pointProto.setNodeState = setNodeState;
+            pointProto.setState = setNodeState;
+        }
+        if (composedClasses.indexOf(SeriesClass) === -1) {
+            composedClasses.push(SeriesClass);
+            var seriesProto = SeriesClass.prototype;
+            seriesProto.destroy = destroy;
+            seriesProto.setData = setData;
+        }
+        return SeriesClass;
+    }
+    NodesComposition.compose = compose;
     /**
      * Create a single node that holds information on incoming and outgoing
      * links.
      * @private
      */
-    createNode: function (id) {
-        /**
-         * @private
-         */
-        function findById(nodes, id) {
-            return find(nodes, function (node) {
-                return node.id === id;
-            });
-        }
-        var node = findById(this.nodes, id), PointClass = this.pointClass, options;
+    function createNode(id) {
+        var PointClass = this.pointClass, findById = function (nodes, id) { return find(nodes, function (node) { return node.id === id; }); };
+        var node = findById(this.nodes, id), options;
         if (!node) {
             options = this.options.nodes && findById(this.options.nodes, id);
             node = (new PointClass()).init(this, extend({
@@ -88,12 +121,24 @@ var NodesMixin = H.NodesMixin = {
             this.nodes.push(node);
         }
         return node;
-    },
+    }
+    NodesComposition.createNode = createNode;
+    /**
+     * Destroy alll nodes and links.
+     * @private
+     */
+    function destroy() {
+        // Nodes must also be destroyed (#8682, #9300)
+        this.data = []
+            .concat(this.points || [], this.nodes);
+        return Series.prototype.destroy.apply(this, arguments);
+    }
+    NodesComposition.destroy = destroy;
     /**
      * Extend generatePoints by adding the nodes, which are Point objects
      * but pushed to the this.nodes array.
      */
-    generatePoints: function () {
+    function generatePoints() {
         var chart = this.chart, nodeLookup = {};
         Series.prototype.generatePoints.call(this);
         if (!this.nodes) {
@@ -134,9 +179,13 @@ var NodesMixin = H.NodesMixin = {
         }, this);
         // Store lookup table for later use
         this.nodeLookup = nodeLookup;
-    },
-    // Destroy all nodes on setting new data
-    setData: function () {
+    }
+    NodesComposition.generatePoints = generatePoints;
+    /**
+     * Destroy all nodes on setting new data
+     * @private
+     */
+    function setData() {
         if (this.nodes) {
             this.nodes.forEach(function (node) {
                 node.destroy();
@@ -144,19 +193,12 @@ var NodesMixin = H.NodesMixin = {
             this.nodes.length = 0;
         }
         Series.prototype.setData.apply(this, arguments);
-    },
-    // Destroy alll nodes and links
-    destroy: function () {
-        // Nodes must also be destroyed (#8682, #9300)
-        this.data = []
-            .concat(this.points || [], this.nodes);
-        return Series.prototype.destroy.apply(this, arguments);
-    },
+    }
     /**
      * When hovering node, highlight all connected links. When hovering a link,
      * highlight all connected nodes.
      */
-    setNodeState: function (state) {
+    function setNodeState(state) {
         var args = arguments, others = this.isNode ? this.linksTo.concat(this.linksFrom) :
             [this.fromNode, this.toNode];
         if (state !== 'select') {
@@ -176,6 +218,11 @@ var NodesMixin = H.NodesMixin = {
         }
         Point.prototype.setState.apply(this, args);
     }
-    /* eslint-enable valid-jsdoc */
-};
-export default NodesMixin;
+    NodesComposition.setNodeState = setNodeState;
+})(NodesComposition || (NodesComposition = {}));
+/* *
+ *
+ *  Default Export
+ *
+ * */
+export default NodesComposition;

package/es-modules/Series/OHLC/OHLCPoint.js

@@ -22,7 +22,7 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 import SeriesRegistry from '../../Core/Series/SeriesRegistry.js';
-var ColumnSeries = SeriesRegistry.seriesTypes.column;
+var HLCSeries = SeriesRegistry.seriesTypes.hlc;
 /* *
  *
  *  Class
@@ -37,12 +37,8 @@ var OHLCPoint = /** @class */ (function (_super) {
          *
          * */
         var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this.close = void 0;
-        _this.high = void 0;
-        _this.low = void 0;
         _this.open = void 0;
         _this.options = void 0;
-        _this.plotClose = void 0;
         _this.plotOpen = void 0;
         _this.series = void 0;
         return _this;
@@ -112,7 +108,7 @@ var OHLCPoint = /** @class */ (function (_super) {
         return this;
     };
     return OHLCPoint;
-}(ColumnSeries.prototype.pointClass));
+}(HLCSeries.prototype.pointClass));
 /* *
  *
  *  Default Export