ol/geom/flat/transform export

src/ol/geom/Geometry.js

@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
 import BaseObject from '../Object.js';
 import {createEmpty, getHeight, returnOrUpdate} from '../extent.js';
 import {FALSE} from '../functions.js';
-import _ol_geom_flat_transform_ from '../geom/flat/transform.js';
+import {transform2D} from '../geom/flat/transform.js';
 import {get as getProjection, getTransform} from '../proj.js';
 import Units from '../proj/Units.js';
 import _ol_transform_ from '../transform.js';
@@ -265,7 +265,7 @@ Geometry.prototype.transform = function(source, destination) {
         projectedExtent[0], projectedExtent[3],
         scale, -scale, 0,
         0, 0);
-      _ol_geom_flat_transform_.transform2D(inCoordinates, 0, inCoordinates.length, stride,
+      transform2D(inCoordinates, 0, inCoordinates.length, stride,
         tmpTransform, outCoordinates);
       return getTransform(source, destination)(inCoordinates, outCoordinates, stride);
     } :

src/ol/geom/SimpleGeometry.js

@@ -6,7 +6,7 @@ import {FALSE} from '../functions.js';
 import {createOrUpdateFromFlatCoordinates, getCenter} from '../extent.js';
 import Geometry from '../geom/Geometry.js';
 import GeometryLayout from '../geom/GeometryLayout.js';
-import _ol_geom_flat_transform_ from '../geom/flat/transform.js';
+import {rotate, scale, translate, transform2D} from '../geom/flat/transform.js';
 import {clear} from '../obj.js';
 
 /**
@@ -267,7 +267,7 @@ SimpleGeometry.prototype.rotate = function(angle, anchor) {
   const flatCoordinates = this.getFlatCoordinates();
   if (flatCoordinates) {
     const stride = this.getStride();
-    _ol_geom_flat_transform_.rotate(
+    rotate(
       flatCoordinates, 0, flatCoordinates.length,
       stride, angle, anchor, flatCoordinates);
     this.changed();
@@ -291,7 +291,7 @@ SimpleGeometry.prototype.scale = function(sx, opt_sy, opt_anchor) {
   const flatCoordinates = this.getFlatCoordinates();
   if (flatCoordinates) {
     const stride = this.getStride();
-    _ol_geom_flat_transform_.scale(
+    scale(
       flatCoordinates, 0, flatCoordinates.length,
       stride, sx, sy, anchor, flatCoordinates);
     this.changed();
@@ -307,7 +307,7 @@ SimpleGeometry.prototype.translate = function(deltaX, deltaY) {
   const flatCoordinates = this.getFlatCoordinates();
   if (flatCoordinates) {
     const stride = this.getStride();
-    _ol_geom_flat_transform_.translate(
+    translate(
       flatCoordinates, 0, flatCoordinates.length, stride,
       deltaX, deltaY, flatCoordinates);
     this.changed();
@@ -327,7 +327,7 @@ SimpleGeometry.transform2D = function(simpleGeometry, transform, opt_dest) {
     return null;
   } else {
     const stride = simpleGeometry.getStride();
-    return _ol_geom_flat_transform_.transform2D(
+    return transform2D(
       flatCoordinates, 0, flatCoordinates.length, stride,
       transform, opt_dest);
   }

src/ol/geom/flat/transform.js

@@ -1,7 +1,6 @@
 /**
  * @module ol/geom/flat/transform
  */
-const _ol_geom_flat_transform_ = {};
 
 
 /**
@@ -13,7 +12,7 @@ const _ol_geom_flat_transform_ = {};
  * @param {Array.<number>=} opt_dest Destination.
  * @return {Array.<number>} Transformed coordinates.
  */
-_ol_geom_flat_transform_.transform2D = function(flatCoordinates, offset, end, stride, transform, opt_dest) {
+export function transform2D(flatCoordinates, offset, end, stride, transform, opt_dest) {
   const dest = opt_dest ? opt_dest : [];
   let i = 0;
   for (let j = offset; j < end; j += stride) {
@@ -26,7 +25,7 @@ _ol_geom_flat_transform_.transform2D = function(flatCoordinates, offset, end, st
     dest.length = i;
   }
   return dest;
-};
+}
 
 
 /**
@@ -39,7 +38,7 @@ _ol_geom_flat_transform_.transform2D = function(flatCoordinates, offset, end, st
  * @param {Array.<number>=} opt_dest Destination.
  * @return {Array.<number>} Transformed coordinates.
  */
-_ol_geom_flat_transform_.rotate = function(flatCoordinates, offset, end, stride, angle, anchor, opt_dest) {
+export function rotate(flatCoordinates, offset, end, stride, angle, anchor, opt_dest) {
   const dest = opt_dest ? opt_dest : [];
   const cos = Math.cos(angle);
   const sin = Math.sin(angle);
@@ -59,7 +58,7 @@ _ol_geom_flat_transform_.rotate = function(flatCoordinates, offset, end, stride,
     dest.length = i;
   }
   return dest;
-};
+}
 
 
 /**
@@ -74,7 +73,7 @@ _ol_geom_flat_transform_.rotate = function(flatCoordinates, offset, end, stride,
  * @param {Array.<number>=} opt_dest Destination.
  * @return {Array.<number>} Transformed coordinates.
  */
-_ol_geom_flat_transform_.scale = function(flatCoordinates, offset, end, stride, sx, sy, anchor, opt_dest) {
+export function scale(flatCoordinates, offset, end, stride, sx, sy, anchor, opt_dest) {
   const dest = opt_dest ? opt_dest : [];
   const anchorX = anchor[0];
   const anchorY = anchor[1];
@@ -92,7 +91,7 @@ _ol_geom_flat_transform_.scale = function(flatCoordinates, offset, end, stride,
     dest.length = i;
   }
   return dest;
-};
+}
 
 
 /**
@@ -105,7 +104,7 @@ _ol_geom_flat_transform_.scale = function(flatCoordinates, offset, end, stride,
  * @param {Array.<number>=} opt_dest Destination.
  * @return {Array.<number>} Transformed coordinates.
  */
-_ol_geom_flat_transform_.translate = function(flatCoordinates, offset, end, stride, deltaX, deltaY, opt_dest) {
+export function translate(flatCoordinates, offset, end, stride, deltaX, deltaY, opt_dest) {
   const dest = opt_dest ? opt_dest : [];
   let i = 0;
   for (let j = offset; j < end; j += stride) {
@@ -119,5 +118,4 @@ _ol_geom_flat_transform_.translate = function(flatCoordinates, offset, end, stri
     dest.length = i;
   }
   return dest;
-};
-export default _ol_geom_flat_transform_;
+}