Segmentize line

Author: kurkle

src/controllers/controller.radar.js

@@ -21,12 +21,16 @@ defaults._set('radar', {
 	}
 });
 
-function nextItem(collection, index) {
-	return index >= collection.length - 1 ? collection[0] : collection[index + 1];
+function nextItem(collection, index, loop) {
+	return index >= collection.length - 1
+		? loop ? collection[0] : collection[index]
+		: collection[index + 1];
 }
 
-function previousItem(collection, index) {
-	return index <= 0 ? collection[collection.length - 1] : collection[index - 1];
+function previousItem(collection, index, loop) {
+	return index <= 0
+		? loop ? collection[collection.length - 1] : collection[index]
+		: collection[index - 1];
 }
 
 module.exports = DatasetController.extend({
@@ -99,11 +103,14 @@ module.exports = DatasetController.extend({
 		var line = meta.dataset;
 		var points = meta.data || [];
 		var animationsDisabled = me.chart._animationsDisabled;
+		var labels = meta.iScale._getLabels();
 		var i, ilen;
 
 		// Data
 		line.points = points;
 		line._loop = true;
+		line._fullLoop = labels.length === points.length;
+
 		// Model
 		line._model = me._resolveDatasetElementOptions();
 
@@ -133,7 +140,6 @@ module.exports = DatasetController.extend({
 			const options = me._resolveDataElementOptions(i);
 			const x = reset ? scale.xCenter : pointPosition.x;
 			const y = reset ? scale.yCenter : pointPosition.y;
-			const r = pointPosition.r;
 
 			// Utility
 			point._options = options;
@@ -142,7 +148,7 @@ module.exports = DatasetController.extend({
 			point._model = {
 				x,
 				y,
-				r,
+				r: pointPosition.r,
 				skip: isNaN(x) || isNaN(y),
 				// Appearance
 				radius: options.radius,
@@ -176,13 +182,16 @@ module.exports = DatasetController.extend({
 	updateBezierControlPoints: function() {
 		var me = this;
 		var meta = me._cachedMeta;
-		var lineModel = meta.dataset._model;
+		var line = meta.dataset;
+		var lineModel = line._model;
+		var spanGaps = lineModel.spanGaps;
+		var loop = spanGaps ? line._loop : line._fullLoop;
 		var area = me.chart.chartArea;
 		var points = meta.data || [];
 		var i, ilen, model, controlPoints;
 
 		// Only consider points that are drawn in case the spanGaps option is used
-		if (meta.dataset._model.spanGaps) {
+		if (spanGaps) {
 			points = points.filter(function(pt) {
 				return !pt._model.skip;
 			});
@@ -195,9 +204,9 @@ module.exports = DatasetController.extend({
 		for (i = 0, ilen = points.length; i < ilen; ++i) {
 			model = points[i]._model;
 			controlPoints = helpers.splineCurve(
-				previousItem(points, i)._model,
+				previousItem(points, i, loop)._model,
 				model,
-				nextItem(points, i)._model,
+				nextItem(points, i, loop)._model,
 				lineModel.tension
 			);