highcharts 9.2.1 → 9.3.2

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'
     },
@@ -319,7 +318,7 @@ defaultOptions.drilldown = {
          * @sample {highmaps} highcharts/drilldown/drillupbutton/
          *         Button theming
          *
-         * @type      {object}
+         * @type      {Object}
          * @since     3.0.8
          * @product   highcharts highmaps
          * @apioption drilldown.drillUpButton.theme
@@ -726,8 +725,13 @@ addEvent(Chart, 'afterInit', function () {
 });
 // Shift the drillUpButton to make the space for resetZoomButton, #8095.
 addEvent(Chart, 'afterShowResetZoom', function () {
-    var chart = this, bbox = chart.resetZoomButton && chart.resetZoomButton.getBBox(), buttonOptions = chart.options.drilldown && chart.options.drilldown.drillUpButton;
-    if (this.drillUpButton && bbox && buttonOptions && buttonOptions.position && buttonOptions.position.x) {
+    var chart = this, bbox = chart.resetZoomButton && chart.resetZoomButton.getBBox(), buttonOptions = (chart.options.drilldown &&
+        chart.options.drilldown.drillUpButton);
+    if (this.drillUpButton &&
+        bbox &&
+        buttonOptions &&
+        buttonOptions.position &&
+        buttonOptions.position.x) {
         this.drillUpButton.align({
             x: buttonOptions.position.x - bbox.width - 10,
             y: buttonOptions.position.y,
@@ -1149,7 +1153,7 @@ addEvent(Point, 'afterSetState', function () {
 // After zooming out, shift the drillUpButton to the previous position, #8095.
 addEvent(Chart, 'selection', function (event) {
     if (event.resetSelection === true && this.drillUpButton) {
-        var buttonOptions = this.options.drilldown && this.options.drilldown.drillUpButton;
+        var buttonOptions = (this.options.drilldown && this.options.drilldown.drillUpButton);
         if (buttonOptions && buttonOptions.position) {
             this.drillUpButton.align({
                 x: buttonOptions.position.x,

package/es-modules/Extensions/ExportData.js

@@ -338,7 +338,7 @@ Chart.prototype.setUpKeyToAxis = function () {
  * @return {Array<Array<(number|string)>>}
  *         The current chart data
  *
- * @fires Highcharts.Chart#event:exportData
+ * @emits Highcharts.Chart#event:exportData
  */
 Chart.prototype.getDataRows = function (multiLevelHeaders) {
     var hasParallelCoords = this.hasParallelCoordinates, time = this.time, csvOptions = ((this.options.exporting && this.options.exporting.csv) || {}), xAxis, xAxes = this.xAxis, rows = {}, rowArr = [], dataRows, topLevelColumnTitles = [], columnTitles = [], columnTitleObj, i, x, xTitle, langOptions = this.options.lang, exportDataOptions = langOptions.exportData, categoryHeader = exportDataOptions.categoryHeader, categoryDatetimeHeader = exportDataOptions.categoryDatetimeHeader, 
@@ -397,7 +397,8 @@ Chart.prototype.getDataRows = function (multiLevelHeaders) {
             !xAxis.categories &&
             !series.keyToAxis) {
             if (series.pointArrayMap) {
-                var pointArrayMapCheck = series.pointArrayMap.filter(function (p) { return p === 'x'; });
+                var pointArrayMapCheck = series.pointArrayMap
+                    .filter(function (p) { return p === 'x'; });
                 if (pointArrayMapCheck.length) {
                     series.pointArrayMap.unshift('x');
                     return series.pointArrayMap;
@@ -613,7 +614,7 @@ Chart.prototype.getCSV = function (useLocalDecimalPoint) {
  * @return {string}
  *         HTML representation of the data.
  *
- * @fires Highcharts.Chart#event:afterGetTable
+ * @emits Highcharts.Chart#event:afterGetTable
  */
 Chart.prototype.getTable = function (useLocalDecimalPoint) {
     var serialize = function (node) {
@@ -905,7 +906,7 @@ Chart.prototype.downloadXLS = function () {
  *
  * @function Highcharts.Chart#viewData
  *
- * @fires Highcharts.Chart#event:afterViewData
+ * @emits Highcharts.Chart#event:afterViewData
  */
 Chart.prototype.viewData = function () {
     this.toggleDataTable(true);
@@ -932,7 +933,7 @@ Chart.prototype.toggleDataTable = function (show) {
         this.dataTableDiv.style.display = show ? 'block' : 'none';
         // Generate the data table
         if (show) {
-            this.dataTableDiv.innerHTML = '';
+            this.dataTableDiv.innerHTML = AST.emptyHTML;
             var ast = new AST([this.getTableAST()]);
             ast.addToDOM(this.dataTableDiv);
             fireEvent(this, 'afterViewData', this.dataTableDiv);

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;
 /* *
@@ -88,7 +87,6 @@ var Exporting;
      * @private
      * @function Highcharts.Chart#addButton
      * @param {Highcharts.NavigationButtonOptions} options
-     * @return {void}
      * @requires modules/exporting
      */
     function addButton(options) {
@@ -108,7 +106,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 +140,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
@@ -193,9 +191,8 @@ var Exporting;
      *
      * @param {Highcharts.Chart} chart
      *        Chart that was (or suppose to be) printed
-     * @return {void}
      *
-     * @fires Highcharts.Chart#event:afterPrint
+     * @emits Highcharts.Chart#event:afterPrint
      */
     function afterPrint() {
         var chart = this;
@@ -227,9 +224,8 @@ var Exporting;
      *
      * @private
      *
-     * @return {void}
      *
-     * @fires Highcharts.Chart#event:beforePrint
+     * @emits Highcharts.Chart#event:beforePrint
      */
     function beforePrint() {
         var chart = this, body = doc.body, printMaxWidth = chart.options.exporting.printMaxWidth, printReverseInfo = {
@@ -241,7 +237,8 @@ var Exporting;
         chart.pointer.reset(null, 0);
         fireEvent(chart, 'beforePrint');
         // Handle printMaxWidth
-        var handleMaxWidth = printMaxWidth && chart.chartWidth > printMaxWidth;
+        var handleMaxWidth = printMaxWidth &&
+            chart.chartWidth > printMaxWidth;
         if (handleMaxWidth) {
             printReverseInfo.resetParams = [
                 chart.options.chart.width,
@@ -364,7 +361,6 @@ var Exporting;
      *        The width of the opener button
      * @param {number} height
      *        The height of the opener button
-     * @return {void}
      * @requires modules/exporting
      */
     function contextMenu(className, items, x, y, width, height, button) {
@@ -437,9 +433,10 @@ var Exporting;
                         element = createElement('hr', void 0, void 0, innerMenu);
                     }
                     else {
-                        // When chart initialized with the table,
-                        // wrong button text displayed, #14352.
-                        if (item.textKey === 'viewData' && chart.isDataTableVisible) {
+                        // When chart initialized with the table, wrong button
+                        // text displayed, #14352.
+                        if (item.textKey === 'viewData' &&
+                            chart.isDataTableVisible) {
                             item.textKey = 'hideData';
                         }
                         element = createElement('li', {
@@ -507,7 +504,6 @@ var Exporting;
      * @private
      * @function Highcharts.Chart#destroyExport
      * @param {global.Event} [e]
-     * @return {void}
      * @requires modules/exporting
      */
     function destroyExport(e) {
@@ -610,8 +606,8 @@ var Exporting;
      *
      * @function Highcharts.Chart#getChartHTML
      *
-     * @returns {string}
-     *          The unfiltered SVG of the chart.
+     * @return {string}
+     * The unfiltered SVG of the chart.
      *
      * @requires modules/exporting
      */
@@ -670,7 +666,7 @@ var Exporting;
      * @return {string}
      *         The SVG representation of the rendered chart.
      *
-     * @fires Highcharts.Chart#event:getSVG
+     * @emits Highcharts.Chart#event:getSVG
      *
      * @requires modules/exporting
      */
@@ -740,8 +736,8 @@ var Exporting;
                 }));
             }
         });
-        // generate the chart copy
-        var chartCopy = new Chart(options, chart.callback);
+        // Generate the chart copy
+        var chartCopy = new chart.constructor(options, chart.callback);
         // Axis options and series options  (#2022, #3900, #5982)
         if (chartOptions) {
             ['xAxis', 'yAxis', 'series'].forEach(function (coll) {
@@ -778,10 +774,6 @@ var Exporting;
     /**
      * @private
      * @function Highcharts.Chart#getSVGForExport
-     * @param {Highcharts.ExportingOptions} options
-     * @param {Highcharts.Options} chartOptions
-     * @return {string}
-     * @requires modules/exporting
      */
     function getSVGForExport(options, chartOptions) {
         var chartExportingOptions = this.options.exporting;
@@ -798,9 +790,9 @@ var Exporting;
      * Make hyphenated property names out of camelCase
      * @private
      * @param {string} prop
-     *        Property name in camelCase
+     * Property name in camelCase
      * @return {string}
-     *         Hyphenated property name
+     * Hyphenated property name
      */
     function hyphenate(prop) {
         return prop.replace(/([A-Z])/g, function (a, b) {
@@ -812,16 +804,16 @@ var Exporting;
      *
      * @private
      * @function Highcharts.Chart#inlineStyles
-     * @return {void}
      *
-     * @todo: What are the border styles for text about? In general, text has a
-     * lot of properties.
-     * @todo: Make it work with IE9 and IE10.
+     * @todo What are the border styles for text about? In general, text has a
+     *       lot of properties.
+     *
+     * @todo Make it work with IE9 and IE10.
      *
      * @requires modules/exporting
      */
     function inlineStyles() {
-        var renderer = this.renderer, blacklist = inlineBlacklist, whitelist = Exporting.inlineWhitelist, // For IE
+        var blacklist = inlineBlacklist, whitelist = Exporting.inlineWhitelist, // For IE
         defaultStyles = {};
         var dummySVG;
         // Create an iframe where we read default styles without pollution from
@@ -842,8 +834,7 @@ var Exporting;
          * @private
          * @param {Highcharts.HTMLDOMElement} node
          *        Element child
-         * @return {void}
-         */
+             */
         function recurse(node) {
             var styles, parentStyles, cssText = '', dummy, styleAttr, blacklisted, whitelisted, i;
             /**
@@ -854,12 +845,11 @@ var Exporting;
              *        Style value
              * @param {string} prop
              *        Style property name
-             * @return {void}
-             */
+                     */
             function filterStyles(val, prop) {
                 // Check against whitelist & blacklist
                 blacklisted = whitelisted = false;
-                if (whitelist) {
+                if (whitelist.length) {
                     // Styled mode in IE has a whitelist instead.
                     // Exclude all props not in this list.
                     i = whitelist.length;
@@ -955,8 +945,7 @@ var Exporting;
         /**
          * Remove the dummy objects used to get defaults
          * @private
-         * @return {void}
-         */
+             */
         function tearDown() {
             dummySVG.parentNode.removeChild(dummySVG);
             // Remove trash from DOM that stayed after each exporting
@@ -974,7 +963,6 @@ var Exporting;
      *
      * @param {Highcharts.HTMLDOMElement} moveTo
      *        Move target
-     * @return {void}
      */
     function moveContainers(moveTo) {
         var chart = this;
@@ -1001,8 +989,7 @@ var Exporting;
          *        Options to update
          * @param {boolean} [redraw=true]
          *        Whether to redraw
-         * @return {void}
-         */
+                 */
         update = function (prop, options, redraw) {
             chart.isDirtyExporting = true;
             merge(true, chart.options[prop], options);
@@ -1018,9 +1005,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
@@ -1033,10 +1022,9 @@ var Exporting;
      *
      * @function Highcharts.Chart#print
      *
-     * @return {void}
      *
-     * @fires Highcharts.Chart#event:beforePrint
-     * @fires Highcharts.Chart#event:afterPrint
+     * @emits Highcharts.Chart#event:beforePrint
+     * @emits Highcharts.Chart#event:afterPrint
      *
      * @requires modules/exporting
      */
@@ -1066,7 +1054,6 @@ var Exporting;
      * Add the buttons on chart load
      * @private
      * @function Highcharts.Chart#renderExporting
-     * @return {void}
      * @requires modules/exporting
      */
     function renderExporting() {
@@ -1155,7 +1142,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/FullScreen.js

@@ -109,7 +109,8 @@ var Fullscreen = /** @class */ (function () {
         }
         // Unbind event as it's necessary only before exiting from fullscreen.
         if (fullscreen.unbindFullscreenEvent) {
-            fullscreen.unbindFullscreenEvent = fullscreen.unbindFullscreenEvent();
+            fullscreen.unbindFullscreenEvent = fullscreen
+                .unbindFullscreenEvent();
         }
         chart.setSize(fullscreen.origWidth, fullscreen.origHeight, false);
         fullscreen.origWidth = void 0;
@@ -180,7 +181,6 @@ var Fullscreen = /** @class */ (function () {
      * @since 8.0.1
      *
      * @requires modules/full-screen
-     * @return {void}
      */
     Fullscreen.prototype.setButtonText = function () {
         var chart = this.chart, exportDivElements = chart.exportDivElements, exportingOptions = chart.options.exporting, menuItems = (exportingOptions &&
@@ -196,7 +196,8 @@ var Fullscreen = /** @class */ (function () {
             var exportDivElement = exportDivElements[menuItems.indexOf('viewFullscreen')];
             if (exportDivElement) {
                 AST.setElementHTML(exportDivElement, !this.isOpen ?
-                    (exportingOptions.menuItemDefinitions.viewFullscreen.text ||
+                    (exportingOptions.menuItemDefinitions.viewFullscreen
+                        .text ||
                         lang.viewFullscreen) : lang.exitFullscreen);
             }
         }

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 */
 /**
@@ -194,13 +199,11 @@ Chart.prototype.transformFromLatLon = function (latLon, transform) {
      * In case of loading the library from a `script` tag,
      * this option is not needed, it will be loaded from there by default.
      *
-     * @type       {function}
-     * @product    highmaps
-     * @apioption  chart.proj4
+     * @type      {Function}
+     * @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