diff --git a/src/ol/format/Polyline.js b/src/ol/format/Polyline.js index 7177da7519..43d07a73fc 100644 --- a/src/ol/format/Polyline.js +++ b/src/ol/format/Polyline.js @@ -10,7 +10,7 @@ import GeometryLayout from '../geom/GeometryLayout.js'; import LineString from '../geom/LineString.js'; import {getStrideForLayout} from '../geom/SimpleGeometry.js'; import {flipXY} from '../geom/flat/flip.js'; -import _ol_geom_flat_inflate_ from '../geom/flat/inflate.js'; +import {inflateCoordinates} from '../geom/flat/inflate.js'; import {get as getProjection} from '../proj.js'; /** @@ -327,7 +327,7 @@ Polyline.prototype.readGeometryFromText = function(text, opt_options) { const stride = getStrideForLayout(this.geometryLayout_); const flatCoordinates = decodeDeltas(text, stride, this.factor_); flipXY(flatCoordinates, 0, flatCoordinates.length, stride, flatCoordinates); - const coordinates = _ol_geom_flat_inflate_.coordinates( + const coordinates = inflateCoordinates( flatCoordinates, 0, flatCoordinates.length, stride); return ( diff --git a/src/ol/geom/LineString.js b/src/ol/geom/LineString.js index 010e5f1cb5..da50f9bb0a 100644 --- a/src/ol/geom/LineString.js +++ b/src/ol/geom/LineString.js @@ -9,7 +9,7 @@ import GeometryType from '../geom/GeometryType.js'; import SimpleGeometry from '../geom/SimpleGeometry.js'; import _ol_geom_flat_closest_ from '../geom/flat/closest.js'; import _ol_geom_flat_deflate_ from '../geom/flat/deflate.js'; -import _ol_geom_flat_inflate_ from '../geom/flat/inflate.js'; +import {inflateCoordinates} from '../geom/flat/inflate.js'; import _ol_geom_flat_interpolate_ from '../geom/flat/interpolate.js'; import _ol_geom_flat_intersectsextent_ from '../geom/flat/intersectsextent.js'; import _ol_geom_flat_length_ from '../geom/flat/length.js'; @@ -155,7 +155,7 @@ LineString.prototype.getCoordinateAtM = function(m, opt_extrapolate) { * @api */ LineString.prototype.getCoordinates = function() { - return _ol_geom_flat_inflate_.coordinates( + return inflateCoordinates( this.flatCoordinates, 0, this.flatCoordinates.length, this.stride); }; diff --git a/src/ol/geom/LinearRing.js b/src/ol/geom/LinearRing.js index 56b98bb9f2..2acac977df 100644 --- a/src/ol/geom/LinearRing.js +++ b/src/ol/geom/LinearRing.js @@ -9,7 +9,7 @@ import SimpleGeometry from '../geom/SimpleGeometry.js'; import {linearRing as linearRingArea} from '../geom/flat/area.js'; import _ol_geom_flat_closest_ from '../geom/flat/closest.js'; import _ol_geom_flat_deflate_ from '../geom/flat/deflate.js'; -import _ol_geom_flat_inflate_ from '../geom/flat/inflate.js'; +import {inflateCoordinates} from '../geom/flat/inflate.js'; import _ol_geom_flat_simplify_ from '../geom/flat/simplify.js'; /** @@ -94,7 +94,7 @@ LinearRing.prototype.getArea = function() { * @api */ LinearRing.prototype.getCoordinates = function() { - return _ol_geom_flat_inflate_.coordinates( + return inflateCoordinates( this.flatCoordinates, 0, this.flatCoordinates.length, this.stride); }; diff --git a/src/ol/geom/MultiLineString.js b/src/ol/geom/MultiLineString.js index 2a4e05cf71..1e6e2f4179 100644 --- a/src/ol/geom/MultiLineString.js +++ b/src/ol/geom/MultiLineString.js @@ -10,7 +10,7 @@ import LineString from '../geom/LineString.js'; import SimpleGeometry from '../geom/SimpleGeometry.js'; import _ol_geom_flat_closest_ from '../geom/flat/closest.js'; import _ol_geom_flat_deflate_ from '../geom/flat/deflate.js'; -import _ol_geom_flat_inflate_ from '../geom/flat/inflate.js'; +import {inflateCoordinatesArray} from '../geom/flat/inflate.js'; import _ol_geom_flat_interpolate_ from '../geom/flat/interpolate.js'; import _ol_geom_flat_intersectsextent_ from '../geom/flat/intersectsextent.js'; import _ol_geom_flat_simplify_ from '../geom/flat/simplify.js'; @@ -144,7 +144,7 @@ MultiLineString.prototype.getCoordinateAtM = function(m, opt_extrapolate, opt_in * @api */ MultiLineString.prototype.getCoordinates = function() { - return _ol_geom_flat_inflate_.coordinatess( + return inflateCoordinatesArray( this.flatCoordinates, 0, this.ends_, this.stride); }; diff --git a/src/ol/geom/MultiPoint.js b/src/ol/geom/MultiPoint.js index a975a36da9..d5ed8a9ff0 100644 --- a/src/ol/geom/MultiPoint.js +++ b/src/ol/geom/MultiPoint.js @@ -9,7 +9,7 @@ import GeometryType from '../geom/GeometryType.js'; import Point from '../geom/Point.js'; import SimpleGeometry from '../geom/SimpleGeometry.js'; import _ol_geom_flat_deflate_ from '../geom/flat/deflate.js'; -import _ol_geom_flat_inflate_ from '../geom/flat/inflate.js'; +import {inflateCoordinates} from '../geom/flat/inflate.js'; import {squaredDistance as squaredDx} from '../math.js'; /** @@ -89,7 +89,7 @@ MultiPoint.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDis * @api */ MultiPoint.prototype.getCoordinates = function() { - return _ol_geom_flat_inflate_.coordinates( + return inflateCoordinates( this.flatCoordinates, 0, this.flatCoordinates.length, this.stride); }; diff --git a/src/ol/geom/MultiPolygon.js b/src/ol/geom/MultiPolygon.js index 32132422ef..a3b539b748 100644 --- a/src/ol/geom/MultiPolygon.js +++ b/src/ol/geom/MultiPolygon.js @@ -14,7 +14,7 @@ import {linearRingss as linearRingssCenter} from '../geom/flat/center.js'; import _ol_geom_flat_closest_ from '../geom/flat/closest.js'; import {linearRingssContainsXY} from '../geom/flat/contains.js'; import _ol_geom_flat_deflate_ from '../geom/flat/deflate.js'; -import _ol_geom_flat_inflate_ from '../geom/flat/inflate.js'; +import {inflateMultiCoordinatesArray} from '../geom/flat/inflate.js'; import _ol_geom_flat_interiorpoint_ from '../geom/flat/interiorpoint.js'; import _ol_geom_flat_intersectsextent_ from '../geom/flat/intersectsextent.js'; import _ol_geom_flat_orient_ from '../geom/flat/orient.js'; @@ -189,7 +189,7 @@ MultiPolygon.prototype.getCoordinates = function(opt_right) { flatCoordinates = this.flatCoordinates; } - return _ol_geom_flat_inflate_.coordinatesss( + return inflateMultiCoordinatesArray( flatCoordinates, 0, this.endss_, this.stride); }; diff --git a/src/ol/geom/Polygon.js b/src/ol/geom/Polygon.js index 388b5ec39b..6620dbaf20 100644 --- a/src/ol/geom/Polygon.js +++ b/src/ol/geom/Polygon.js @@ -14,7 +14,7 @@ import {linearRings as linearRingsArea} from '../geom/flat/area.js'; import _ol_geom_flat_closest_ from '../geom/flat/closest.js'; import {linearRingsContainsXY} from '../geom/flat/contains.js'; import _ol_geom_flat_deflate_ from '../geom/flat/deflate.js'; -import _ol_geom_flat_inflate_ from '../geom/flat/inflate.js'; +import {inflateCoordinatesArray} from '../geom/flat/inflate.js'; import _ol_geom_flat_interiorpoint_ from '../geom/flat/interiorpoint.js'; import _ol_geom_flat_intersectsextent_ from '../geom/flat/intersectsextent.js'; import _ol_geom_flat_orient_ from '../geom/flat/orient.js'; @@ -179,7 +179,7 @@ Polygon.prototype.getCoordinates = function(opt_right) { flatCoordinates = this.flatCoordinates; } - return _ol_geom_flat_inflate_.coordinatess( + return inflateCoordinatesArray( flatCoordinates, 0, this.ends_, this.stride); }; diff --git a/src/ol/geom/flat/inflate.js b/src/ol/geom/flat/inflate.js index b95296c88c..fd7c2ba002 100644 --- a/src/ol/geom/flat/inflate.js +++ b/src/ol/geom/flat/inflate.js @@ -1,7 +1,6 @@ /** * @module ol/geom/flat/inflate */ -const _ol_geom_flat_inflate_ = {}; /** @@ -12,7 +11,7 @@ const _ol_geom_flat_inflate_ = {}; * @param {Array.