diff --git a/src/ol/Graticule.js b/src/ol/Graticule.js index c4f6e4cd14..4682476256 100644 --- a/src/ol/Graticule.js +++ b/src/ol/Graticule.js @@ -575,7 +575,7 @@ Graticule.prototype.getMeridian_ = function(lon, minLat, maxLat, squaredToleranc if (!lineString) { lineString = this.meridians_[index] = new LineString(flatCoordinates, GeometryLayout.XY); } else { - lineString.setFlatCoordinatesInternal(GeometryLayout.XY, flatCoordinates); + lineString.setFlatCoordinates(GeometryLayout.XY, flatCoordinates); lineString.changed(); } return lineString; @@ -607,7 +607,7 @@ Graticule.prototype.getParallel_ = function(lat, minLon, maxLon, squaredToleranc if (!lineString) { lineString = new LineString(flatCoordinates, GeometryLayout.XY); } else { - lineString.setFlatCoordinatesInternal(GeometryLayout.XY, flatCoordinates); + lineString.setFlatCoordinates(GeometryLayout.XY, flatCoordinates); lineString.changed(); } return lineString; diff --git a/src/ol/geom/Circle.js b/src/ol/geom/Circle.js index e0597d473a..2864866be9 100644 --- a/src/ol/geom/Circle.js +++ b/src/ol/geom/Circle.js @@ -23,7 +23,7 @@ import {deflateCoordinate} from '../geom/flat/deflate.js'; const Circle = function(center, opt_radius, opt_layout) { SimpleGeometry.call(this); if (opt_layout !== undefined && opt_radius === undefined) { - this.setFlatCoordinatesInternal(opt_layout, center); + this.setFlatCoordinates(opt_layout, center); } else { const radius = opt_radius ? opt_radius : 0; this.setCenterAndRadius(center, radius, opt_layout); @@ -173,7 +173,7 @@ Circle.prototype.setCenter = function(center) { for (let i = 1; i < stride; ++i) { flatCoordinates[stride + i] = center[i]; } - this.setFlatCoordinatesInternal(this.layout, flatCoordinates); + this.setFlatCoordinates(this.layout, flatCoordinates); this.changed(); }; diff --git a/src/ol/geom/LineString.js b/src/ol/geom/LineString.js index 81ba45fc08..5154767dec 100644 --- a/src/ol/geom/LineString.js +++ b/src/ol/geom/LineString.js @@ -57,7 +57,7 @@ const LineString = function(coordinates, opt_layout) { this.maxDeltaRevision_ = -1; if (opt_layout !== undefined && !Array.isArray(coordinates[0])) { - this.setFlatCoordinatesInternal(opt_layout, coordinates); + this.setFlatCoordinates(opt_layout, coordinates); } else { this.setCoordinates(coordinates, opt_layout); } diff --git a/src/ol/geom/LinearRing.js b/src/ol/geom/LinearRing.js index 3150afc0e2..dadfe3ac2f 100644 --- a/src/ol/geom/LinearRing.js +++ b/src/ol/geom/LinearRing.js @@ -42,7 +42,7 @@ const LinearRing = function(coordinates, opt_layout) { this.maxDeltaRevision_ = -1; if (opt_layout !== undefined && !Array.isArray(coordinates[0])) { - this.setFlatCoordinatesInternal(opt_layout, coordinates); + this.setFlatCoordinates(opt_layout, coordinates); } else { this.setCoordinates(coordinates, opt_layout); } diff --git a/src/ol/geom/MultiLineString.js b/src/ol/geom/MultiLineString.js index 51fbb4965a..fcff60af99 100644 --- a/src/ol/geom/MultiLineString.js +++ b/src/ol/geom/MultiLineString.js @@ -53,7 +53,7 @@ const MultiLineString = function(coordinates, opt_layout, opt_ends) { if (Array.isArray(coordinates[0])) { this.setCoordinates(coordinates, opt_layout); } else if (opt_layout !== undefined && opt_ends) { - this.setFlatCoordinatesInternal(opt_layout, coordinates); + this.setFlatCoordinates(opt_layout, coordinates); this.ends_ = opt_ends; } else { let layout = this.getLayout(); @@ -67,7 +67,7 @@ const MultiLineString = function(coordinates, opt_layout, opt_ends) { extend(flatCoordinates, lineString.getFlatCoordinates()); ends.push(flatCoordinates.length); } - this.setFlatCoordinatesInternal(layout, flatCoordinates); + this.setFlatCoordinates(layout, flatCoordinates); this.ends_ = ends; } diff --git a/src/ol/geom/MultiPoint.js b/src/ol/geom/MultiPoint.js index 44f7010f89..9ae1828b75 100644 --- a/src/ol/geom/MultiPoint.js +++ b/src/ol/geom/MultiPoint.js @@ -26,7 +26,7 @@ import {squaredDistance as squaredDx} from '../math.js'; const MultiPoint = function(coordinates, opt_layout) { SimpleGeometry.call(this); if (opt_layout && !Array.isArray(coordinates[0])) { - this.setFlatCoordinatesInternal(opt_layout, coordinates); + this.setFlatCoordinates(opt_layout, coordinates); } else { this.setCoordinates(coordinates, opt_layout); } diff --git a/src/ol/geom/MultiPolygon.js b/src/ol/geom/MultiPolygon.js index 6670d922ee..990dd159c2 100644 --- a/src/ol/geom/MultiPolygon.js +++ b/src/ol/geom/MultiPolygon.js @@ -102,7 +102,7 @@ const MultiPolygon = function(coordinates, opt_layout, opt_endss) { opt_endss = endss; } if (opt_layout !== undefined && opt_endss) { - this.setFlatCoordinatesInternal(opt_layout, coordinates); + this.setFlatCoordinates(opt_layout, coordinates); this.endss_ = opt_endss; } else { this.setCoordinates(coordinates, opt_layout); diff --git a/src/ol/geom/Polygon.js b/src/ol/geom/Polygon.js index effed89fa7..94af9ba32a 100644 --- a/src/ol/geom/Polygon.js +++ b/src/ol/geom/Polygon.js @@ -86,7 +86,7 @@ const Polygon = function(coordinates, opt_layout, opt_ends) { this.orientedFlatCoordinates_ = null; if (opt_layout !== undefined && opt_ends) { - this.setFlatCoordinatesInternal(opt_layout, coordinates); + this.setFlatCoordinates(opt_layout, coordinates); this.ends_ = opt_ends; } else { this.setCoordinates(coordinates, opt_layout); diff --git a/src/ol/geom/SimpleGeometry.js b/src/ol/geom/SimpleGeometry.js index 9b0a6fe052..52edc56423 100644 --- a/src/ol/geom/SimpleGeometry.js +++ b/src/ol/geom/SimpleGeometry.js @@ -204,7 +204,7 @@ SimpleGeometry.prototype.getStride = function() { * @param {module:ol/geom/GeometryLayout} layout Layout. * @param {Array.} flatCoordinates Flat coordinates. */ -SimpleGeometry.prototype.setFlatCoordinatesInternal = function(layout, flatCoordinates) { +SimpleGeometry.prototype.setFlatCoordinates = function(layout, flatCoordinates) { this.stride = getStrideForLayout(layout); this.layout = layout; this.flatCoordinates = flatCoordinates; diff --git a/src/ol/interaction/Draw.js b/src/ol/interaction/Draw.js index d2e8477199..cd42fe7137 100644 --- a/src/ol/interaction/Draw.js +++ b/src/ol/interaction/Draw.js @@ -741,7 +741,7 @@ Draw.prototype.modifyDrawing_ = function(event) { sketchLineGeom = new LineString(ring.getFlatCoordinates(), ring.getLayout()); this.sketchLine_.setGeometry(sketchLineGeom); } else { - sketchLineGeom.setFlatCoordinatesInternal( + sketchLineGeom.setFlatCoordinates( ring.getLayout(), ring.getFlatCoordinates()); sketchLineGeom.changed(); } diff --git a/test/spec/ol/geom/circle.test.js b/test/spec/ol/geom/circle.test.js index bf5922155b..7efcf99755 100644 --- a/test/spec/ol/geom/circle.test.js +++ b/test/spec/ol/geom/circle.test.js @@ -173,7 +173,7 @@ describe('ol.geom.Circle', function() { describe('#setFlatCoordinates', function() { it('sets both center and radius', function() { - circle.setFlatCoordinatesInternal('XY', [1, 2, 4, 2]); + circle.setFlatCoordinates('XY', [1, 2, 4, 2]); expect(circle.getCenter()).to.eql([1, 2]); expect(circle.getRadius()).to.be(3); });