ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Named export for SimpleGeometry.getStrideForLayout function

Browse Source
This commit is contained in:
Frederic Junod
2017-12-21 08:43:19 +01:00
parent dc5cd438cd
commit 6d4621baeb
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/format/Polyline.js
View File

@@ -8,7 +8,7 @@ import FeatureFormat from '../format/Feature.js';
import TextFeature from '../format/TextFeature.js'; import TextFeature from '../format/TextFeature.js';
import GeometryLayout from '../geom/GeometryLayout.js'; import GeometryLayout from '../geom/GeometryLayout.js';
import LineString from '../geom/LineString.js'; import LineString from '../geom/LineString.js';
import SimpleGeometry from '../geom/SimpleGeometry.js'; import {getStrideForLayout} from '../geom/SimpleGeometry.js';
import _ol_geom_flat_flip_ from '../geom/flat/flip.js'; import _ol_geom_flat_flip_ from '../geom/flat/flip.js';
import _ol_geom_flat_inflate_ from '../geom/flat/inflate.js'; import _ol_geom_flat_inflate_ from '../geom/flat/inflate.js';
import {get as getProjection} from '../proj.js'; import {get as getProjection} from '../proj.js';
@@ -324,7 +324,7 @@ Polyline.prototype.readGeometry;
* @inheritDoc * @inheritDoc
*/ */
Polyline.prototype.readGeometryFromText = function(text, opt_options) { Polyline.prototype.readGeometryFromText = function(text, opt_options) {
var stride = SimpleGeometry.getStrideForLayout(this.geometryLayout_); var stride = getStrideForLayout(this.geometryLayout_);
var flatCoordinates = Polyline.decodeDeltas( var flatCoordinates = Polyline.decodeDeltas(
text, stride, this.factor_); text, stride, this.factor_);
_ol_geom_flat_flip_.flipXY( _ol_geom_flat_flip_.flipXY(

8
src/ol/geom/SimpleGeometry.js
View File

@@ -67,7 +67,7 @@ function getLayoutForStride(stride) {
* @param {ol.geom.GeometryLayout} layout Layout. * @param {ol.geom.GeometryLayout} layout Layout.
* @return {number} Stride. * @return {number} Stride.
*/ */
SimpleGeometry.getStrideForLayout = function(layout) { export function getStrideForLayout(layout) {
var stride; var stride;
if (layout == GeometryLayout.XY) { if (layout == GeometryLayout.XY) {
stride = 2; stride = 2;
@@ -77,7 +77,7 @@ SimpleGeometry.getStrideForLayout = function(layout) {
stride = 4; stride = 4;
} }
return /** @type {number} */ (stride); return /** @type {number} */ (stride);
}; }
/** /**
@@ -204,7 +204,7 @@ SimpleGeometry.prototype.getStride = function() {
* @protected * @protected
*/ */
SimpleGeometry.prototype.setFlatCoordinatesInternal = function(layout, flatCoordinates) { SimpleGeometry.prototype.setFlatCoordinatesInternal = function(layout, flatCoordinates) {
this.stride = SimpleGeometry.getStrideForLayout(layout); this.stride = getStrideForLayout(layout);
this.layout = layout; this.layout = layout;
this.flatCoordinates = flatCoordinates; this.flatCoordinates = flatCoordinates;
}; };
@@ -228,7 +228,7 @@ SimpleGeometry.prototype.setLayout = function(layout, coordinates, nesting) {
/** @type {number} */ /** @type {number} */
var stride; var stride;
if (layout) { if (layout) {
stride = SimpleGeometry.getStrideForLayout(layout); stride = getStrideForLayout(layout);
} else { } else {
var i; var i;
for (i = 0; i < nesting; ++i) { for (i = 0; i < nesting; ++i) {