From 0477101c28c9a821f4e26dca65ad7fe82e3e9848 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 3 Dec 2013 15:44:25 +0100 Subject: [PATCH] Factor out ol.geom.Geometry.getLayoutForStride_ --- src/ol/geom/geometry.js | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/ol/geom/geometry.js b/src/ol/geom/geometry.js index 334d43c701..3ad28b4aaa 100644 --- a/src/ol/geom/geometry.js +++ b/src/ol/geom/geometry.js @@ -84,6 +84,24 @@ ol.geom.Geometry = function() { goog.inherits(ol.geom.Geometry, goog.events.EventTarget); +/** + * @param {number} stride Stride. + * @private + * @return {ol.geom.Layout} layout Layout. + */ +ol.geom.Geometry.getLayoutForStride_ = function(stride) { + if (stride == 2) { + return ol.geom.Layout.XY; + } else if (stride == 3) { + return ol.geom.Layout.XYZ; + } else if (stride == 4) { + return ol.geom.Layout.XYZM; + } else { + throw new Error('unsupported stride: ' + stride); + } +}; + + /** * @param {ol.Coordinate} coordinate Coordinate. * @return {boolean} Contains coordinate. @@ -197,15 +215,7 @@ ol.geom.Geometry.prototype.setLayout = } } stride = (/** @type {Array} */ (coordinates)).length; - if (stride == 2) { - layout = ol.geom.Layout.XY; - } else if (stride == 3) { - layout = ol.geom.Layout.XYZ; - } else if (stride == 4) { - layout = ol.geom.Layout.XYZM; - } else { - throw new Error('unsupported stride: ' + stride); - } + layout = ol.geom.Geometry.getLayoutForStride_(stride); } this.layout = layout; this.stride = stride;