Move ol.geom.orientFlatLinearRings into ol.geom.flat

src/ol/geom/flatgeom.js

@@ -256,6 +256,48 @@ ol.geom.flat.linearRingssContainsXY =
 };
 
 
+/**
+ * @param {Array.<number>} flatCoordinates Flat coordinates.
+ * @param {number} offset Offset.
+ * @param {Array.<number>} ends Ends.
+ * @param {number} stride Stride.
+ * @return {number} End.
+ */
+ol.geom.flat.orientLinearRings =
+    function(flatCoordinates, offset, ends, stride) {
+  var i, ii;
+  for (i = 0, ii = ends.length; i < ii; ++i) {
+    var end = ends[i];
+    var isClockwise = ol.geom.flat.linearRingIsClockwise(
+        flatCoordinates, offset, end, stride);
+    var reverse = i === 0 ? !isClockwise : isClockwise;
+    if (reverse) {
+      ol.geom.flat.reverseCoordinates(flatCoordinates, offset, end, stride);
+    }
+    offset = end;
+  }
+  return offset;
+};
+
+
+/**
+ * @param {Array.<number>} flatCoordinates Flat coordinates.
+ * @param {number} offset Offset.
+ * @param {Array.<Array.<number>>} endss Endss.
+ * @param {number} stride Stride.
+ * @return {number} End.
+ */
+ol.geom.flat.orientLinearRingss =
+    function(flatCoordinates, offset, endss, stride) {
+  var i, ii;
+  for (i = 0, ii = endss.length; i < ii; ++i) {
+    offset = ol.geom.flat.orientLinearRings(
+        flatCoordinates, offset, endss[i], stride);
+  }
+  return offset;
+};
+
+
 /**
  * @param {Array.<number>} flatCoordinates Flat coordinates.
  * @param {number} offset Offset.

src/ol/geom/geometry.js

@@ -262,48 +262,6 @@ ol.geom.RawMultiLineString;
 ol.geom.RawMultiPolygon;
 
 
-/**
- * @param {Array.<number>} flatCoordinates Flat coordinates.
- * @param {number} offset Offset.
- * @param {Array.<number>} ends Ends.
- * @param {number} stride Stride.
- * @return {number} End.
- */
-ol.geom.orientFlatLinearRings =
-    function(flatCoordinates, offset, ends, stride) {
-  var i, ii;
-  for (i = 0, ii = ends.length; i < ii; ++i) {
-    var end = ends[i];
-    var isClockwise = ol.geom.flat.linearRingIsClockwise(
-        flatCoordinates, offset, end, stride);
-    var reverse = i === 0 ? !isClockwise : isClockwise;
-    if (reverse) {
-      ol.geom.flat.reverseCoordinates(flatCoordinates, offset, end, stride);
-    }
-    offset = end;
-  }
-  return offset;
-};
-
-
-/**
- * @param {Array.<number>} flatCoordinates Flat coordinates.
- * @param {number} offset Offset.
- * @param {Array.<Array.<number>>} endss Endss.
- * @param {number} stride Stride.
- * @return {number} End.
- */
-ol.geom.orientFlatLinearRingss =
-    function(flatCoordinates, offset, endss, stride) {
-  var i, ii;
-  for (i = 0, ii = endss.length; i < ii; ++i) {
-    offset = ol.geom.orientFlatLinearRings(
-        flatCoordinates, offset, endss[i], stride);
-  }
-  return offset;
-};
-
-
 /**
  * @param {ol.geom.Geometry} geometry Geometry.
  * @param {goog.vec.Mat4.AnyType} transform Transform.

src/ol/geom/multipolygon.js

@@ -70,7 +70,7 @@ ol.geom.MultiPolygon.prototype.setCoordinates =
   this.setLayout(opt_layout, coordinates, 3);
   ol.geom.flat.deflateCoordinatesss(
       this.flatCoordinates, 0, coordinates, this.stride, this.endss_);
-  ol.geom.orientFlatLinearRingss(
+  ol.geom.flat.orientLinearRingss(
       this.flatCoordinates, 0, this.endss_, this.stride);
   this.dispatchChangeEvent();
 };

src/ol/geom/polygon.js

@@ -70,7 +70,7 @@ ol.geom.Polygon.prototype.setCoordinates =
   this.setLayout(opt_layout, coordinates, 2);
   ol.geom.flat.deflateCoordinatess(
       this.flatCoordinates, 0, coordinates, this.stride, this.ends_);
-  ol.geom.orientFlatLinearRings(
+  ol.geom.flat.orientLinearRings(
       this.flatCoordinates, 0, this.ends_, this.stride);
   this.dispatchChangeEvent();
 };