highcharts 9.3.3 → 10.0.0

package/es-modules/Extensions/GeoJSON.js

@@ -13,6 +13,8 @@ import F from '../Core/FormatUtilities.js';
 var format = F.format;
 import H from '../Core/Globals.js';
 var win = H.win;
+import MU from '../Maps/MapUtilities.js';
+var pointInPolygon = MU.pointInPolygon;
 import U from '../Core/Utilities.js';
 var error = U.error, extend = U.extend, merge = U.merge, wrap = U.wrap;
 /**
@@ -122,27 +124,27 @@ var error = U.error, extend = U.extend, merge = U.merge, wrap = U.wrap;
 /**
  * Result object of a map transformation.
  *
- * @interface Highcharts.MapCoordinateObject
+ * @interface Highcharts.ProjectedXY
  */ /**
-* X coordinate on the map.
-* @name Highcharts.MapCoordinateObject#x
+* X coordinate in projected units.
+* @name Highcharts.ProjectedXY#x
 * @type {number}
 */ /**
-* Y coordinate on the map.
-* @name Highcharts.MapCoordinateObject#y
-* @type {number|null}
+* Y coordinate in projected units
+* @name Highcharts.ProjectedXY#y
+* @type {number}
 */
 /**
  * A latitude/longitude object.
  *
- * @interface Highcharts.MapLatLonObject
+ * @interface Highcharts.MapLonLatObject
  */ /**
 * The latitude.
-* @name Highcharts.MapLatLonObject#lat
+* @name Highcharts.MapLonLatObject#lat
 * @type {number}
 */ /**
 * The longitude.
-* @name Highcharts.MapLatLonObject#lon
+* @name Highcharts.MapLonLatObject#lon
 * @type {number}
 */
 /**
@@ -150,29 +152,16 @@ var error = U.error, extend = U.extend, merge = U.merge, wrap = U.wrap;
  *
  * @typedef {Array<number>} Highcharts.LonLatArray
  */
-''; // detach doclets above
-/* eslint-disable no-invalid-this, valid-jsdoc */
 /**
- * Test for point in polygon. Polygon defined as array of [x,y] points.
- * @private
+ * A TopoJSON object, see description on the
+ * [project's GitHub page](https://github.com/topojson/topojson).
+ *
+ * @typedef {Object} Highcharts.TopoJSON
  */
-function pointInPolygon(point, polygon) {
-    var i, j, rel1, rel2, c = false, x = point.x, y = point.y;
-    for (i = 0, j = polygon.length - 1; i < polygon.length; j = i++) {
-        rel1 = polygon[i][1] > y;
-        rel2 = polygon[j][1] > y;
-        if (rel1 !== rel2 &&
-            (x < (polygon[j][0] -
-                polygon[i][0]) * (y - polygon[i][1]) /
-                (polygon[j][1] - polygon[i][1]) +
-                polygon[i][0])) {
-            c = !c;
-        }
-    }
-    return c;
-}
+''; // detach doclets above
+/* eslint-disable no-invalid-this, valid-jsdoc */
 /**
- * Highmaps only. Get point from latitude and longitude using specified
+ * Highcharts Maps only. Get point from latitude and longitude using specified
  * transform definition.
  *
  * @requires modules/map
@@ -182,14 +171,14 @@ function pointInPolygon(point, polygon) {
  *
  * @function Highcharts.Chart#transformFromLatLon
  *
- * @param {Highcharts.MapLatLonObject} latLon
+ * @param {Highcharts.MapLonLatObject} latLon
  *        A latitude/longitude object.
  *
  * @param {*} transform
  *        The transform definition to use as explained in the
  *        {@link https://www.highcharts.com/docs/maps/latlon|documentation}.
  *
- * @return {Highcharts.MapCoordinateObject}
+ * @return {ProjectedXY}
  *         An object with `x` and `y` properties.
  */
 Chart.prototype.transformFromLatLon = function (latLon, transform) {
@@ -206,10 +195,7 @@ Chart.prototype.transformFromLatLon = function (latLon, transform) {
     var proj4 = this.options.chart.proj4 || win.proj4;
     if (!proj4) {
         error(21, false, this);
-        return {
-            x: 0,
-            y: null
-        };
+        return;
     }
     var _a = transform.jsonmarginX, jsonmarginX = _a === void 0 ? 0 : _a, _b = transform.jsonmarginY, jsonmarginY = _b === void 0 ? 0 : _b, _c = transform.jsonres, jsonres = _c === void 0 ? 1 : _c, _d = transform.scale, scale = _d === void 0 ? 1 : _d, _e = transform.xoffset, xoffset = _e === void 0 ? 0 : _e, _f = transform.xpan, xpan = _f === void 0 ? 0 : _f, _g = transform.yoffset, yoffset = _g === void 0 ? 0 : _g, _h = transform.ypan, ypan = _h === void 0 ? 0 : _h;
     var projected = proj4(transform.crs, [latLon.lon, latLon.lat]), cosAngle = transform.cosAngle ||
@@ -224,26 +210,24 @@ Chart.prototype.transformFromLatLon = function (latLon, transform) {
     };
 };
 /**
- * Highmaps only. Get latLon from point using specified transform definition.
- * The method returns an object with the numeric properties `lat` and `lon`.
+ * Highcharts Maps only. Get latLon from point using specified transform
+ * definition. The method returns an object with the numeric properties `lat`
+ * and `lon`.
  *
  * @requires modules/map
  *
- * @sample maps/series/latlon-transform/
- *         Use specific transformation for lat/lon
+ * @sample maps/series/latlon-transform/ Use specific transformation for lat/lon
  *
  * @function Highcharts.Chart#transformToLatLon
  *
- * @param {Highcharts.Point|Highcharts.MapCoordinateObject} point
- *        A `Point` instance, or any object containing the properties `x` and
- *        `y` with numeric values.
+ * @param {Highcharts.Point|Highcharts.ProjectedXY} point A `Point` instance, or
+ *        any object containing the properties `x` and `y` with numeric values.
  *
- * @param {*} transform
- *        The transform definition to use as explained in the
+ * @param {*} transform The transform definition to use as explained in the
  *        {@link https://www.highcharts.com/docs/maps/latlon|documentation}.
  *
- * @return {Highcharts.MapLatLonObject|undefined}
- *         An object with `lat` and `lon` properties.
+ * @return {Highcharts.MapLonLatObject|undefined} An object with `lat` and `lon`
+ *         properties.
  */
 Chart.prototype.transformToLatLon = function (point, transform) {
     var proj4 = this.options.chart.proj4 || win.proj4;
@@ -269,114 +253,148 @@ Chart.prototype.transformToLatLon = function (point, transform) {
     return { lat: projected.y, lon: projected.x };
 };
 /**
- * Highmaps only. Calculate latitude/longitude values for a point. Returns an
- * object with the numeric properties `lat` and `lon`.
+ * Deprecated. Use `MapView.projectedUnitsToLonLat` instead.
  *
- * @requires modules/map
+ * @deprecated
  *
- * @sample maps/demo/latlon-advanced/
- *         Advanced lat/lon demo
+ * @requires modules/map
  *
  * @function Highcharts.Chart#fromPointToLatLon
  *
- * @param {Highcharts.Point|Highcharts.MapCoordinateObject} point
- *        A `Point` instance or anything containing `x` and `y` properties with
- *        numeric values.
+ * @param {Highcharts.Point|Highcharts.ProjectedXY} point A `Point`
+ *        instance or anything containing `x` and `y` properties with numeric
+ *        values.
  *
- * @return {Highcharts.MapLatLonObject|undefined}
- *         An object with `lat` and `lon` properties.
+ * @return {Highcharts.MapLonLatObject|undefined} An object with `lat` and `lon`
+ *         properties.
  */
 Chart.prototype.fromPointToLatLon = function (point) {
-    var transforms = this.mapTransforms;
-    if (!transforms) {
-        error(22, false, this);
-        return;
-    }
-    for (var transform in transforms) {
-        if (Object.hasOwnProperty.call(transforms, transform) &&
-            transforms[transform].hitZone &&
-            pointInPolygon(point, transforms[transform].hitZone.coordinates[0])) {
-            return this.transformToLatLon(point, transforms[transform]);
-        }
-    }
-    return this.transformToLatLon(point, transforms['default'] // eslint-disable-line dot-notation
-    );
+    return this.mapView && this.mapView.projectedUnitsToLonLat(point);
 };
 /**
- * Highmaps only. Get chart coordinates from latitude/longitude. Returns an
- * object with x and y values corresponding to the `xAxis` and `yAxis`.
+ * Deprecated. Use `MapView.lonLatToProjectedUnits` instead.
  *
- * @requires modules/map
+ * @deprecated
  *
- * @sample maps/series/latlon-to-point/
- *         Find a point from lat/lon
+ * @requires modules/map
  *
  * @function Highcharts.Chart#fromLatLonToPoint
  *
- * @param {Highcharts.MapLatLonObject} latLon
- *        Coordinates.
+ * @param {Highcharts.MapLonLatObject} lonLat Coordinates.
  *
- * @return {Highcharts.MapCoordinateObject}
- *         X and Y coordinates in terms of chart axis values.
+ * @return {Highcharts.ProjectedXY}
+ *      X and Y coordinates in terms of projected values
  */
-Chart.prototype.fromLatLonToPoint = function (latLon) {
-    var transforms = this.mapTransforms, transform, coords;
-    if (!transforms) {
-        error(22, false, this);
-        return {
-            x: 0,
-            y: null
-        };
+Chart.prototype.fromLatLonToPoint = function (lonLat) {
+    return this.mapView && this.mapView.lonLatToProjectedUnits(lonLat);
+};
+/*
+ * Convert a TopoJSON topology to GeoJSON. By default the first object is
+ * handled.
+ * Based on https://github.com/topojson/topojson-specification
+*/
+function topo2geo(topology, objectName) {
+    // Decode first object/feature as default
+    if (!objectName) {
+        objectName = Object.keys(topology.objects)[0];
     }
-    for (transform in transforms) {
-        if (Object.hasOwnProperty.call(transforms, transform) &&
-            transforms[transform].hitZone) {
-            coords = this.transformFromLatLon(latLon, transforms[transform]);
-            if (pointInPolygon(coords, transforms[transform].hitZone.coordinates[0])) {
-                return coords;
-            }
-        }
+    var object = topology.objects[objectName];
+    // Already decoded => return cache
+    if (object['hc-decoded-geojson']) {
+        return object['hc-decoded-geojson'];
     }
-    return this.transformFromLatLon(latLon, transforms['default'] // eslint-disable-line dot-notation
-    );
-};
+    // Do the initial transform
+    var arcsArray = topology.arcs;
+    if (topology.transform) {
+        var _a = topology.transform, scale_1 = _a.scale, translate_1 = _a.translate;
+        arcsArray = topology.arcs.map(function (arc) {
+            var x = 0, y = 0;
+            return arc.map(function (position) {
+                position = position.slice();
+                position[0] = (x += position[0]) * scale_1[0] + translate_1[0];
+                position[1] = (y += position[1]) * scale_1[1] + translate_1[1];
+                return position;
+            });
+        });
+    }
+    // Recurse down any depth of multi-dimentional arrays of arcs and insert
+    // the coordinates
+    var arcsToCoordinates = function (arcs) {
+        if (typeof arcs[0] === 'number') {
+            return arcs.reduce(function (coordinates, arcNo, i) {
+                var arc = arcNo < 0 ? arcsArray[~arcNo] : arcsArray[arcNo];
+                // The first point of an arc is always identical to the last
+                // point of the previes arc, so slice it off to save further
+                // processing.
+                if (arcNo < 0) {
+                    arc = arc.slice(0, i === 0 ? arc.length : arc.length - 1);
+                    arc.reverse();
+                }
+                else if (i) {
+                    arc = arc.slice(1);
+                }
+                return coordinates.concat(arc);
+            }, []);
+        }
+        return arcs.map(arcsToCoordinates);
+    };
+    var features = object.geometries
+        .map(function (geometry) { return ({
+        type: 'Feature',
+        properties: geometry.properties,
+        geometry: {
+            type: geometry.type,
+            coordinates: geometry.coordinates ||
+                arcsToCoordinates(geometry.arcs)
+        }
+    }); });
+    var geojson = {
+        type: 'FeatureCollection',
+        copyright: topology.copyright,
+        copyrightShort: topology.copyrightShort,
+        copyrightUrl: topology.copyrightUrl,
+        features: features,
+        'hc-recommended-mapview': object['hc-recommended-mapview'],
+        bbox: topology.bbox
+    };
+    object['hc-decoded-geojson'] = geojson;
+    return geojson;
+}
 /**
- * Highmaps only. Restructure a GeoJSON object in preparation to be read
- * directly by the
+ * Highcharts Maps only. Restructure a GeoJSON or TopoJSON object in preparation
+ * to be read directly by the
  * {@link https://api.highcharts.com/highmaps/plotOptions.series.mapData|series.mapData}
- * option. The GeoJSON will be broken down to fit a specific Highcharts type,
+ * option. The object will be broken down to fit a specific Highcharts type,
  * either `map`, `mapline` or `mappoint`. Meta data in GeoJSON's properties
- * object will be copied directly over to {@link Point.properties} in Highmaps.
+ * object will be copied directly over to {@link Point.properties} in Highcharts
+ * Maps.
  *
  * @requires modules/map
  *
- * @sample maps/demo/geojson/
- *         Simple areas
- * @sample maps/demo/geojson-multiple-types/
- *         Multiple types
+ * @sample maps/demo/geojson/ Simple areas
+ * @sample maps/demo/mapline-mappoint/ Multiple types
+ * @sample maps/series/mapdata-multiple/ Multiple map sources
  *
  * @function Highcharts.geojson
  *
- * @param {Highcharts.GeoJSON} geojson
- *        The GeoJSON structure to parse, represented as a JavaScript object
- *        rather than a JSON string.
+ * @param {Highcharts.GeoJSON|Highcharts.TopoJSON} json The GeoJSON or TopoJSON
+ *        structure to parse, represented as a JavaScript object.
  *
- * @param {string} [hType=map]
- *        The Highmaps series type to prepare for. Setting "map" will return
- *        GeoJSON polygons and multipolygons. Setting "mapline" will return
- *        GeoJSON linestrings and multilinestrings. Setting "mappoint" will
- *        return GeoJSON points and multipoints.
+ * @param {string} [hType=map] The Highcharts Maps series type to prepare for.
+ *        Setting "map" will return GeoJSON polygons and multipolygons. Setting
+ *        "mapline" will return GeoJSON linestrings and multilinestrings.
+ *        Setting "mappoint" will return GeoJSON points and multipoints.
  *
- * @return {Array<*>}
- *         An object ready for the `mapData` option.
+ *
+ * @return {Array<*>} An object ready for the `mapData` option.
  */
-H.geojson = function (geojson, hType, series) {
+function geojson(json, hType, series) {
     if (hType === void 0) { hType = 'map'; }
     var mapData = [];
-    var path = [];
+    var geojson = json.type === 'Topology' ? topo2geo(json) : json;
     geojson.features.forEach(function (feature) {
-        var geometry = feature.geometry || {}, type = geometry.type, coordinates = geometry.coordinates, properties = feature.properties, pointOptions;
-        path = [];
+        var geometry = feature.geometry || {}, type = geometry.type, coordinates = geometry.coordinates, properties = feature.properties;
+        var pointOptions;
         if ((hType === 'map' || hType === 'mapbubble') &&
             (type === 'Polygon' || type === 'MultiPolygon')) {
             if (coordinates.length) {
@@ -396,11 +414,12 @@ H.geojson = function (geojson, hType, series) {
             }
         }
         if (pointOptions) {
+            var name_1 = properties && (properties.name || properties.NAME);
             mapData.push(extend(pointOptions, {
-                name: properties.name || properties.NAME,
+                name: typeof name_1 === 'string' ? name_1 : void 0,
                 /**
-                 * In Highmaps, when data is loaded from GeoJSON, the GeoJSON
-                 * item's properies are copied over here.
+                 * In Highcharts Maps, when data is loaded from GeoJSON, the
+                 * GeoJSON item's properies are copied over here.
                  *
                  * @requires modules/map
                  * @name Highcharts.Point#properties
@@ -417,7 +436,7 @@ H.geojson = function (geojson, hType, series) {
         series.chart.mapCreditsFull = format(series.chart.options.credits.mapTextFull, { geojson: geojson });
     }
     return mapData;
-};
+}
 // Override addCredits to include map source by default
 wrap(Chart.prototype, 'addCredits', function (proceed, credits) {
     credits = merge(true, this.options.credits, credits);
@@ -434,3 +453,9 @@ wrap(Chart.prototype, 'addCredits', function (proceed, credits) {
         });
     }
 });
+H.geojson = geojson;
+var GeoJSONModule = {
+    geojson: geojson,
+    topo2geo: topo2geo
+};
+export default GeoJSONModule;

package/es-modules/Extensions/MarkerClusters.js

@@ -1209,13 +1209,27 @@ Scatter.prototype.hideClusteredData = function () {
 };
 // Override the generatePoints method by adding a reference to grouped data.
 Scatter.prototype.generatePoints = function () {
-    var series = this, chart = series.chart, mapView = chart.mapView, xAxis = series.xAxis, yAxis = series.yAxis, clusterOptions = series.options.cluster, realExtremes = series.getRealExtremes(), visibleXData = [], visibleYData = [], visibleDataIndexes = [], oldPointsState, oldDataLen, oldMarkerClusterInfo, kmeansThreshold, cropDataOffsetX, cropDataOffsetY, seriesMinX, seriesMaxX, seriesMinY, seriesMaxY, type, algorithm, clusteredData, groupedData, layoutAlgOptions, point, i;
+    var series = this, chart = series.chart, mapView = chart.mapView, xAxis = series.xAxis, yAxis = series.yAxis, xData = series.xData, yData = series.yData, clusterOptions = series.options.cluster, realExtremes = series.getRealExtremes(), visibleXData = [], visibleYData = [], visibleDataIndexes = [];
+    var oldPointsState, oldDataLen, oldMarkerClusterInfo, kmeansThreshold, cropDataOffsetX, cropDataOffsetY, seriesMinX, seriesMaxX, seriesMinY, seriesMaxY, type, algorithm, clusteredData, groupedData, layoutAlgOptions, point, i;
+    // For map point series, we need to resolve lon, lat and geometry options
+    // and project them on the plane in order to get x and y. In the regular
+    // series flow, this is not done until the `translate` method because the
+    // resulting [x, y] position depends on inset positions in the MapView.
+    if (mapView && series.is('mappoint') && xData && yData) {
+        (series.options.data || []).forEach(function (p, i) {
+            var xy = series.projectPoint(p);
+            if (xy) {
+                xData[i] = xy.x;
+                yData[i] = xy.y;
+            }
+        });
+    }
     if (clusterOptions &&
         clusterOptions.enabled &&
-        series.xData &&
-        series.xData.length &&
-        series.yData &&
-        series.yData.length &&
+        xData &&
+        xData.length &&
+        yData &&
+        yData.length &&
         !chart.polar) {
         type = clusterOptions.layoutAlgorithm.type;
         layoutAlgOptions = clusterOptions.layoutAlgorithm;
@@ -1231,34 +1245,34 @@ Scatter.prototype.generatePoints = function () {
         cropDataOffsetX = Math.abs(p1.x - p2.x);
         cropDataOffsetY = Math.abs(p1.y - p2.y);
         // Get only visible data.
-        for (i = 0; i < series.xData.length; i++) {
+        for (i = 0; i < xData.length; i++) {
             if (!series.dataMaxX) {
                 if (!defined(seriesMaxX) ||
                     !defined(seriesMinX) ||
                     !defined(seriesMaxY) ||
                     !defined(seriesMinY)) {
-                    seriesMaxX = seriesMinX = series.xData[i];
-                    seriesMaxY = seriesMinY = series.yData[i];
+                    seriesMaxX = seriesMinX = xData[i];
+                    seriesMaxY = seriesMinY = yData[i];
                 }
-                else if (isNumber(series.yData[i]) &&
+                else if (isNumber(yData[i]) &&
                     isNumber(seriesMaxY) &&
                     isNumber(seriesMinY)) {
-                    seriesMaxX = Math.max(series.xData[i], seriesMaxX);
-                    seriesMinX = Math.min(series.xData[i], seriesMinX);
-                    seriesMaxY = Math.max(series.yData[i] || seriesMaxY, seriesMaxY);
-                    seriesMinY = Math.min(series.yData[i] || seriesMinY, seriesMinY);
+                    seriesMaxX = Math.max(xData[i], seriesMaxX);
+                    seriesMinX = Math.min(xData[i], seriesMinX);
+                    seriesMaxY = Math.max(yData[i] || seriesMaxY, seriesMaxY);
+                    seriesMinY = Math.min(yData[i] || seriesMinY, seriesMinY);
                 }
             }
             // Crop data to visible ones with appropriate offset to prevent
             // cluster size changes on the edge of the plot area.
-            if (series.xData[i] >= (realExtremes.minX - cropDataOffsetX) &&
-                series.xData[i] <= (realExtremes.maxX + cropDataOffsetX) &&
-                (series.yData[i] || realExtremes.minY) >=
+            if (xData[i] >= (realExtremes.minX - cropDataOffsetX) &&
+                xData[i] <= (realExtremes.maxX + cropDataOffsetX) &&
+                (yData[i] || realExtremes.minY) >=
                     (realExtremes.minY - cropDataOffsetY) &&
-                (series.yData[i] || realExtremes.maxY) <=
+                (yData[i] || realExtremes.maxY) <=
                     (realExtremes.maxY + cropDataOffsetY)) {
-                visibleXData.push(series.xData[i]);
-                visibleYData.push(series.yData[i]);
+                visibleXData.push(xData[i]);
+                visibleYData.push(yData[i]);
                 visibleDataIndexes.push(i);
             }
         }
@@ -1303,7 +1317,7 @@ Scatter.prototype.generatePoints = function () {
             oldPointsState = {};
         }
         // Save points old state info.
-        oldDataLen = series.xData.length;
+        oldDataLen = xData.length;
         oldMarkerClusterInfo = series.markerClusterInfo;
         if (clusteredData) {
             series.processedXData = clusteredData.groupedXData;