highcharts 6.1.4 → 6.2.0

package/js/es-modules/parts-map/ColorAxis.js

@@ -1,5 +1,5 @@
 /**
- * (c) 2010-2017 Torstein Honsi
+ * (c) 2010-2018 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */

package/js/es-modules/parts-map/ColorSeriesMixin.js

@@ -1,5 +1,5 @@
 /**
- * (c) 2010-2017 Torstein Honsi
+ * (c) 2010-2018 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */

package/js/es-modules/parts-map/GeoJSON.js

@@ -1,5 +1,5 @@
 /**
- * (c) 2010-2017 Torstein Honsi
+ * (c) 2010-2018 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */

package/js/es-modules/parts-map/HeatmapSeries.js

@@ -1,9 +1,11 @@
 /**
- * (c) 2010-2017 Torstein Honsi
+ * (c) 2010-2018 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */
+
 'use strict';
+
 import H from '../parts/Globals.js';
 import '../parts/Utilities.js';
 import '../parts/Options.js';
@@ -11,6 +13,7 @@ import '../parts/Point.js';
 import '../parts/Series.js';
 import '../parts/Legend.js';
 import './ColorSeriesMixin.js';
+
 var colorPointMixin = H.colorPointMixin,
     colorSeriesMixin = H.colorSeriesMixin,
     each = H.each,
@@ -22,29 +25,36 @@ var colorPointMixin = H.colorPointMixin,
     seriesType = H.seriesType,
     seriesTypes = H.seriesTypes;
 
+/**
+ * @private
+ * @class
+ * @name Highcharts.seriesTypes.heatmap
+ *
+ * @augments Highcharts.Series
+ */
+seriesType('heatmap', 'scatter'
 
 /**
  * A heatmap is a graphical representation of data where the individual values
  * contained in a matrix are represented as colors.
  *
- * @sample       highcharts/demo/heatmap/
- *               Simple heatmap
- * @sample       highcharts/demo/heatmap-canvas/
- *               Heavy heatmap
+ * @sample highcharts/demo/heatmap/
+ *         Simple heatmap
+ * @sample highcharts/demo/heatmap-canvas/
+ *         Heavy heatmap
+ *
  * @extends      {plotOptions.scatter}
- * @excluding    animationLimit,connectEnds,connectNulls,dashStyle,
- *               findNearestPointBy,getExtremesFromAll,linecap,lineWidth,marker,
- *               pointInterval,pointIntervalUnit,pointRange,pointStart,shadow,
- *               softThreshold,stacking,step,threshold
+ * @excluding    animationLimit, connectEnds, connectNulls, dashStyle,
+ *               findNearestPointBy, getExtremesFromAll, linecap, lineWidth,
+ *               marker, pointInterval, pointIntervalUnit, pointRange,
+ *               pointStart, shadow, softThreshold, stacking, step, threshold
  * @product      highcharts highmaps
  * @optionparent plotOptions.heatmap
  */
-seriesType('heatmap', 'scatter', {
+, {
 
     /**
      * Animation is disabled by default on the heatmap series.
-     *
-     * @type {Boolean|Object}
      */
     animation: false,
 
@@ -56,9 +66,9 @@ seriesType('heatmap', 'scatter', {
     /**
      * Padding between the points in the heatmap.
      *
-     * @type {Number}
-     * @default 0
-     * @since 6.0
+     * @type      {number}
+     * @default   0
+     * @since     6.0
      * @apioption plotOptions.heatmap.pointPadding
      */
 
@@ -68,10 +78,9 @@ seriesType('heatmap', 'scatter', {
      * options are set in the [colorAxis](#colorAxis), the default value
      * is pulled from the [options.colors](#colors) array.
      *
-     * @type {Color}
-     * @default null
-     * @since 4.0
-     * @product highcharts
+     * @type      {Highcharts.ColorString}
+     * @since     4.0
+     * @product   highcharts
      * @apioption plotOptions.heatmap.color
      */
 
@@ -79,31 +88,36 @@ seriesType('heatmap', 'scatter', {
      * The column size - how many X axis units each column in the heatmap
      * should span.
      *
-     * @type {Number}
-     * @sample {highcharts} maps/demo/heatmap/ One day
-     * @sample {highmaps} maps/demo/heatmap/ One day
-     * @default 1
-     * @since 4.0
-     * @product highcharts highmaps
+     * @sample {highcharts} maps/demo/heatmap/
+     *         One day
+     * @sample {highmaps} maps/demo/heatmap/
+     *         One day
+     *
+     * @type      {number}
+     * @default   1
+     * @since     4.0
+     * @product   highcharts highmaps
      * @apioption plotOptions.heatmap.colsize
      */
 
     /**
      * The row size - how many Y axis units each heatmap row should span.
      *
-     * @type {Number}
-     * @sample {highcharts} maps/demo/heatmap/ 1 by default
-     * @sample {highmaps} maps/demo/heatmap/ 1 by default
-     * @default 1
-     * @since 4.0
-     * @product highcharts highmaps
+     * @sample {highcharts} maps/demo/heatmap/
+     *         1 by default
+     * @sample {highmaps} maps/demo/heatmap/
+     *         1 by default
+     *
+     * @type      {number}
+     * @default   1
+     * @since     4.0
+     * @product   highcharts highmaps
      * @apioption plotOptions.heatmap.rowsize
      */
 
     
 
     dataLabels: {
-
         formatter: function () { // #2945
             return this.point.value;
         },
@@ -119,7 +133,9 @@ seriesType('heatmap', 'scatter', {
      */
     marker: null,
 
-    /**    @ignore */
+    /**
+     * @ignore
+     */
     pointRange: null, // dynamically set to colsize by default
 
     tooltip: {
@@ -129,6 +145,7 @@ seriesType('heatmap', 'scatter', {
     states: {
 
         hover: {
+
             /**
              * @ignore
              */
@@ -141,14 +158,15 @@ seriesType('heatmap', 'scatter', {
              * In styled mode, the hover brightening is by default replaced
              * with a fill-opacity set in the `.highcharts-point:hover` rule.
              *
-             * @type {Number}
              * @product highcharts highmaps
              */
             brightness: 0.2
         }
+
     }
 
 }, merge(colorSeriesMixin, {
+
     pointArrayMap: ['y', 'value'],
     hasPointSpecificOptions: true,
     getExtremesFromAll: true,
@@ -156,6 +174,9 @@ seriesType('heatmap', 'scatter', {
 
     /**
      * Override the init method to add point ranges on both axes.
+     *
+     * @private
+     * @function Highcharts.seriesTypes.heatmap#init
      */
     init: function () {
         var options;
@@ -166,6 +187,11 @@ seriesType('heatmap', 'scatter', {
         options.pointRange = pick(options.pointRange, options.colsize || 1);
         this.yAxis.axisPointRange = options.rowsize || 1; // general point range
     },
+
+    /**
+     * @private
+     * @function Highcharts.seriesTypes.heatmap#translate
+     */
     translate: function () {
         var series = this,
             options = series.options,
@@ -220,6 +246,11 @@ seriesType('heatmap', 'scatter', {
 
         series.translateColors();
     },
+
+    /**
+     * @private
+     * @function Highcharts.seriesTypes.heatmap#drawPoints
+     */
     drawPoints: function () {
         seriesTypes.column.prototype.drawPoints.call(this);
 
@@ -231,10 +262,37 @@ seriesType('heatmap', 'scatter', {
             
         }, this);
     },
+
+    /**
+     * @ignore
+     * @deprecated
+     * @function Highcharts.seriesTypes.heatmap#animate
+     */
     animate: noop,
+
+    /**
+     * @ignore
+     * @deprecated
+     * @function Highcharts.seriesTypes.heatmap#getBox
+     */
     getBox: noop,
+
+    /**
+     * @private
+     * @borrows Highcharts.LegendSymbolMixin.drawRectangle as Highcharts.seriesTypes.heatmap#drawLegendSymbol
+     */
     drawLegendSymbol: LegendSymbolMixin.drawRectangle,
+
+    /**
+     * @private
+     * @borrows Highcharts.seriesTypes.column#alignDataLabel as Highcharts.seriesTypes.heatmap#alignDataLabel
+     */
     alignDataLabel: seriesTypes.column.prototype.alignDataLabel,
+
+    /**
+     * @private
+     * @function Highcharts.seriesTypes.heatmap#getExtremes
+     */
     getExtremes: function () {
         // Get the extremes from the value data
         Series.prototype.getExtremes.call(this, this.valueData);
@@ -246,6 +304,15 @@ seriesType('heatmap', 'scatter', {
     }
 
 }), H.extend({
+
+    /**
+     * @private
+     * @function Highcharts.Point#haloPath
+     *
+     * @param {number} size
+     *
+     * @return {Highcharts.SVGPathArray}
+     */
     haloPath: function (size) {
         if (!size) {
             return [];
@@ -260,14 +327,14 @@ seriesType('heatmap', 'scatter', {
         ];
     }
 }, colorPointMixin));
+
 /**
  * A `heatmap` series. If the [type](#series.heatmap.type) option is
  * not specified, it is inherited from [chart.type](#chart.type).
  *
- * @type {Object}
- * @extends series,plotOptions.heatmap
- * @excluding dataParser,dataURL,marker,pointRange,stack
- * @product highcharts highmaps
+ * @extends   series,plotOptions.heatmap
+ * @excluding dataParser, dataURL, marker, pointRange, stack
+ * @product   highcharts highmaps
  * @apioption series.heatmap
  */
 
@@ -312,9 +379,6 @@ seriesType('heatmap', 'scatter', {
  *     }]
  *  ```
  *
- * @type {Array<Object|Array>}
- * @extends series.line.data
- * @excluding marker
  * @sample {highcharts} highcharts/chart/reflow-true/
  *         Numerical values
  * @sample {highcharts} highcharts/series/data-array-of-arrays/
@@ -325,7 +389,11 @@ seriesType('heatmap', 'scatter', {
  *         Arrays of point.name and y
  * @sample {highcharts} highcharts/series/data-array-of-objects/
  *         Config objects
- * @product highcharts highmaps
+ *
+ * @type      {Array<Array<number>|*>}
+ * @extends   series.line.data
+ * @excluding marker
+ * @product   highcharts highmaps
  * @apioption series.heatmap.data
  */
 
@@ -334,8 +402,8 @@ seriesType('heatmap', 'scatter', {
  * explicitly, as we use the color to denote the `value`. Options for
  * this are set in the [colorAxis](#colorAxis) configuration.
  *
- * @type {Color}
- * @product highcharts highmaps
+ * @type      {Highcharts.ColorString}
+ * @product   highcharts highmaps
  * @apioption series.heatmap.data.color
  */
 
@@ -343,8 +411,8 @@ seriesType('heatmap', 'scatter', {
  * The value of the point, resulting in a color controled by options
  * as set in the [colorAxis](#colorAxis) configuration.
  *
- * @type {Number}
- * @product highcharts highmaps
+ * @type      {number}
+ * @product   highcharts highmaps
  * @apioption series.heatmap.data.value
  */
 
@@ -352,24 +420,26 @@ seriesType('heatmap', 'scatter', {
  * The x value of the point. For datetime axes,
  * the X value is the timestamp in milliseconds since 1970.
  *
- * @type {Number}
- * @product highcharts highmaps
+ * @type      {number}
+ * @product   highcharts highmaps
  * @apioption series.heatmap.data.x
  */
 
 /**
  * The y value of the point.
  *
- * @type {Number}
- * @product highcharts highmaps
+ * @type      {number}
+ * @product   highcharts highmaps
  * @apioption series.heatmap.data.y
  */
 
 /**
  * Point padding for a single point.
  *
- * @type {Number}
- * @sample maps/plotoptions/tilemap-pointpadding Point padding on tiles
+ * @sample maps/plotoptions/tilemap-pointpadding
+ *         Point padding on tiles
+ *
+ * @type      {number}
  * @apioption series.heatmap.data.pointPadding
  */
 

package/js/es-modules/parts-map/Map.js

@@ -1,5 +1,5 @@
 /**
- * (c) 2010-2017 Torstein Honsi
+ * (c) 2010-2018 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */

package/js/es-modules/parts-map/MapAxis.js

@@ -1,5 +1,5 @@
 /**
- * (c) 2010-2017 Torstein Honsi
+ * (c) 2010-2018 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */

package/js/es-modules/parts-map/MapBubbleSeries.js

@@ -1,5 +1,5 @@
 /**
- * (c) 2010-2017 Torstein Honsi
+ * (c) 2010-2018 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */

package/js/es-modules/parts-map/MapLineSeries.js

@@ -1,5 +1,5 @@
 /**
- * (c) 2010-2017 Torstein Honsi
+ * (c) 2010-2018 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */

package/js/es-modules/parts-map/MapNavigation.js

@@ -1,5 +1,5 @@
 /**
- * (c) 2010-2017 Torstein Honsi
+ * (c) 2010-2018 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */

package/js/es-modules/parts-map/MapPointSeries.js

@@ -1,5 +1,5 @@
 /**
- * (c) 2010-2017 Torstein Honsi
+ * (c) 2010-2018 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */

package/js/es-modules/parts-map/MapPointer.js

@@ -1,5 +1,5 @@
 /**
- * (c) 2010-2017 Torstein Honsi
+ * (c) 2010-2018 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */

package/js/es-modules/parts-map/MapSeries.js

@@ -1,5 +1,5 @@
 /**
- * (c) 2010-2017 Torstein Honsi
+ * (c) 2010-2018 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */
@@ -33,7 +33,7 @@ var colorPointMixin = H.colorPointMixin,
  * The map series is used for basic choropleth maps, where each map area has a
  * color based on its value.
  *
- * @sample maps/demo/base/ Choropleth map
+ * @sample maps/demo/all-maps/ Choropleth map
  * @extends plotOptions.scatter
  * @excluding marker
  * @product highmaps

package/js/es-modules/parts-more/AreaRangeSeries.js

@@ -1,5 +1,5 @@
 /**
- * (c) 2010-2017 Torstein Honsi
+ * (c) 2010-2018 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */
@@ -11,6 +11,8 @@ import '../parts/Series.js';
 var each = H.each,
     noop = H.noop,
     pick = H.pick,
+    extend = H.extend,
+    isArray = H.isArray,
     defined = H.defined,
     Series = H.Series,
     seriesType = H.seriesType,
@@ -120,7 +122,6 @@ seriesType('arearange', 'area', {
 // Prototype members
 }, {
     pointArrayMap: ['low', 'high'],
-    dataLabelCollections: ['dataLabel', 'dataLabelUpper'],
     toYData: function (point) {
         return [point.low, point.high];
     },
@@ -308,31 +309,55 @@ seriesType('arearange', 'area', {
      */
     drawDataLabels: function () {
 
-        var data = this.data,
+        var data = this.points,
             length = data.length,
             i,
             originalDataLabels = [],
             dataLabelOptions = this.options.dataLabels,
-            align = dataLabelOptions.align,
-            verticalAlign = dataLabelOptions.verticalAlign,
-            inside = dataLabelOptions.inside,
             point,
             up,
-            inverted = this.chart.inverted;
-
-        if (dataLabelOptions.enabled || this._hasPointLabels) {
+            inverted = this.chart.inverted,
+            upperDataLabelOptions,
+            lowerDataLabelOptions;
+
+        // Split into upper and lower options. If data labels is an array, the
+        // first element is the upper label, the second is the lower.
+        //
+        // TODO: We want to change this and allow multiple labels for both upper
+        // and lower values in the future - introducing some options for which
+        // point value to use as Y for the dataLabel, so that this could be
+        // handled in Series.drawDataLabels. This would also improve performance
+        // since we now have to loop over all the points multiple times to work
+        // around the data label logic.
+        if (isArray(dataLabelOptions)) {
+            if (dataLabelOptions.length > 1) {
+                upperDataLabelOptions = dataLabelOptions[0];
+                lowerDataLabelOptions = dataLabelOptions[1];
+            } else {
+                upperDataLabelOptions = dataLabelOptions[0];
+                lowerDataLabelOptions = { enabled: false };
+            }
+        } else {
+            upperDataLabelOptions = extend({}, dataLabelOptions); // Make copy;
+            upperDataLabelOptions.x = dataLabelOptions.xHigh;
+            upperDataLabelOptions.y = dataLabelOptions.yHigh;
+            lowerDataLabelOptions = extend({}, dataLabelOptions); // Make copy
+            lowerDataLabelOptions.x = dataLabelOptions.xLow;
+            lowerDataLabelOptions.y = dataLabelOptions.yLow;
+        }
 
-            // Step 1: set preliminary values for plotY and dataLabel
+        // Draw upper labels
+        if (upperDataLabelOptions.enabled || this._hasPointLabels) {
+            // Set preliminary values for plotY and dataLabel
             // and draw the upper labels
             i = length;
             while (i--) {
                 point = data[i];
                 if (point) {
-                    up = inside ?
+                    up = upperDataLabelOptions.inside ?
                         point.plotHigh < point.plotLow :
                         point.plotHigh > point.plotLow;
 
-                    // Set preliminary values
                     point.y = point.high;
                     point._plotY = point.plotY;
                     point.plotY = point.plotHigh;
@@ -345,70 +370,87 @@ seriesType('arearange', 'area', {
                     // Set the default offset
                     point.below = up;
                     if (inverted) {
-                        if (!align) {
-                            dataLabelOptions.align = up ? 'right' : 'left';
+                        if (!upperDataLabelOptions.align) {
+                            upperDataLabelOptions.align = up ? 'right' : 'left';
                         }
                     } else {
-                        if (!verticalAlign) {
-                            dataLabelOptions.verticalAlign = up ?
+                        if (!upperDataLabelOptions.verticalAlign) {
+                            upperDataLabelOptions.verticalAlign = up ?
                                 'top' :
                                 'bottom';
                         }
                     }
-
-                    dataLabelOptions.x = dataLabelOptions.xHigh;
-                    dataLabelOptions.y = dataLabelOptions.yHigh;
                 }
             }
 
+            this.options.dataLabels = upperDataLabelOptions;
+
             if (seriesProto.drawDataLabels) {
                 seriesProto.drawDataLabels.apply(this, arguments); // #1209
             }
 
-            // Step 2: reorganize and handle data labels for the lower values
+            // Reset state after the upper labels were created. Move
+            // it to point.dataLabelUpper and reassign the originals.
+            // We do this here to support not drawing a lower label.
             i = length;
             while (i--) {
                 point = data[i];
                 if (point) {
-                    up = inside ?
-                        point.plotHigh < point.plotLow :
-                        point.plotHigh > point.plotLow;
-
-                    // Move the generated labels from step 1, and reassign
-                    // the original data labels
                     point.dataLabelUpper = point.dataLabel;
                     point.dataLabel = originalDataLabels[i];
-
-                    // Reset values
+                    delete point.dataLabels;
                     point.y = point.low;
                     point.plotY = point._plotY;
+                }
+            }
+        }
+
+        // Draw lower labels
+        if (lowerDataLabelOptions.enabled || this._hasPointLabels) {
+            i = length;
+            while (i--) {
+                point = data[i];
+                if (point) {
+                    up = lowerDataLabelOptions.inside ?
+                        point.plotHigh < point.plotLow :
+                        point.plotHigh > point.plotLow;
 
                     // Set the default offset
                     point.below = !up;
                     if (inverted) {
-                        if (!align) {
-                            dataLabelOptions.align = up ? 'left' : 'right';
+                        if (!lowerDataLabelOptions.align) {
+                            lowerDataLabelOptions.align = up ? 'left' : 'right';
                         }
                     } else {
-                        if (!verticalAlign) {
-                            dataLabelOptions.verticalAlign = up ?
+                        if (!lowerDataLabelOptions.verticalAlign) {
+                            lowerDataLabelOptions.verticalAlign = up ?
                                 'bottom' :
                                 'top';
                         }
-
                     }
-
-                    dataLabelOptions.x = dataLabelOptions.xLow;
-                    dataLabelOptions.y = dataLabelOptions.yLow;
                 }
             }
+
+            this.options.dataLabels = lowerDataLabelOptions;
+
             if (seriesProto.drawDataLabels) {
                 seriesProto.drawDataLabels.apply(this, arguments);
             }
         }
 
-        dataLabelOptions.align = align;
-        dataLabelOptions.verticalAlign = verticalAlign;
+        // Merge upper and lower into point.dataLabels for later destroying
+        if (upperDataLabelOptions.enabled) {
+            i = length;
+            while (i--) {
+                point = data[i];
+                if (point && point.dataLabelUpper) {
+                    point.dataLabels = [point.dataLabelUpper, point.dataLabel];
+                }
+            }
+        }
+
+        // Reset options
+        this.options.dataLabels = dataLabelOptions;
     },
 
     alignDataLabel: function () {

package/js/es-modules/parts-more/AreaSplineRangeSeries.js

@@ -1,5 +1,5 @@
 /**
- * (c) 2010-2017 Torstein Honsi
+ * (c) 2010-2018 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */

package/js/es-modules/parts-more/BoxPlotSeries.js

@@ -1,5 +1,5 @@
 /**
- * (c) 2010-2017 Torstein Honsi
+ * (c) 2010-2018 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */

package/js/es-modules/parts-more/BubbleSeries.js

@@ -1,5 +1,5 @@
 /**
- * (c) 2010-2017 Torstein Honsi
+ * (c) 2010-2018 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */