highstock-rails 2.1.10 → 5.0.11

data/app/assets/javascripts/highstock/modules/funnel.js

@@ -1,13 +1,12 @@
 /*
- 
+ Highcharts JS v5.0.11 (2017-05-04)
  Highcharts funnel module
 
- (c) 2010-2014 Torstein Honsi
+ (c) 2010-2017 Torstein Honsi
 
  License: www.highcharts.com/license
 */
-(function(b){typeof module==="object"&&module.exports?module.exports=b:b(Highcharts)})(function(b){var q=b.getOptions(),w=q.plotOptions,r=b.seriesTypes,G=b.merge,E=function(){},B=b.each,F=b.pick;w.funnel=G(w.pie,{animation:!1,center:["50%","50%"],width:"90%",neckWidth:"30%",height:"100%",neckHeight:"25%",reversed:!1,dataLabels:{connectorWidth:1,connectorColor:"#606060"},size:!0,states:{select:{color:"#C0C0C0",borderColor:"#000000",shadow:!1}}});r.funnel=b.extendClass(r.pie,{type:"funnel",animate:E,
-translate:function(){var a=function(k,a){return/%$/.test(k)?a*parseInt(k,10)/100:parseInt(k,10)},b=0,e=this.chart,c=this.options,f=c.reversed,o=c.ignoreHiddenPoint,g=e.plotWidth,h=e.plotHeight,q=0,e=c.center,i=a(e[0],g),x=a(e[1],h),r=a(c.width,g),l,s,d=a(c.height,h),t=a(c.neckWidth,g),C=a(c.neckHeight,h),u=x-d/2+d-C,a=this.data,y,z,w=c.dataLabels.position==="left"?1:0,A,m,D,p,j,v,n;this.getWidthAt=s=function(k){var a=x-d/2;return k>u||d===C?t:t+(r-t)*(1-(k-a)/(d-C))};this.getX=function(k,a){return i+
-(a?-1:1)*(s(f?h-k:k)/2+c.dataLabels.distance)};this.center=[i,x,d];this.centerX=i;B(a,function(a){if(!o||a.visible!==!1)b+=a.y});B(a,function(a){n=null;z=b?a.y/b:0;m=x-d/2+q*d;j=m+z*d;l=s(m);A=i-l/2;D=A+l;l=s(j);p=i-l/2;v=p+l;m>u?(A=p=i-t/2,D=v=i+t/2):j>u&&(n=j,l=s(u),p=i-l/2,v=p+l,j=u);f&&(m=d-m,j=d-j,n=n?d-n:null);y=["M",A,m,"L",D,m,v,j];n&&y.push(v,n,p,n);y.push(p,j,"Z");a.shapeType="path";a.shapeArgs={d:y};a.percentage=z*100;a.plotX=i;a.plotY=(m+(n||j))/2;a.tooltipPos=[i,a.plotY];a.slice=E;a.half=
-w;if(!o||a.visible!==!1)q+=z})},drawPoints:function(){var a=this,b=a.options,e=a.chart.renderer;B(a.data,function(c){var f=c.options,o=c.graphic,g=c.shapeArgs;o?o.animate(g):c.graphic=e.path(g).attr({fill:c.color,stroke:F(f.borderColor,b.borderColor),"stroke-width":F(f.borderWidth,b.borderWidth)}).add(a.group)})},sortByAngle:function(a){a.sort(function(a,b){return a.plotY-b.plotY})},drawDataLabels:function(){var a=this.data,b=this.options.dataLabels.distance,e,c,f,o=a.length,g,h;for(this.center[2]-=
-2*b;o--;)f=a[o],c=(e=f.half)?1:-1,h=f.plotY,g=this.getX(h,e),f.labelPos=[0,h,g+(b-5)*c,h,g+b*c,h,e?"right":"left",0];r.pie.prototype.drawDataLabels.call(this)}});q.plotOptions.pyramid=b.merge(q.plotOptions.funnel,{neckWidth:"0%",neckHeight:"0%",reversed:!0});b.seriesTypes.pyramid=b.extendClass(b.seriesTypes.funnel,{type:"pyramid"})});
+(function(e){"object"===typeof module&&module.exports?module.exports=e:e(Highcharts)})(function(e){(function(g){var e=g.seriesType,z=g.seriesTypes,H=g.noop,D=g.pick,I=g.each;e("funnel","pie",{animation:!1,center:["50%","50%"],width:"90%",neckWidth:"30%",height:"100%",neckHeight:"25%",reversed:!1,size:!0},{animate:H,translate:function(){var b=function(a,b){return/%$/.test(a)?b*parseInt(a,10)/100:parseInt(a,10)},E=0,c=this.chart,f=this.options,d=f.reversed,e=f.ignoreHiddenPoint,t=c.plotWidth,c=c.plotHeight,
+q=0,g=f.center,h=b(g[0],t),r=b(g[1],c),z=b(f.width,t),l,v,m=b(f.height,c),w=b(f.neckWidth,t),F=b(f.neckHeight,c),x=r-m/2+m-F,b=this.data,A,B,D="left"===f.dataLabels.position?1:0,C,n,G,u,k,y,p;this.getWidthAt=v=function(a){var b=r-m/2;return a>x||m===F?w:w+(z-w)*(1-(a-b)/(m-F))};this.getX=function(a,b,c){return h+(b?-1:1)*(v(d?2*r-a:a)/2+c.labelDistance)};this.center=[h,r,m];this.centerX=h;I(b,function(a){e&&!1===a.visible||(E+=a.y)});I(b,function(a){p=null;B=E?a.y/E:0;n=r-m/2+q*m;k=n+B*m;l=v(n);C=
+h-l/2;G=C+l;l=v(k);u=h-l/2;y=u+l;n>x?(C=u=h-w/2,G=y=h+w/2):k>x&&(p=k,l=v(x),u=h-l/2,y=u+l,k=x);d&&(n=2*r-n,k=2*r-k,p=p?2*r-p:null);A=["M",C,n,"L",G,n,y,k];p&&A.push(y,p,u,p);A.push(u,k,"Z");a.shapeType="path";a.shapeArgs={d:A};a.percentage=100*B;a.plotX=h;a.plotY=(n+(p||k))/2;a.tooltipPos=[h,a.plotY];a.slice=H;a.half=D;e&&!1===a.visible||(q+=B)})},drawPoints:z.column.prototype.drawPoints,sortByAngle:function(b){b.sort(function(b,c){return b.plotY-c.plotY})},drawDataLabels:function(){var b=this.data,
+e=this.options.dataLabels.distance,c,f,d,g=b.length,t,q;for(this.center[2]-=2*e;g--;)d=b[g],f=(c=d.half)?1:-1,q=d.plotY,d.labelDistance=D(d.options.dataLabels&&d.options.dataLabels.distance,e),this.maxLabelDistance=Math.max(d.labelDistance,this.maxLabelDistance||0),t=this.getX(q,c,d),d.labelPos=[0,q,t+(d.labelDistance-5)*f,q,t+d.labelDistance*f,q,c?"right":"left",0];z.pie.prototype.drawDataLabels.call(this)}});e("pyramid","funnel",{neckWidth:"0%",neckHeight:"0%",reversed:!0})})(e)});

data/app/assets/javascripts/highstock/modules/funnel.js.map

@@ -0,0 +1,8 @@
+{
+"version":3,
+"file":"",
+"lineCount":12,
+"mappings":"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",
+"sources":["Input_0"],
+"names":["factory","module","exports","Highcharts","seriesType","seriesTypes","noop","pick","each","animation","center","width","neckWidth","height","neckHeight","reversed","size","animate","translate","getLength","length","relativeTo","test","parseInt","sum","chart","series","options","ignoreHiddenPoint","plotWidth","plotHeight","cumulative","centerX","centerY","tempWidth","getWidthAt","neckY","data","path","fraction","half","dataLabels","position","x1","y1","x2","x3","y3","x4","y5","y","top","getX","series.getX","point","labelDistance","visible","push","shapeType","shapeArgs","d","percentage","plotX","plotY","tooltipPos","slice","drawPoints","column","prototype","sortByAngle","points","sort","a","b","drawDataLabels","distance","leftSide","sign","i","x","maxLabelDistance","Math","max","labelPos","pie","call"]
+}

data/app/assets/javascripts/highstock/modules/funnel.src.js

@@ -1,322 +1,298 @@
 /**
- * @license 
+ * @license Highcharts JS v5.0.11 (2017-05-04)
  * Highcharts funnel module
  *
- * (c) 2010-2014 Torstein Honsi
+ * (c) 2010-2017 Torstein Honsi
  *
  * License: www.highcharts.com/license
  */
-/* eslint indent:0 */
-(function (factory) {
+'use strict';
+(function(factory) {
     if (typeof module === 'object' && module.exports) {
         module.exports = factory;
     } else {
         factory(Highcharts);
     }
-}(function (Highcharts) {
-	
-'use strict';
+}(function(Highcharts) {
+    (function(Highcharts) {
+        /**
+         * Highcharts funnel module
+         *
+         * (c) 2010-2017 Torstein Honsi
+         *
+         * License: www.highcharts.com/license
+         */
+        /* eslint indent:0 */
 
-// create shortcuts
-var defaultOptions = Highcharts.getOptions(),
-	defaultPlotOptions = defaultOptions.plotOptions,
-	seriesTypes = Highcharts.seriesTypes,
-	merge = Highcharts.merge,
-	noop = function () {},
-	each = Highcharts.each,
-	pick = Highcharts.pick;
-
-// set default options
-defaultPlotOptions.funnel = merge(defaultPlotOptions.pie, {
-	animation: false,
-	center: ['50%', '50%'],
-	width: '90%',
-	neckWidth: '30%',
-	height: '100%',
-	neckHeight: '25%',
-	reversed: false,
-	dataLabels: {
-		//position: 'right',
-		connectorWidth: 1,
-		connectorColor: '#606060'
-	},
-	size: true, // to avoid adapting to data label size in Pie.drawDataLabels
-	states: {
-		select: {
-			color: '#C0C0C0',
-			borderColor: '#000000',
-			shadow: false
-		}
-	}	
-});
-
-
-seriesTypes.funnel = Highcharts.extendClass(seriesTypes.pie, {
-	
-	type: 'funnel',
-	animate: noop,
-
-	/**
-	 * Overrides the pie translate method
-	 */
-	translate: function () {
-		
-		var 
-			// Get positions - either an integer or a percentage string must be given
-			getLength = function (length, relativeTo) {
-				return (/%$/).test(length) ?
-					relativeTo * parseInt(length, 10) / 100 :
-					parseInt(length, 10);
-			},
-			
-			sum = 0,
-			series = this,
-			chart = series.chart,
-			options = series.options,
-			reversed = options.reversed,
-			ignoreHiddenPoint = options.ignoreHiddenPoint,
-			plotWidth = chart.plotWidth,
-			plotHeight = chart.plotHeight,
-			cumulative = 0, // start at top
-			center = options.center,
-			centerX = getLength(center[0], plotWidth),
-			centerY = getLength(center[1], plotHeight),
-			width = getLength(options.width, plotWidth),
-			tempWidth,
-			getWidthAt,
-			height = getLength(options.height, plotHeight),
-			neckWidth = getLength(options.neckWidth, plotWidth),
-			neckHeight = getLength(options.neckHeight, plotHeight),
-			neckY = (centerY - height / 2) + height - neckHeight,
-			data = series.data,
-			path,
-			fraction,
-			half = options.dataLabels.position === 'left' ? 1 : 0,
-
-			x1, 
-			y1, 
-			x2, 
-			x3, 
-			y3, 
-			x4, 
-			y5;
-
-		// Return the width at a specific y coordinate
-		series.getWidthAt = getWidthAt = function (y) {
-			var top = (centerY - height / 2);
-			
-			return y > neckY || height === neckHeight ?
-				neckWidth :
-				neckWidth + (width - neckWidth) * (1 - (y - top) / (height - neckHeight));
-		};
-		series.getX = function (y, half) {
-			return centerX + (half ? -1 : 1) * ((getWidthAt(reversed ? plotHeight - y : y) / 2) + options.dataLabels.distance);
-		};
-
-		// Expose
-		series.center = [centerX, centerY, height];
-		series.centerX = centerX;
-
-		/*
-		 * Individual point coordinate naming:
-		 *
-		 * x1,y1 _________________ x2,y1
-		 *  \                         /
-		 *   \                       /
-		 *    \                     /
-		 *     \                   /
-		 *      \                 /
-		 *     x3,y3 _________ x4,y3
-		 *
-		 * Additional for the base of the neck:
-		 *
-		 *       |               |
-		 *       |               |
-		 *       |               |
-		 *     x3,y5 _________ x4,y5
-		 */
-
-
-
-
-		// get the total sum
-		each(data, function (point) {
-			if (!ignoreHiddenPoint || point.visible !== false) {
-				sum += point.y;
-			}
-		});
-
-		each(data, function (point) {
-			// set start and end positions
-			y5 = null;
-			fraction = sum ? point.y / sum : 0;
-			y1 = centerY - height / 2 + cumulative * height;
-			y3 = y1 + fraction * height;
-			//tempWidth = neckWidth + (width - neckWidth) * ((height - neckHeight - y1) / (height - neckHeight));
-			tempWidth = getWidthAt(y1);
-			x1 = centerX - tempWidth / 2;
-			x2 = x1 + tempWidth;
-			tempWidth = getWidthAt(y3);
-			x3 = centerX - tempWidth / 2;
-			x4 = x3 + tempWidth;
-
-			// the entire point is within the neck
-			if (y1 > neckY) {
-				x1 = x3 = centerX - neckWidth / 2;
-				x2 = x4 = centerX + neckWidth / 2;
-			
-			// the base of the neck
-			} else if (y3 > neckY) {
-				y5 = y3;
-
-				tempWidth = getWidthAt(neckY);
-				x3 = centerX - tempWidth / 2;
-				x4 = x3 + tempWidth;
-
-				y3 = neckY;
-			}
-
-			if (reversed) {
-				y1 = height - y1;
-				y3 = height - y3;
-				y5 = (y5 ? height - y5 : null);
-			}
-			// save the path
-			path = [
-				'M',
-				x1, y1,
-				'L',
-				x2, y1,
-				x4, y3
-			];
-			if (y5) {
-				path.push(x4, y5, x3, y5);
-			}
-			path.push(x3, y3, 'Z');
-
-			// prepare for using shared dr
-			point.shapeType = 'path';
-			point.shapeArgs = { d: path };
-
-
-			// for tooltips and data labels
-			point.percentage = fraction * 100;
-			point.plotX = centerX;
-			point.plotY = (y1 + (y5 || y3)) / 2;
-
-			// Placement of tooltips and data labels
-			point.tooltipPos = [
-				centerX,
-				point.plotY
-			];
-
-			// Slice is a noop on funnel points
-			point.slice = noop;
-			
-			// Mimicking pie data label placement logic
-			point.half = half;
-
-			if (!ignoreHiddenPoint || point.visible !== false) {
-				cumulative += fraction;
-			}
-		});		
-	},
-	/**
-	 * Draw a single point (wedge)
-	 * @param {Object} point The point object
-	 * @param {Object} color The color of the point
-	 * @param {Number} brightness The brightness relative to the color
-	 */
-	drawPoints: function () {
-		var series = this,
-			options = series.options,
-			chart = series.chart,
-			renderer = chart.renderer;
-
-		each(series.data, function (point) {
-			var pointOptions = point.options,
-				graphic = point.graphic,
-				shapeArgs = point.shapeArgs;
-
-			if (!graphic) { // Create the shapes				
-				point.graphic = renderer.path(shapeArgs)
-					.attr({
-						fill: point.color,
-						stroke: pick(pointOptions.borderColor, options.borderColor),
-						'stroke-width': pick(pointOptions.borderWidth, options.borderWidth)
-					})
-					.add(series.group);
-					
-			} else { // Update the shapes
-				graphic.animate(shapeArgs);
-			}
-		});
-	},
-
-	/**
-	 * Funnel items don't have angles (#2289)
-	 */
-	sortByAngle: function (points) {
-		points.sort(function (a, b) {
-			return a.plotY - b.plotY;
-		});
-	},
-	
-	/**
-	 * Extend the pie data label method
-	 */
-	drawDataLabels: function () {
-		var data = this.data,
-			labelDistance = this.options.dataLabels.distance,
-			leftSide,
-			sign,
-			point,
-			i = data.length,
-			x,
-			y;
-		
-		// In the original pie label anticollision logic, the slots are distributed
-		// from one labelDistance above to one labelDistance below the pie. In funnels
-		// we don't want this.
-		this.center[2] -= 2 * labelDistance;
-		
-		// Set the label position array for each point.
-		while (i--) {
-			point = data[i];
-			leftSide = point.half;
-			sign = leftSide ? 1 : -1;
-			y = point.plotY;
-			x = this.getX(y, leftSide);
-				
-			// set the anchor point for data labels
-			point.labelPos = [
-				0, // first break of connector
-				y, // a/a
-				x + (labelDistance - 5) * sign, // second break, right outside point shape
-				y, // a/a
-				x + labelDistance * sign, // landing point for connector
-				y, // a/a
-				leftSide ? 'right' : 'left', // alignment
-				0 // center angle
-			];
-		}
-		
-		seriesTypes.pie.prototype.drawDataLabels.call(this);
-	}
-
-});
-
-/** 
- * Pyramid series type.
- * A pyramid series is a special type of funnel, without neck and reversed by default.
- */
-defaultOptions.plotOptions.pyramid = Highcharts.merge(defaultOptions.plotOptions.funnel, {        
-	neckWidth: '0%',
-	neckHeight: '0%',
-	reversed: true
-});
-Highcharts.seriesTypes.pyramid = Highcharts.extendClass(Highcharts.seriesTypes.funnel, {
-	type: 'pyramid'
-});
+        // create shortcuts
+        var seriesType = Highcharts.seriesType,
+            seriesTypes = Highcharts.seriesTypes,
+            noop = Highcharts.noop,
+            pick = Highcharts.pick,
+            each = Highcharts.each;
+
+
+        seriesType('funnel', 'pie', {
+                animation: false,
+                center: ['50%', '50%'],
+                width: '90%',
+                neckWidth: '30%',
+                height: '100%',
+                neckHeight: '25%',
+                reversed: false,
+                size: true, // to avoid adapting to data label size in Pie.drawDataLabels
+
+
+            },
+
+            // Properties
+            {
+                animate: noop,
+
+                /**
+                 * Overrides the pie translate method
+                 */
+                translate: function() {
+
+                    var
+                        // Get positions - either an integer or a percentage string must be given
+                        getLength = function(length, relativeTo) {
+                            return (/%$/).test(length) ?
+                                relativeTo * parseInt(length, 10) / 100 :
+                                parseInt(length, 10);
+                        },
+
+                        sum = 0,
+                        series = this,
+                        chart = series.chart,
+                        options = series.options,
+                        reversed = options.reversed,
+                        ignoreHiddenPoint = options.ignoreHiddenPoint,
+                        plotWidth = chart.plotWidth,
+                        plotHeight = chart.plotHeight,
+                        cumulative = 0, // start at top
+                        center = options.center,
+                        centerX = getLength(center[0], plotWidth),
+                        centerY = getLength(center[1], plotHeight),
+                        width = getLength(options.width, plotWidth),
+                        tempWidth,
+                        getWidthAt,
+                        height = getLength(options.height, plotHeight),
+                        neckWidth = getLength(options.neckWidth, plotWidth),
+                        neckHeight = getLength(options.neckHeight, plotHeight),
+                        neckY = (centerY - height / 2) + height - neckHeight,
+                        data = series.data,
+                        path,
+                        fraction,
+                        half = options.dataLabels.position === 'left' ? 1 : 0,
+
+                        x1,
+                        y1,
+                        x2,
+                        x3,
+                        y3,
+                        x4,
+                        y5;
+
+                    // Return the width at a specific y coordinate
+                    series.getWidthAt = getWidthAt = function(y) {
+                        var top = (centerY - height / 2);
+
+                        return y > neckY || height === neckHeight ?
+                            neckWidth :
+                            neckWidth + (width - neckWidth) * (1 - (y - top) / (height - neckHeight));
+                    };
+                    series.getX = function(y, half, point) {
+                        return centerX + (half ? -1 : 1) * ((getWidthAt(reversed ? 2 * centerY - y : y) / 2) + point.labelDistance);
+                    };
+
+                    // Expose
+                    series.center = [centerX, centerY, height];
+                    series.centerX = centerX;
+
+                    /*
+                     * Individual point coordinate naming:
+                     *
+                     * x1,y1 _________________ x2,y1
+                     *  \                         /
+                     *   \                       /
+                     *    \                     /
+                     *     \                   /
+                     *      \                 /
+                     *     x3,y3 _________ x4,y3
+                     *
+                     * Additional for the base of the neck:
+                     *
+                     *       |               |
+                     *       |               |
+                     *       |               |
+                     *     x3,y5 _________ x4,y5
+                     */
+
+
+
+
+                    // get the total sum
+                    each(data, function(point) {
+                        if (!ignoreHiddenPoint || point.visible !== false) {
+                            sum += point.y;
+                        }
+                    });
+
+                    each(data, function(point) {
+                        // set start and end positions
+                        y5 = null;
+                        fraction = sum ? point.y / sum : 0;
+                        y1 = centerY - height / 2 + cumulative * height;
+                        y3 = y1 + fraction * height;
+                        //tempWidth = neckWidth + (width - neckWidth) * ((height - neckHeight - y1) / (height - neckHeight));
+                        tempWidth = getWidthAt(y1);
+                        x1 = centerX - tempWidth / 2;
+                        x2 = x1 + tempWidth;
+                        tempWidth = getWidthAt(y3);
+                        x3 = centerX - tempWidth / 2;
+                        x4 = x3 + tempWidth;
+
+                        // the entire point is within the neck
+                        if (y1 > neckY) {
+                            x1 = x3 = centerX - neckWidth / 2;
+                            x2 = x4 = centerX + neckWidth / 2;
+
+                            // the base of the neck
+                        } else if (y3 > neckY) {
+                            y5 = y3;
+
+                            tempWidth = getWidthAt(neckY);
+                            x3 = centerX - tempWidth / 2;
+                            x4 = x3 + tempWidth;
+
+                            y3 = neckY;
+                        }
+
+                        if (reversed) {
+                            y1 = 2 * centerY - y1;
+                            y3 = 2 * centerY - y3;
+                            y5 = (y5 ? 2 * centerY - y5 : null);
+                        }
+                        // save the path
+                        path = [
+                            'M',
+                            x1, y1,
+                            'L',
+                            x2, y1,
+                            x4, y3
+                        ];
+                        if (y5) {
+                            path.push(x4, y5, x3, y5);
+                        }
+                        path.push(x3, y3, 'Z');
+
+                        // prepare for using shared dr
+                        point.shapeType = 'path';
+                        point.shapeArgs = {
+                            d: path
+                        };
+
+
+                        // for tooltips and data labels
+                        point.percentage = fraction * 100;
+                        point.plotX = centerX;
+                        point.plotY = (y1 + (y5 || y3)) / 2;
+
+                        // Placement of tooltips and data labels
+                        point.tooltipPos = [
+                            centerX,
+                            point.plotY
+                        ];
+
+                        // Slice is a noop on funnel points
+                        point.slice = noop;
+
+                        // Mimicking pie data label placement logic
+                        point.half = half;
+
+                        if (!ignoreHiddenPoint || point.visible !== false) {
+                            cumulative += fraction;
+                        }
+                    });
+                },
+                /**
+                 * Draw a single point (wedge)
+                 * @param {Object} point The point object
+                 * @param {Object} color The color of the point
+                 * @param {Number} brightness The brightness relative to the color
+                 */
+                drawPoints: seriesTypes.column.prototype.drawPoints,
+
+                /**
+                 * Funnel items don't have angles (#2289)
+                 */
+                sortByAngle: function(points) {
+                    points.sort(function(a, b) {
+                        return a.plotY - b.plotY;
+                    });
+                },
+
+                /**
+                 * Extend the pie data label method
+                 */
+                drawDataLabels: function() {
+                    var series = this,
+                        data = series.data,
+                        labelDistance = series.options.dataLabels.distance,
+                        leftSide,
+                        sign,
+                        point,
+                        i = data.length,
+                        x,
+                        y;
+
+                    // In the original pie label anticollision logic, the slots are distributed
+                    // from one labelDistance above to one labelDistance below the pie. In funnels
+                    // we don't want this.
+                    series.center[2] -= 2 * labelDistance;
+
+                    // Set the label position array for each point.
+                    while (i--) {
+                        point = data[i];
+                        leftSide = point.half;
+                        sign = leftSide ? 1 : -1;
+                        y = point.plotY;
+                        point.labelDistance = pick(
+                            point.options.dataLabels && point.options.dataLabels.distance,
+                            labelDistance
+                        );
+
+                        series.maxLabelDistance = Math.max(point.labelDistance, series.maxLabelDistance || 0);
+                        x = series.getX(y, leftSide, point);
+
+                        // set the anchor point for data labels
+                        point.labelPos = [
+                            0, // first break of connector
+                            y, // a/a
+                            x + (point.labelDistance - 5) * sign, // second break, right outside point shape
+                            y, // a/a
+                            x + point.labelDistance * sign, // landing point for connector
+                            y, // a/a
+                            leftSide ? 'right' : 'left', // alignment
+                            0 // center angle
+                        ];
+                    }
+
+                    seriesTypes.pie.prototype.drawDataLabels.call(this);
+                }
+
+            });
+
+        /** 
+         * Pyramid series type.
+         * A pyramid series is a special type of funnel, without neck and reversed by default.
+         */
+        seriesType('pyramid', 'funnel', {
+            neckWidth: '0%',
+            neckHeight: '0%',
+            reversed: true
+        });
 
+    }(Highcharts));
 }));