highcharts 8.1.0 → 8.2.2

package/es-modules/{annotations/types → Extensions/Annotations/Types}/Measure.js

@@ -3,53 +3,75 @@
  *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
  * */
-'use strict';
-import H from '../../parts/Globals.js';
-import U from '../../parts/Utilities.js';
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+import Annotation from '../Annotations.js';
+import ControlPoint from '../ControlPoint.js';
+import U from '../../../Core/Utilities.js';
 var extend = U.extend, isNumber = U.isNumber, merge = U.merge;
-var Annotation = H.Annotation, ControlPoint = Annotation.ControlPoint;
 /* eslint-disable no-invalid-this, valid-jsdoc */
-var Measure = function () {
-    Annotation.apply(this, arguments);
-};
-Annotation.types.measure = Measure;
-H.extendAnnotation(Measure, null, {
+var Measure = /** @class */ (function (_super) {
+    __extends(Measure, _super);
+    /* *
+     *
+     *  Constructors
+     *
+     * */
+    function Measure(chart, userOptions) {
+        return _super.call(this, chart, userOptions) || this;
+    }
+    /* *
+     *
+     *  Functions
+     *
+     * */
     /**
      * Init annotation object.
      * @private
      */
-    init: function () {
-        Annotation.prototype.init.apply(this, arguments);
+    Measure.prototype.init = function (annotationOrChart, userOptions, index) {
+        Annotation.prototype.init.call(this, annotationOrChart, userOptions, index);
         this.offsetX = 0;
         this.offsetY = 0;
         this.resizeX = 0;
         this.resizeY = 0;
-        this.calculations.init.call(this);
+        Measure.calculations.init.call(this);
         this.addValues();
         this.addShapes();
-    },
+    };
     /**
      * Overrides default setter to get axes from typeOptions.
      * @private
      */
-    setClipAxes: function () {
+    Measure.prototype.setClipAxes = function () {
         this.clipXAxis = this.chart.xAxis[this.options.typeOptions.xAxis];
         this.clipYAxis = this.chart.yAxis[this.options.typeOptions.yAxis];
-    },
+    };
     /**
      * Get measure points configuration objects.
      * @private
      * @return {Array<Highcharts.AnnotationMockPointOptionsObject>}
      */
-    pointsOptions: function () {
+    Measure.prototype.pointsOptions = function () {
         return this.options.points;
-    },
+    };
     /**
      * Get points configuration objects for shapes.
      * @private
      * @return {Array<Highcharts.AnnotationMockPointOptionsObject>}
      */
-    shapePointsOptions: function () {
+    Measure.prototype.shapePointsOptions = function () {
         var options = this.options.typeOptions, xAxis = options.xAxis, yAxis = options.yAxis;
         return [
             {
@@ -77,8 +99,8 @@ H.extendAnnotation(Measure, null, {
                 yAxis: yAxis
             }
         ];
-    },
-    addControlPoints: function () {
+    };
+    Measure.prototype.addControlPoints = function () {
         var selectType = this.options.typeOptions.selectType, controlPoint;
         controlPoint = new ControlPoint(this.chart, this, this.options.controlPointOptions, 0);
         this.controlPoints.push(controlPoint);
@@ -87,23 +109,23 @@ H.extendAnnotation(Measure, null, {
             controlPoint = new ControlPoint(this.chart, this, this.options.controlPointOptions, 1);
             this.controlPoints.push(controlPoint);
         }
-    },
+    };
     /**
      * Add label with calculated values (min, max, average, bins).
      * @private
      * @param {boolean} [resize]
      * The flag for resize shape
      */
-    addValues: function (resize) {
+    Measure.prototype.addValues = function (resize) {
         var typeOptions = this.options.typeOptions, formatter = typeOptions.label.formatter;
         // set xAxisMin, xAxisMax, yAxisMin, yAxisMax
-        this.calculations.recalculate.call(this, resize);
+        Measure.calculations.recalculate.call(this, resize);
         if (!typeOptions.label.enabled) {
             return;
         }
         if (this.labels.length > 0) {
             this.labels[0].text = (formatter && formatter.call(this)) ||
-                this.calculations.defaultFormatter.call(this);
+                Measure.calculations.defaultFormatter.call(this);
         }
         else {
             this.initLabel(extend({
@@ -126,23 +148,23 @@ H.extendAnnotation(Measure, null, {
                     };
                 },
                 text: (formatter && formatter.call(this)) ||
-                    this.calculations.defaultFormatter.call(this)
+                    Measure.calculations.defaultFormatter.call(this)
             }, typeOptions.label));
         }
-    },
+    };
     /**
      * Crosshair, background (rect).
      * @private
      */
-    addShapes: function () {
+    Measure.prototype.addShapes = function () {
         this.addCrosshairs();
         this.addBackground();
-    },
+    };
     /**
      * Add background shape.
      * @private
      */
-    addBackground: function () {
+    Measure.prototype.addBackground = function () {
         var shapePoints = this.shapePointsOptions();
         if (typeof shapePoints[0].x === 'undefined') {
             return;
@@ -151,12 +173,12 @@ H.extendAnnotation(Measure, null, {
             type: 'path',
             points: this.shapePointsOptions()
         }, this.options.typeOptions.background), false);
-    },
+    };
     /**
      * Add internal crosshair shapes (on top and bottom).
      * @private
      */
-    addCrosshairs: function () {
+    Measure.prototype.addCrosshairs = function () {
         var chart = this.chart, options = this.options.typeOptions, point = this.options.typeOptions.point, xAxis = chart.xAxis[options.xAxis], yAxis = chart.yAxis[options.yAxis], inverted = chart.inverted, xAxisMin = xAxis.toPixels(this.xAxisMin), xAxisMax = xAxis.toPixels(this.xAxisMax), yAxisMin = yAxis.toPixels(this.yAxisMin), yAxisMax = yAxis.toPixels(this.yAxisMax), defaultOptions = {
             point: point,
             type: 'path'
@@ -209,15 +231,15 @@ H.extendAnnotation(Measure, null, {
                 d: pathV
             }, crosshairOptionsY), false);
         }
-    },
-    onDrag: function (e) {
+    };
+    Measure.prototype.onDrag = function (e) {
         var translation = this.mouseMoveToTranslation(e), selectType = this.options.typeOptions.selectType, x = selectType === 'y' ? 0 : translation.x, y = selectType === 'x' ? 0 : translation.y;
         this.translate(x, y);
         this.offsetX += x;
         this.offsetY += y;
         // animation, resize, setStartPoints
         this.redraw(false, false, true);
-    },
+    };
     /**
      * Translate start or end ("left" or "right") side of the measure.
      * Update start points (startXMin, startXMax, startYMin, startYMax)
@@ -227,7 +249,7 @@ H.extendAnnotation(Measure, null, {
      * @param {number} cpIndex - index of control point
      * @param {Highcharts.AnnotationDraggableValue} selectType - x / y / xy
      */
-    resize: function (dx, dy, cpIndex, selectType) {
+    Measure.prototype.resize = function (dx, dy, cpIndex, selectType) {
         // background shape
         var bckShape = this.shapes[2];
         if (selectType === 'x') {
@@ -255,11 +277,11 @@ H.extendAnnotation(Measure, null, {
             bckShape.translatePoint(dx, dy, 2);
             bckShape.translatePoint(0, dy, 3);
         }
-        this.calculations.updateStartPoints
+        Measure.calculations.updateStartPoints
             .call(this, false, true, cpIndex, dx, dy);
         this.options.typeOptions.background.height = Math.abs(this.startYMax - this.startYMin);
         this.options.typeOptions.background.width = Math.abs(this.startXMax - this.startXMin);
-    },
+    };
     /**
      * Redraw event which render elements and update start points if needed.
      * @private
@@ -267,13 +289,13 @@ H.extendAnnotation(Measure, null, {
      * @param {boolean} [resize] - flag if resized
      * @param {boolean} [setStartPoints] - update position of start points
      */
-    redraw: function (animation, resize, setStartPoints) {
+    Measure.prototype.redraw = function (animation, resize, setStartPoints) {
         this.linkPoints();
         if (!this.graphic) {
             this.render();
         }
         if (setStartPoints) {
-            this.calculations.updateStartPoints.call(this, true, false);
+            Measure.calculations.updateStartPoints.call(this, true, false);
         }
         // #11174 - clipBox was not recalculate during resize / redraw
         if (this.clipRect) {
@@ -287,21 +309,27 @@ H.extendAnnotation(Measure, null, {
         this.controlPoints.forEach(function (controlPoint) {
             controlPoint.redraw();
         });
-    },
-    translate: function (dx, dy) {
+    };
+    Measure.prototype.translate = function (dx, dy) {
         this.shapes.forEach(function (item) {
             item.translate(dx, dy);
         });
         this.options.typeOptions.point.x = this.startXMin;
         this.options.typeOptions.point.y = this.startYMin;
-    },
-    calculations: {
+    };
+    /* *
+     *
+     *  Static Functions
+     *
+     * */
+    Measure.calculations = {
         /**
          * Set starting points
          * @private
          */
         init: function () {
-            var options = this.options.typeOptions, chart = this.chart, getPointPos = this.calculations.getPointPos, inverted = chart.inverted, xAxis = chart.xAxis[options.xAxis], yAxis = chart.yAxis[options.yAxis], bck = options.background, width = inverted ? bck.height : bck.width, height = inverted ? bck.width : bck.height, selectType = options.selectType, top = inverted ? chart.plotLeft : chart.plotTop, left = inverted ? chart.plotTop : chart.plotLeft;
+            var options = this.options.typeOptions, chart = this.chart, getPointPos = Measure.calculations.getPointPos, inverted = chart.inverted, xAxis = chart.xAxis[options.xAxis], yAxis = chart.yAxis[options.yAxis], bck = options.background, width = inverted ? bck.height : bck.width, height = inverted ? bck.width : bck.height, selectType = options.selectType, top = inverted ? xAxis.left : yAxis.top, // #13664
+            left = inverted ? yAxis.top : xAxis.left; // #13664
             this.startXMin = options.point.x;
             this.startYMin = options.point.y;
             if (isNumber(width)) {
@@ -334,7 +362,7 @@ H.extendAnnotation(Measure, null, {
          * Flag if shape is resized.
          */
         recalculate: function (resize) {
-            var calc = this.calculations, options = this.options.typeOptions, xAxis = this.chart.xAxis[options.xAxis], yAxis = this.chart.yAxis[options.yAxis], getPointPos = this.calculations.getPointPos, offsetX = this.offsetX, offsetY = this.offsetY;
+            var calc = Measure.calculations, options = this.options.typeOptions, xAxis = this.chart.xAxis[options.xAxis], yAxis = this.chart.yAxis[options.yAxis], getPointPos = Measure.calculations.getPointPos, offsetX = this.offsetX, offsetY = this.offsetY;
             this.xAxisMin = getPointPos(xAxis, this.startXMin, offsetX);
             this.xAxisMax = getPointPos(xAxis, this.startXMax, offsetX);
             this.yAxisMin = getPointPos(yAxis, this.startYMin, offsetY);
@@ -373,7 +401,7 @@ H.extendAnnotation(Measure, null, {
          * Index of controlPoint
          */
         updateStartPoints: function (redraw, resize, cpIndex, dx, dy) {
-            var options = this.options.typeOptions, selectType = options.selectType, xAxis = this.chart.xAxis[options.xAxis], yAxis = this.chart.yAxis[options.yAxis], getPointPos = this.calculations.getPointPos, startXMin = this.startXMin, startXMax = this.startXMax, startYMin = this.startYMin, startYMax = this.startYMax, offsetX = this.offsetX, offsetY = this.offsetY;
+            var options = this.options.typeOptions, selectType = options.selectType, xAxis = this.chart.xAxis[options.xAxis], yAxis = this.chart.yAxis[options.yAxis], getPointPos = Measure.calculations.getPointPos, startXMin = this.startXMin, startXMax = this.startXMax, startYMin = this.startYMin, startYMax = this.startYMax, offsetX = this.offsetX, offsetY = this.offsetY;
             if (resize) {
                 if (selectType === 'x') {
                     if (cpIndex === 0) {
@@ -433,7 +461,7 @@ H.extendAnnotation(Measure, null, {
          * @private
          */
         min: function () {
-            var min = Infinity, series = this.chart.series, ext = this.calculations.getExtremes(this.xAxisMin, this.xAxisMax, this.yAxisMin, this.yAxisMax), isCalculated = false; // to avoid Infinity in formatter
+            var min = Infinity, series = this.chart.series, ext = Measure.calculations.getExtremes(this.xAxisMin, this.xAxisMax, this.yAxisMin, this.yAxisMax), isCalculated = false; // to avoid Infinity in formatter
             series.forEach(function (serie) {
                 if (serie.visible &&
                     serie.options.id !== 'highcharts-navigator-series') {
@@ -456,7 +484,7 @@ H.extendAnnotation(Measure, null, {
             return min;
         },
         max: function () {
-            var max = -Infinity, series = this.chart.series, ext = this.calculations.getExtremes(this.xAxisMin, this.xAxisMax, this.yAxisMin, this.yAxisMax), isCalculated = false; // to avoid Infinity in formatter
+            var max = -Infinity, series = this.chart.series, ext = Measure.calculations.getExtremes(this.xAxisMin, this.xAxisMax, this.yAxisMin, this.yAxisMax), isCalculated = false; // to avoid Infinity in formatter
             series.forEach(function (serie) {
                 if (serie.visible &&
                     serie.options.id !== 'highcharts-navigator-series') {
@@ -486,7 +514,7 @@ H.extendAnnotation(Measure, null, {
             return average;
         },
         bins: function () {
-            var bins = 0, series = this.chart.series, ext = this.calculations.getExtremes(this.xAxisMin, this.xAxisMax, this.yAxisMin, this.yAxisMax), isCalculated = false; // to avoid Infinity in formatter
+            var bins = 0, series = this.chart.series, ext = Measure.calculations.getExtremes(this.xAxisMin, this.xAxisMax, this.yAxisMin, this.yAxisMax), isCalculated = false; // to avoid Infinity in formatter
             series.forEach(function (serie) {
                 if (serie.visible &&
                     serie.options.id !== 'highcharts-navigator-series') {
@@ -507,8 +535,10 @@ H.extendAnnotation(Measure, null, {
             }
             return bins;
         }
-    }
-}, 
+    };
+    return Measure;
+}(Annotation));
+Measure.prototype.defaultOptions = merge(Annotation.prototype.defaultOptions, 
 /**
  * A measure annotation.
  *
@@ -692,7 +722,7 @@ H.extendAnnotation(Measure, null, {
     },
     controlPointOptions: {
         positioner: function (target) {
-            var cpIndex = this.index, chart = target.chart, options = target.options, typeOptions = options.typeOptions, selectType = typeOptions.selectType, controlPointOptions = options.controlPointOptions, inverted = chart.inverted, xAxis = chart.xAxis[typeOptions.xAxis], yAxis = chart.yAxis[typeOptions.yAxis], targetX = target.xAxisMax, targetY = target.yAxisMax, ext = target.calculations.getExtremes(target.xAxisMin, target.xAxisMax, target.yAxisMin, target.yAxisMax), x, y;
+            var cpIndex = this.index, chart = target.chart, options = target.options, typeOptions = options.typeOptions, selectType = typeOptions.selectType, controlPointOptions = options.controlPointOptions, inverted = chart.inverted, xAxis = chart.xAxis[typeOptions.xAxis], yAxis = chart.yAxis[typeOptions.yAxis], targetX = target.xAxisMax, targetY = target.yAxisMax, ext = Measure.calculations.getExtremes(target.xAxisMin, target.xAxisMax, target.yAxisMin, target.yAxisMax), x, y;
             if (selectType === 'x') {
                 targetY = (ext.yAxisMax - ext.yAxisMin) / 2;
                 // first control point

package/es-modules/{annotations/types → Extensions/Annotations/Types}/Pitchfork.js

@@ -4,35 +4,63 @@
  *
  * */
 'use strict';
-import H from '../../parts/Globals.js';
-import U from '../../parts/Utilities.js';
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+import Annotation from '../Annotations.js';
+import InfinityLine from './InfinityLine.js';
+import MockPoint from '../MockPoint.js';
+import U from '../../../Core/Utilities.js';
 var merge = U.merge;
-var Annotation = H.Annotation, MockPoint = Annotation.MockPoint, InfinityLine = Annotation.types.infinityLine;
 /* eslint-disable no-invalid-this, valid-jsdoc */
-var Pitchfork = function () {
-    InfinityLine.apply(this, arguments);
-};
-Pitchfork.findEdgePoint = function (point, firstAnglePoint, secondAnglePoint) {
-    var angle = Math.atan2(secondAnglePoint.plotY - firstAnglePoint.plotY, secondAnglePoint.plotX - firstAnglePoint.plotX), distance = 1e7;
-    return {
-        x: point.plotX + distance * Math.cos(angle),
-        y: point.plotY + distance * Math.sin(angle)
+var Pitchfork = /** @class */ (function (_super) {
+    __extends(Pitchfork, _super);
+    /* *
+     *
+     * Constructors
+     *
+     * */
+    function Pitchfork(chart, options) {
+        return _super.call(this, chart, options) || this;
+    }
+    /* *
+     *
+     * Static Functions
+     *
+     * */
+    Pitchfork.outerLineEdgePoint = function (firstPointIndex) {
+        return function (target) {
+            var annotation = target.annotation, points = annotation.points;
+            return Pitchfork.findEdgePoint(points[firstPointIndex], points[0], new MockPoint(annotation.chart, target, annotation.midPointOptions()));
+        };
+    };
+    Pitchfork.findEdgePoint = function (point, firstAnglePoint, secondAnglePoint) {
+        var angle = Math.atan2(secondAnglePoint.plotY - firstAnglePoint.plotY, secondAnglePoint.plotX - firstAnglePoint.plotX), distance = 1e7;
+        return {
+            x: point.plotX + distance * Math.cos(angle),
+            y: point.plotY + distance * Math.sin(angle)
+        };
     };
-};
-Pitchfork.middleLineEdgePoint = function (target) {
-    var annotation = target.annotation, points = annotation.points;
-    return InfinityLine.findEdgePoint(points[0], new MockPoint(annotation.chart, target, annotation.midPointOptions()));
-};
-var outerLineEdgePoint = function (firstPointIndex) {
-    return function (target) {
+    Pitchfork.middleLineEdgePoint = function (target) {
         var annotation = target.annotation, points = annotation.points;
-        return Pitchfork.findEdgePoint(points[firstPointIndex], points[0], new MockPoint(annotation.chart, target, annotation.midPointOptions()));
+        return InfinityLine.findEdgePoint(points[0], new MockPoint(annotation.chart, target, annotation.midPointOptions()));
     };
-};
-Pitchfork.topLineEdgePoint = outerLineEdgePoint(1);
-Pitchfork.bottomLineEdgePoint = outerLineEdgePoint(0);
-H.extendAnnotation(Pitchfork, InfinityLine, {
-    midPointOptions: function () {
+    /* *
+     *
+     *  Functions
+     *
+     * */
+    Pitchfork.prototype.midPointOptions = function () {
         var points = this.points;
         return {
             x: (points[1].x + points[2].x) / 2,
@@ -40,12 +68,12 @@ H.extendAnnotation(Pitchfork, InfinityLine, {
             xAxis: points[0].series.xAxis,
             yAxis: points[0].series.yAxis
         };
-    },
-    addShapes: function () {
+    };
+    Pitchfork.prototype.addShapes = function () {
         this.addLines();
         this.addBackgrounds();
-    },
-    addLines: function () {
+    };
+    Pitchfork.prototype.addLines = function () {
         this.initShape({
             type: 'path',
             points: [
@@ -67,8 +95,8 @@ H.extendAnnotation(Pitchfork, InfinityLine, {
                 Pitchfork.bottomLineEdgePoint
             ]
         }, false);
-    },
-    addBackgrounds: function () {
+    };
+    Pitchfork.prototype.addBackgrounds = function () {
         var shapes = this.shapes, typeOptions = this.options.typeOptions;
         var innerBackground = this.initShape(merge(typeOptions.innerBackground, {
             type: 'path',
@@ -106,8 +134,17 @@ H.extendAnnotation(Pitchfork, InfinityLine, {
         }));
         typeOptions.innerBackground = innerBackground.options;
         typeOptions.outerBackground = outerBackground.options;
-    }
-}, 
+    };
+    /**
+     *
+     * Static Properties
+     *
+     */
+    Pitchfork.topLineEdgePoint = Pitchfork.outerLineEdgePoint(1);
+    Pitchfork.bottomLineEdgePoint = Pitchfork.outerLineEdgePoint(0);
+    return Pitchfork;
+}(InfinityLine));
+Pitchfork.prototype.defaultOptions = merge(InfinityLine.prototype.defaultOptions, 
 /**
  * A pitchfork annotation.
  *

package/es-modules/{annotations/types → Extensions/Annotations/Types}/Tunnel.js

@@ -4,10 +4,25 @@
  *
  * */
 'use strict';
-import H from '../../parts/Globals.js';
-import U from '../../parts/Utilities.js';
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+import Annotation from '../Annotations.js';
+import ControlPoint from '../ControlPoint.js';
+import CrookedLine from './CrookedLine.js';
+import MockPoint from '../MockPoint.js';
+import U from '../../../Core/Utilities.js';
 var merge = U.merge;
-var Annotation = H.Annotation, CrookedLine = Annotation.types.crookedLine, ControlPoint = Annotation.ControlPoint, MockPoint = Annotation.MockPoint;
 /* eslint-disable no-invalid-this, valid-jsdoc */
 /**
  * @private
@@ -15,35 +30,46 @@ var Annotation = H.Annotation, CrookedLine = Annotation.types.crookedLine, Contr
 function getSecondCoordinate(p1, p2, x) {
     return (p2.y - p1.y) / (p2.x - p1.x) * (x - p1.x) + p1.y;
 }
-var Tunnel = function () {
-    CrookedLine.apply(this, arguments);
-};
-H.extendAnnotation(Tunnel, CrookedLine, {
-    getPointsOptions: function () {
+var Tunnel = /** @class */ (function (_super) {
+    __extends(Tunnel, _super);
+    /* *
+     *
+     * Constructors
+     *
+     * */
+    function Tunnel(chart, options) {
+        return _super.call(this, chart, options) || this;
+    }
+    /* *
+     *
+     * Functions
+     *
+     * */
+    Tunnel.prototype.getPointsOptions = function () {
         var pointsOptions = CrookedLine.prototype.getPointsOptions.call(this);
         pointsOptions[2] = this.heightPointOptions(pointsOptions[1]);
         pointsOptions[3] = this.heightPointOptions(pointsOptions[0]);
         return pointsOptions;
-    },
-    getControlPointsOptions: function () {
+    };
+    Tunnel.prototype.getControlPointsOptions = function () {
         return this.getPointsOptions().slice(0, 2);
-    },
-    heightPointOptions: function (pointOptions) {
-        var heightPointOptions = merge(pointOptions);
-        heightPointOptions.y += this.options.typeOptions.height;
+    };
+    Tunnel.prototype.heightPointOptions = function (pointOptions) {
+        var heightPointOptions = merge(pointOptions), typeOptions = this.options.typeOptions;
+        heightPointOptions.y += typeOptions.height;
         return heightPointOptions;
-    },
-    addControlPoints: function () {
+    };
+    Tunnel.prototype.addControlPoints = function () {
         CrookedLine.prototype.addControlPoints.call(this);
-        var options = this.options, controlPoint = new ControlPoint(this.chart, this, merge(options.controlPointOptions, options.typeOptions.heightControlPoint), 2);
+        var options = this.options, typeOptions = options.typeOptions, controlPoint = new ControlPoint(this.chart, this, merge(options.controlPointOptions, typeOptions.heightControlPoint), 2);
         this.controlPoints.push(controlPoint);
-        options.typeOptions.heightControlPoint = controlPoint.options;
-    },
-    addShapes: function () {
+        typeOptions.heightControlPoint = controlPoint.options;
+    };
+    Tunnel.prototype.addShapes = function () {
         this.addLine();
         this.addBackground();
-    },
-    addLine: function () {
+    };
+    Tunnel.prototype.addLine = function () {
         var line = this.initShape(merge(this.options.typeOptions.line, {
             type: 'path',
             points: [
@@ -58,14 +84,14 @@ H.extendAnnotation(Tunnel, CrookedLine, {
             ]
         }), false);
         this.options.typeOptions.line = line.options;
-    },
-    addBackground: function () {
+    };
+    Tunnel.prototype.addBackground = function () {
         var background = this.initShape(merge(this.options.typeOptions.background, {
             type: 'path',
             points: this.points.slice()
         }));
         this.options.typeOptions.background = background.options;
-    },
+    };
     /**
      * Translate start or end ("left" or "right") side of the tunnel.
      * @private
@@ -73,22 +99,24 @@ H.extendAnnotation(Tunnel, CrookedLine, {
      * @param {number} dy - the amount of y translation
      * @param {boolean} [end] - whether to translate start or end side
      */
-    translateSide: function (dx, dy, end) {
+    Tunnel.prototype.translateSide = function (dx, dy, end) {
         var topIndex = Number(end), bottomIndex = topIndex === 0 ? 3 : 2;
         this.translatePoint(dx, dy, topIndex);
         this.translatePoint(dx, dy, bottomIndex);
-    },
+    };
     /**
      * Translate height of the tunnel.
      * @private
      * @param {number} dh - the amount of height translation
      */
-    translateHeight: function (dh) {
+    Tunnel.prototype.translateHeight = function (dh) {
         this.translatePoint(0, dh, 2);
         this.translatePoint(0, dh, 3);
         this.options.typeOptions.height = this.points[3].y - this.points[0].y;
-    }
-}, 
+    };
+    return Tunnel;
+}(CrookedLine));
+Tunnel.prototype.defaultOptions = merge(CrookedLine.prototype.defaultOptions, 
 /**
  * A tunnel annotation.
  *