highcharts 9.2.2 → 9.3.0

package/es-modules/Extensions/Boost/BoostOverrides.js

@@ -220,7 +220,8 @@ wrap(Series.prototype, 'getExtremes', function (proceed) {
 // If the series is a heatmap or treemap, or if the series is not boosting
 // do the default behaviour. Otherwise, process if the series has no extremes.
 wrap(Series.prototype, 'processData', function (proceed) {
-    var series = this, dataToMeasure = this.options.data, firstPoint;
+    var series = this;
+    var dataToMeasure = this.options.data;
     /**
      * Used twice in this function, first on this.options.data, the second
      * time it runs the check again after processedXData is built.
@@ -254,6 +255,7 @@ wrap(Series.prototype, 'processData', function (proceed) {
         // Enter or exit boost mode
         if (this.isSeriesBoosting) {
             // Force turbo-mode:
+            var firstPoint = void 0;
             if (this.options.data && this.options.data.length) {
                 firstPoint = this.getFirstValidPoint(this.options.data);
                 if (!isNumber(firstPoint) && !isArray(firstPoint)) {

package/es-modules/Extensions/Boost/WGLShader.js

@@ -371,7 +371,8 @@ function GLShader(gl) {
      */
     function setBubbleUniforms(series, zCalcMin, zCalcMax) {
         var seriesOptions = series.options, zMin = Number.MAX_VALUE, zMax = -Number.MAX_VALUE;
-        if (gl && shaderProgram && series.type === 'bubble') {
+        if (gl && shaderProgram && series.is('bubble')) {
+            var pxSizes = series.getPxExtremes();
             zMin = pick(seriesOptions.zMin, clamp(zCalcMin, seriesOptions.displayNegative === false ?
                 seriesOptions.zThreshold : -Number.MAX_VALUE, zMin));
             zMax = pick(seriesOptions.zMax, Math.max(zMax, zCalcMax));
@@ -383,8 +384,8 @@ function GLShader(gl) {
             setUniform('bubbleZMin', zMin);
             setUniform('bubbleZMax', zMax);
             setUniform('bubbleZThreshold', series.options.zThreshold);
-            setUniform('bubbleMinSize', series.minPxSize);
-            setUniform('bubbleMaxSize', series.maxPxSize);
+            setUniform('bubbleMinSize', pxSizes.minPxSize);
+            setUniform('bubbleMaxSize', pxSizes.maxPxSize);
         }
     }
     /**

package/es-modules/Extensions/BoostCanvas.js

@@ -18,7 +18,6 @@ import Color from '../Core/Color/Color.js';
 var color = Color.parse;
 import H from '../Core/Globals.js';
 var doc = H.doc, noop = H.noop;
-import palette from '../Core/Color/Palette.js';
 import Series from '../Core/Series/Series.js';
 import SeriesRegistry from '../Core/Series/SeriesRegistry.js';
 var seriesTypes = SeriesRegistry.seriesTypes;
@@ -295,7 +294,7 @@ var initCanvasBoost = function () {
             if (rawData.length > 99999) {
                 chart.options.loading = merge(loadingOptions, {
                     labelStyle: {
-                        backgroundColor: color(palette.backgroundColor).setOpacity(0.75).get(),
+                        backgroundColor: color("#ffffff" /* backgroundColor */).setOpacity(0.75).get(),
                         padding: '1em',
                         borderRadius: '0.5em'
                     },

package/es-modules/Extensions/CurrentDateIndication.js

@@ -11,7 +11,6 @@
  * */
 'use strict';
 import Axis from '../Core/Axis/Axis.js';
-import Palette from '../Core/Color/Palette.js';
 import PlotLineOrBand from '../Core/Axis/PlotLineOrBand/PlotLineOrBand.js';
 import U from '../Core/Utilities.js';
 var addEvent = U.addEvent, merge = U.merge, wrap = U.wrap;
@@ -34,7 +33,7 @@ var addEvent = U.addEvent, merge = U.merge, wrap = U.wrap;
  * @apioption xAxis.currentDateIndicator
  */
 var defaultOptions = {
-    color: Palette.highlightColor20,
+    color: "#ccd6eb" /* highlightColor20 */,
     width: 2,
     /**
      * @declare Highcharts.AxisCurrentDateIndicatorLabelOptions
@@ -42,7 +41,7 @@ var defaultOptions = {
     label: {
         /**
          * Format of the label. This options is passed as the fist argument to
-         * [dateFormat](/class-reference/Highcharts#.dateFormat) function.
+         * [dateFormat](/class-reference/Highcharts.Time#dateFormat) function.
          *
          * @type      {string}
          * @default   %a, %b %d %Y, %H:%M

package/es-modules/Extensions/DataGrouping.js

@@ -120,8 +120,18 @@ var approximations = H.approximations = {
             arr[arr.length - 1] :
             (arr.hasNulls ? null : void 0);
     },
-    // ohlc and range are special cases where a multidimensional array is
-    // input and an array is output
+    // HLC, OHLC and range are special cases where a multidimensional array is
+    // input and an array is output.
+    hlc: function (high, low, close) {
+        high = approximations.high(high);
+        low = approximations.low(low);
+        close = approximations.close(close);
+        if (isNumber(high) ||
+            isNumber(low) ||
+            isNumber(close)) {
+            return [high, low, close];
+        }
+    },
     ohlc: function (open, high, low, close) {
         open = approximations.open(open);
         high = approximations.high(high);
@@ -133,7 +143,6 @@ var approximations = H.approximations = {
             isNumber(close)) {
             return [open, high, low, close];
         }
-        // else, return is undefined
     },
     range: function (low, high) {
         low = approximations.low(low);
@@ -147,16 +156,16 @@ var approximations = H.approximations = {
         // else, return is undefined
     }
 };
-var applyGrouping = function () {
+var applyGrouping = function (hasExtemesChanged) {
     var series = this, chart = series.chart, options = series.options, dataGroupingOptions = options.dataGrouping, groupingEnabled = series.allowDG !== false && dataGroupingOptions &&
         pick(dataGroupingOptions.enabled, chart.options.isStock), visible = (series.visible || !chart.options.chart.ignoreHiddenSeries), hasGroupedData, skip, lastDataGrouping = this.currentDataGrouping, currentDataGrouping, croppedData, revertRequireSorting = false;
     // Data needs to be sorted for dataGrouping
     if (groupingEnabled && !series.requireSorting) {
         series.requireSorting = revertRequireSorting = true;
     }
-    // Skip if processData returns false or if grouping is disabled (in that
-    // order)
-    skip = skipDataGrouping(series) || !groupingEnabled;
+    // Skip if skipDataGrouping method returns false or if grouping is disabled
+    // (in that order).
+    skip = skipDataGrouping(series, hasExtemesChanged) === false || !groupingEnabled;
     // Revert original requireSorting value if changed
     if (revertRequireSorting) {
         series.requireSorting = false;
@@ -242,13 +251,12 @@ var applyGrouping = function () {
                 (currentDataGrouping && currentDataGrouping.totalRange);
     }
 };
-var skipDataGrouping = function (series) {
-    if (series.isCartesian &&
+var skipDataGrouping = function (series, force) {
+    return !(series.isCartesian &&
         !series.isDirty &&
         !series.xAxis.isDirty &&
-        !series.yAxis.isDirty) {
-        return false;
-    }
+        !series.yAxis.isDirty &&
+        !force);
 };
 var groupData = function (xData, yData, groupPositions, approximation) {
     var series = this, data = series.data, dataOptions = series.options && series.options.data, groupedXData = [], groupedYData = [], groupMap = [], dataLength = xData.length, pointX, pointY, groupedY, 
@@ -523,7 +531,10 @@ commonOptions = {
     ohlc: {
         groupPixelWidth: 5
     },
-    // Move to HeikinAshiSeries.ts aftre refactoring data grouping.
+    hlc: {
+        groupPixelWidth: 5
+        // Move to HeikinAshiSeries.ts aftre refactoring data grouping.
+    },
     heikinashi: {
         groupPixelWidth: 10
     }
@@ -566,6 +577,9 @@ seriesProto.getDGApproximation = function () {
     if (this.is('ohlc')) {
         return 'ohlc';
     }
+    if (this.is('hlc')) {
+        return 'hlc';
+    }
     if (this.is('column')) {
         return 'sum';
     }
@@ -631,7 +645,7 @@ seriesProto.generatePoints = function () {
  *
  * @function Highcharts.Axis#applyGrouping
  */
-Axis.prototype.applyGrouping = function () {
+Axis.prototype.applyGrouping = function (e) {
     var axis = this, series = axis.series;
     series.forEach(function (series) {
         // Reset the groupPixelWidth, then calculate if needed.
@@ -642,7 +656,7 @@ Axis.prototype.applyGrouping = function () {
         }
         // Fire independing on series.groupPixelWidth to always set a proper
         // dataGrouping state, (#16238)
-        series.applyGrouping();
+        series.applyGrouping(!!e.hasExtemesChanged);
     });
 };
 // Get the data grouping pixel width based on the greatest defined individual
@@ -669,8 +683,7 @@ Axis.prototype.getGroupPixelWidth = function () {
             // Execute grouping if the amount of points is greater than the
             // limit defined in groupPixelWidth
             if (series[i].groupPixelWidth ||
-                dataLength >
-                    (this.chart.plotSizeX / groupPixelWidth) ||
+                dataLength > (this.chart.plotSizeX / groupPixelWidth) ||
                 (dataLength && dgOptions.forced)) {
                 doGrouping = true;
             }
@@ -891,7 +904,7 @@ export default dataGrouping;
  * from the raw data.
  *
  * Defaults to `average` for line-type series, `sum` for columns, `range`
- * for range series and `ohlc` for OHLC and candlestick.
+ * for range series, `hlc` for HLC, and `ohlc` for OHLC and candlestick.
  *
  * @sample {highstock} stock/plotoptions/series-datagrouping-approximation
  *         Approximation callback with custom data

package/es-modules/Extensions/DownloadURL.js

@@ -99,8 +99,8 @@ var downloadURL = Highcharts.downloadURL = function (dataURL, filename) {
         }
     }
 };
-var exports = {
+var DownloadURL = {
     dataURLtoBlob: dataURLtoBlob,
     downloadURL: downloadURL
 };
-export default exports;
+export default DownloadURL;

package/es-modules/Extensions/DragPanes.js

@@ -16,7 +16,6 @@ import H from '../Core/Globals.js';
 var hasTouch = H.hasTouch;
 import Axis from '../Core/Axis/Axis.js';
 import AxisDefaults from '../Core/Axis/AxisDefaults.js';
-import palette from '../Core/Color/Palette.js';
 import Pointer from '../Core/Pointer.js';
 import U from '../Core/Utilities.js';
 var addEvent = U.addEvent, clamp = U.clamp, isNumber = U.isNumber, merge = U.merge, objectEach = U.objectEach, relativeLength = U.relativeLength, wrap = U.wrap;
@@ -412,7 +411,7 @@ var AxisResizer = /** @class */ (function () {
              * @type     {Highcharts.ColorString}
              * @requires modules/drag-panes
              */
-            lineColor: palette.neutralColor20,
+            lineColor: "#cccccc" /* neutralColor20 */,
             /**
              * Dash style of the control line.
              *

package/es-modules/Extensions/Drilldown.js

@@ -22,7 +22,6 @@ import H from '../Core/Globals.js';
 var noop = H.noop;
 import D from '../Core/DefaultOptions.js';
 var defaultOptions = D.defaultOptions;
-import palette from '../Core/Color/Palette.js';
 import Point from '../Core/Series/Point.js';
 import Series from '../Core/Series/Series.js';
 import SeriesRegistry from '../Core/Series/SeriesRegistry.js';
@@ -226,7 +225,7 @@ defaultOptions.drilldown = {
         /** @ignore-option */
         cursor: 'pointer',
         /** @ignore-option */
-        color: palette.highlightColor100,
+        color: "#003399" /* highlightColor100 */,
         /** @ignore-option */
         fontWeight: 'bold',
         /** @ignore-option */
@@ -250,7 +249,7 @@ defaultOptions.drilldown = {
      */
     activeDataLabelStyle: {
         cursor: 'pointer',
-        color: palette.highlightColor100,
+        color: "#003399" /* highlightColor100 */,
         fontWeight: 'bold',
         textDecoration: 'underline'
     },

package/es-modules/Extensions/Exporting/Exporting.js

@@ -12,7 +12,7 @@
 'use strict';
 import AST from '../../Core/Renderer/HTML/AST.js';
 import Chart from '../../Core/Chart/Chart.js';
-import chartNavigationMixin from '../../Mixins/Navigation.js';
+import ChartNavigationComposition from '../../Core/Chart/ChartNavigationComposition.js';
 import D from '../../Core/DefaultOptions.js';
 var defaultOptions = D.defaultOptions;
 import ExportingDefaults from './ExportingDefaults.js';
@@ -20,7 +20,6 @@ import ExportingSymbols from './ExportingSymbols.js';
 import G from '../../Core/Globals.js';
 var doc = G.doc, win = G.win;
 import HU from '../../Core/HttpUtilities.js';
-import Palette from '../../Core/Color/Palette.js';
 import U from '../../Core/Utilities.js';
 var addEvent = U.addEvent, css = U.css, createElement = U.createElement, discardElement = U.discardElement, extend = U.extend, find = U.find, fireEvent = U.fireEvent, isObject = U.isObject, merge = U.merge, objectEach = U.objectEach, pick = U.pick, removeEvent = U.removeEvent, uniqueKey = U.uniqueKey;
 /* *
@@ -108,7 +107,7 @@ var Exporting;
         var attr = btnOptions.theme, states = attr.states, hover = states && states.hover, select = states && states.select;
         var callback;
         if (!chart.styledMode) {
-            attr.fill = pick(attr.fill, Palette.backgroundColor);
+            attr.fill = pick(attr.fill, "#ffffff" /* backgroundColor */);
             attr.stroke = pick(attr.stroke, 'none');
         }
         delete attr.states;
@@ -142,7 +141,7 @@ var Exporting;
         }
         if (!chart.styledMode) {
             attr['stroke-linecap'] = 'round';
-            attr.fill = pick(attr.fill, Palette.backgroundColor);
+            attr.fill = pick(attr.fill, "#ffffff" /* backgroundColor */);
             attr.stroke = pick(attr.stroke, 'none');
         }
         var button = renderer
@@ -1018,9 +1017,11 @@ var Exporting;
         // Register update() method for navigation. Can not be set the same way
         // as for exporting, because navigation options are shared with bindings
         // which has separate update() logic.
-        chartNavigationMixin.addUpdate(function (options, redraw) {
+        ChartNavigationComposition
+            .compose(chart).navigation
+            .addUpdate(function (options, redraw) {
             update('navigation', options, redraw);
-        }, chart);
+        });
     }
     /**
      * Exporting module required. Clears away other elements in the page and
@@ -1155,7 +1156,7 @@ defaultOptions.lang = merge(ExportingDefaults.lang, defaultOptions.lang);
 // zoom and pan right click menus.
 /**
  * A collection of options for buttons and menus appearing in the exporting
- * module.
+ * module or in Stock Tools.
  *
  * @requires     modules/exporting
  * @optionparent navigation

package/es-modules/Extensions/Exporting/ExportingDefaults.js

@@ -10,7 +10,6 @@
 'use strict';
 import H from '../../Core/Globals.js';
 var isTouchDevice = H.isTouchDevice;
-import Palette from '../../Core/Color/Palette.js';
 /* *
  *
  *  API Options
@@ -523,12 +522,6 @@ var lang = {
      */
     contextButtonTitle: 'Chart context menu'
 };
-/**
- * A collection of options for buttons and menus appearing in the exporting
- * module.
- *
- * @optionparent navigation
- */
 var navigation = {
     /**
      * A collection of options for buttons appearing in the exporting
@@ -659,7 +652,7 @@ var navigation = {
          * @type  {Highcharts.ColorString|Highcharts.GradientColorObject|Highcharts.PatternObject}
          * @since 2.0
          */
-        symbolFill: Palette.neutralColor60,
+        symbolFill: "#666666" /* neutralColor60 */,
         /**
          * The color of the symbol's stroke or line.
          *
@@ -669,7 +662,7 @@ var navigation = {
          * @type  {Highcharts.ColorString}
          * @since 2.0
          */
-        symbolStroke: Palette.neutralColor60,
+        symbolStroke: "#666666" /* neutralColor60 */,
         /**
          * The pixel stroke width of the symbol on the button.
          *
@@ -697,7 +690,7 @@ var navigation = {
              * The default fill exists only to capture hover events.
              *
              * @type      {Highcharts.ColorString|Highcharts.GradientColorObject|Highcharts.PatternObject}
-             * @default   ${palette.backgroundColor}
+             * @default   #ffffff
              * @apioption navigation.buttonOptions.theme.fill
              */
             /**
@@ -730,9 +723,9 @@ var navigation = {
      */
     menuStyle: {
         /** @ignore-option */
-        border: "1px solid " + Palette.neutralColor40,
+        border: "1px solid " + "#999999" /* neutralColor40 */,
         /** @ignore-option */
-        background: Palette.backgroundColor,
+        background: "#ffffff" /* backgroundColor */,
         /** @ignore-option */
         padding: '5px 0'
     },
@@ -758,7 +751,7 @@ var navigation = {
         /** @ignore-option */
         padding: '0.5em 1em',
         /** @ignore-option */
-        color: Palette.neutralColor80,
+        color: "#333333" /* neutralColor80 */,
         /** @ignore-option */
         background: 'none',
         /** @ignore-option */
@@ -785,9 +778,9 @@ var navigation = {
      */
     menuItemHoverStyle: {
         /** @ignore-option */
-        background: Palette.highlightColor80,
+        background: "#335cad" /* highlightColor80 */,
         /** @ignore-option */
-        color: Palette.backgroundColor
+        color: "#ffffff" /* backgroundColor */
     }
 };
 /* *

package/es-modules/Extensions/GeoJSON.js

@@ -145,6 +145,11 @@ var error = U.error, extend = U.extend, merge = U.merge, wrap = U.wrap;
 * @name Highcharts.MapLatLonObject#lon
 * @type {number}
 */
+/**
+ * An array of longitude, latitude.
+ *
+ * @typedef {Array<number>} Highcharts.LonLatArray
+ */
 ''; // detach doclets above
 /* eslint-disable no-invalid-this, valid-jsdoc */
 /**
@@ -198,9 +203,7 @@ Chart.prototype.transformFromLatLon = function (latLon, transform) {
      * @product    highmaps
      * @apioption  chart.proj4
      */
-    var proj4 = (this.userOptions.chart &&
-        this.userOptions.chart.proj4 ||
-        win.proj4);
+    var proj4 = this.options.chart.proj4 || win.proj4;
     if (!proj4) {
         error(21, false, this);
         return {
@@ -208,6 +211,7 @@ Chart.prototype.transformFromLatLon = function (latLon, transform) {
             y: null
         };
     }
+    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 ||
         (transform.rotation && Math.cos(transform.rotation)), sinAngle = transform.sinAngle ||
         (transform.rotation && Math.sin(transform.rotation)), rotated = transform.rotation ? [
@@ -215,12 +219,8 @@ Chart.prototype.transformFromLatLon = function (latLon, transform) {
         -projected[0] * sinAngle + projected[1] * cosAngle
     ] : projected;
     return {
-        x: ((rotated[0] - (transform.xoffset || 0)) * (transform.scale || 1) +
-            (transform.xpan || 0)) * (transform.jsonres || 1) +
-            (transform.jsonmarginX || 0),
-        y: (((transform.yoffset || 0) - rotated[1]) * (transform.scale || 1) +
-            (transform.ypan || 0)) * (transform.jsonres || 1) -
-            (transform.jsonmarginY || 0)
+        x: ((rotated[0] - xoffset) * scale + xpan) * jsonres + jsonmarginX,
+        y: -(((yoffset - rotated[1]) * scale + ypan) * jsonres - jsonmarginY)
     };
 };
 /**
@@ -246,18 +246,18 @@ Chart.prototype.transformFromLatLon = function (latLon, transform) {
  *         An object with `lat` and `lon` properties.
  */
 Chart.prototype.transformToLatLon = function (point, transform) {
-    if (typeof win.proj4 === 'undefined') {
+    var proj4 = this.options.chart.proj4 || win.proj4;
+    if (!proj4) {
         error(21, false, this);
         return;
     }
+    if (point.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 normalized = {
-        x: ((point.x -
-            (transform.jsonmarginX || 0)) / (transform.jsonres || 1) -
-            (transform.xpan || 0)) / (transform.scale || 1) +
-            (transform.xoffset || 0),
-        y: ((-point.y - (transform.jsonmarginY || 0)) / (transform.jsonres || 1) +
-            (transform.ypan || 0)) / (transform.scale || 1) +
-            (transform.yoffset || 0)
+        x: ((point.x - jsonmarginX) / jsonres - xpan) / scale + xoffset,
+        y: ((point.y - jsonmarginY) / jsonres + ypan) / scale + yoffset
     }, cosAngle = transform.cosAngle ||
         (transform.rotation && Math.cos(transform.rotation)), sinAngle = transform.sinAngle ||
         (transform.rotation && Math.sin(transform.rotation)), 
@@ -287,15 +287,15 @@ Chart.prototype.transformToLatLon = function (point, transform) {
  *         An object with `lat` and `lon` properties.
  */
 Chart.prototype.fromPointToLatLon = function (point) {
-    var transforms = this.mapTransforms, transform;
+    var transforms = this.mapTransforms;
     if (!transforms) {
         error(22, false, this);
         return;
     }
-    for (transform in transforms) {
+    for (var transform in transforms) {
         if (Object.hasOwnProperty.call(transforms, transform) &&
             transforms[transform].hitZone &&
-            pointInPolygon({ x: point.x, y: -point.y }, transforms[transform].hitZone.coordinates[0])) {
+            pointInPolygon(point, transforms[transform].hitZone.coordinates[0])) {
             return this.transformToLatLon(point, transforms[transform]);
         }
     }
@@ -332,7 +332,7 @@ Chart.prototype.fromLatLonToPoint = function (latLon) {
         if (Object.hasOwnProperty.call(transforms, transform) &&
             transforms[transform].hitZone) {
             coords = this.transformFromLatLon(latLon, transforms[transform]);
-            if (pointInPolygon({ x: coords.x, y: -coords.y }, transforms[transform].hitZone.coordinates[0])) {
+            if (pointInPolygon(coords, transforms[transform].hitZone.coordinates[0])) {
                 return coords;
             }
         }
@@ -371,56 +371,32 @@ Chart.prototype.fromLatLonToPoint = function (latLon) {
  *         An object ready for the `mapData` option.
  */
 H.geojson = function (geojson, hType, series) {
-    var mapData = [], path = [], polygonToPath = function (polygon) {
-        polygon.forEach(function (point, i) {
-            if (i === 0) {
-                path.push(['M', point[0], -point[1]]);
-            }
-            else {
-                path.push(['L', point[0], -point[1]]);
-            }
-        });
-    };
-    hType = hType || 'map';
+    if (hType === void 0) { hType = 'map'; }
+    var mapData = [];
+    var path = [];
     geojson.features.forEach(function (feature) {
-        var geometry = feature.geometry, type = geometry.type, coordinates = geometry.coordinates, properties = feature.properties, point;
+        var geometry = feature.geometry || {}, type = geometry.type, coordinates = geometry.coordinates, properties = feature.properties, pointOptions;
         path = [];
-        if (hType === 'map' || hType === 'mapbubble') {
-            if (type === 'Polygon') {
-                coordinates.forEach(polygonToPath);
-                path.push(['Z']);
-            }
-            else if (type === 'MultiPolygon') {
-                coordinates.forEach(function (items) {
-                    items.forEach(polygonToPath);
-                });
-                path.push(['Z']);
-            }
-            if (path.length) {
-                point = { path: path };
+        if ((hType === 'map' || hType === 'mapbubble') &&
+            (type === 'Polygon' || type === 'MultiPolygon')) {
+            if (coordinates.length) {
+                pointOptions = { geometry: { coordinates: coordinates, type: type } };
             }
         }
-        else if (hType === 'mapline') {
-            if (type === 'LineString') {
-                polygonToPath(coordinates);
-            }
-            else if (type === 'MultiLineString') {
-                coordinates.forEach(polygonToPath);
-            }
-            if (path.length) {
-                point = { path: path };
+        else if (hType === 'mapline' &&
+            (type === 'LineString' ||
+                type === 'MultiLineString')) {
+            if (coordinates.length) {
+                pointOptions = { geometry: { coordinates: coordinates, type: type } };
             }
         }
-        else if (hType === 'mappoint') {
-            if (type === 'Point') {
-                point = {
-                    x: coordinates[0],
-                    y: -coordinates[1]
-                };
+        else if (hType === 'mappoint' && type === 'Point') {
+            if (coordinates.length) {
+                pointOptions = { geometry: { coordinates: coordinates, type: type } };
             }
         }
-        if (point) {
-            mapData.push(extend(point, {
+        if (pointOptions) {
+            mapData.push(extend(pointOptions, {
                 name: properties.name || properties.NAME,
                 /**
                  * In Highmaps, when data is loaded from GeoJSON, the GeoJSON