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

Rename _ol_geom_GeometryLayout_ to GeometryLayout

Browse Source
This commit is contained in:
Tim Schaub
2017-12-14 09:00:20 -07:00
parent 4ea0af87df
commit 2be36c375d
21 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/geom/Circle.js
View File

@@ -3,7 +3,7 @@
*/
import {inherits} from '../index.js';
import {createOrUpdate, forEachCorner, intersects} from '../extent.js';
import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
import _ol_geom_flat_deflate_ from '../geom/flat/deflate.js';
@@ -186,7 +186,7 @@ Circle.prototype.setCenter = function(center) {
*/
Circle.prototype.setCenterAndRadius = function(center, radius, opt_layout) {
if (!center) {
this.setFlatCoordinates(_ol_geom_GeometryLayout_.XY, null);
this.setFlatCoordinates(GeometryLayout.XY, null);
} else {
this.setLayout(opt_layout, center, 0);
if (!this.flatCoordinates) {

4
src/ol/geom/GeometryLayout.js
View File

@@ -7,11 +7,11 @@
* `'XYZ'`, `'XYM'`, `'XYZM'`.
* @enum {string}
*/
var _ol_geom_GeometryLayout_ = {
var GeometryLayout = {
XY: 'XY',
XYZ: 'XYZ',
XYM: 'XYM',
XYZM: 'XYZM'
};
export default _ol_geom_GeometryLayout_;
export default GeometryLayout;

10
src/ol/geom/LineString.js
View File

@@ -4,7 +4,7 @@
import {inherits} from '../index.js';
import _ol_array_ from '../array.js';
import {closestSquaredDistanceXY} from '../extent.js';
import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
import _ol_geom_flat_closest_ from '../geom/flat/closest.js';
@@ -141,8 +141,8 @@ LineString.prototype.forEachSegment = function(callback, opt_this) {
* @api
*/
LineString.prototype.getCoordinateAtM = function(m, opt_extrapolate) {
if (this.layout != _ol_geom_GeometryLayout_.XYM &&
this.layout != _ol_geom_GeometryLayout_.XYZM) {
if (this.layout != GeometryLayout.XYM &&
this.layout != GeometryLayout.XYZM) {
return null;
}
var extrapolate = opt_extrapolate !== undefined ? opt_extrapolate : false;
@@ -213,7 +213,7 @@ LineString.prototype.getSimplifiedGeometryInternal = function(squaredTolerance)
squaredTolerance, simplifiedFlatCoordinates, 0);
var simplifiedLineString = new LineString(null);
simplifiedLineString.setFlatCoordinates(
_ol_geom_GeometryLayout_.XY, simplifiedFlatCoordinates);
GeometryLayout.XY, simplifiedFlatCoordinates);
return simplifiedLineString;
};
@@ -247,7 +247,7 @@ LineString.prototype.intersectsExtent = function(extent) {
*/
LineString.prototype.setCoordinates = function(coordinates, opt_layout) {
if (!coordinates) {
this.setFlatCoordinates(_ol_geom_GeometryLayout_.XY, null);
this.setFlatCoordinates(GeometryLayout.XY, null);
} else {
this.setLayout(opt_layout, coordinates, 1);
if (!this.flatCoordinates) {

6
src/ol/geom/LinearRing.js
View File

@@ -3,7 +3,7 @@
*/
import {inherits} from '../index.js';
import {closestSquaredDistanceXY} from '../extent.js';
import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
import _ol_geom_flat_area_ from '../geom/flat/area.js';
@@ -110,7 +110,7 @@ _ol_geom_LinearRing_.prototype.getSimplifiedGeometryInternal = function(squaredT
squaredTolerance, simplifiedFlatCoordinates, 0);
var simplifiedLinearRing = new _ol_geom_LinearRing_(null);
simplifiedLinearRing.setFlatCoordinates(
_ol_geom_GeometryLayout_.XY, simplifiedFlatCoordinates);
GeometryLayout.XY, simplifiedFlatCoordinates);
return simplifiedLinearRing;
};
@@ -139,7 +139,7 @@ _ol_geom_LinearRing_.prototype.intersectsExtent = function(extent) {};
*/
_ol_geom_LinearRing_.prototype.setCoordinates = function(coordinates, opt_layout) {
if (!coordinates) {
this.setFlatCoordinates(_ol_geom_GeometryLayout_.XY, null);
this.setFlatCoordinates(GeometryLayout.XY, null);
} else {
this.setLayout(opt_layout, coordinates, 1);
if (!this.flatCoordinates) {

10
src/ol/geom/MultiLineString.js
View File

@@ -4,7 +4,7 @@
import {inherits} from '../index.js';
import _ol_array_ from '../array.js';
import {closestSquaredDistanceXY} from '../extent.js';
import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
import LineString from '../geom/LineString.js';
import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
@@ -126,8 +126,8 @@ MultiLineString.prototype.closestPointXY = function(x, y, closestPoint, minSquar
* @api
*/
MultiLineString.prototype.getCoordinateAtM = function(m, opt_extrapolate, opt_interpolate) {
if ((this.layout != _ol_geom_GeometryLayout_.XYM &&
this.layout != _ol_geom_GeometryLayout_.XYZM) ||
if ((this.layout != GeometryLayout.XYM &&
this.layout != GeometryLayout.XYZM) ||
this.flatCoordinates.length === 0) {
return null;
}
@@ -231,7 +231,7 @@ MultiLineString.prototype.getSimplifiedGeometryInternal = function(squaredTolera
simplifiedFlatCoordinates, 0, simplifiedEnds);
var simplifiedMultiLineString = new MultiLineString(null);
simplifiedMultiLineString.setFlatCoordinates(
_ol_geom_GeometryLayout_.XY, simplifiedFlatCoordinates, simplifiedEnds);
GeometryLayout.XY, simplifiedFlatCoordinates, simplifiedEnds);
return simplifiedMultiLineString;
};
@@ -264,7 +264,7 @@ MultiLineString.prototype.intersectsExtent = function(extent) {
*/
MultiLineString.prototype.setCoordinates = function(coordinates, opt_layout) {
if (!coordinates) {
this.setFlatCoordinates(_ol_geom_GeometryLayout_.XY, null, this.ends_);
this.setFlatCoordinates(GeometryLayout.XY, null, this.ends_);
} else {
this.setLayout(opt_layout, coordinates, 2);
if (!this.flatCoordinates) {

4
src/ol/geom/MultiPoint.js
View File

@@ -4,7 +4,7 @@
import {inherits} from '../index.js';
import _ol_array_ from '../array.js';
import {closestSquaredDistanceXY, containsXY} from '../extent.js';
import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
import Point from '../geom/Point.js';
import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
@@ -172,7 +172,7 @@ MultiPoint.prototype.intersectsExtent = function(extent) {
*/
MultiPoint.prototype.setCoordinates = function(coordinates, opt_layout) {
if (!coordinates) {
this.setFlatCoordinates(_ol_geom_GeometryLayout_.XY, null);
this.setFlatCoordinates(GeometryLayout.XY, null);
} else {
this.setLayout(opt_layout, coordinates, 1);
if (!this.flatCoordinates) {

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

@@ -4,7 +4,7 @@
import {inherits} from '../index.js';
import _ol_array_ from '../array.js';
import {closestSquaredDistanceXY} from '../extent.js';
import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
import MultiPoint from '../geom/MultiPoint.js';
import Polygon from '../geom/Polygon.js';
@@ -229,7 +229,7 @@ MultiPolygon.prototype.getFlatInteriorPoints = function() {
*/
MultiPolygon.prototype.getInteriorPoints = function() {
var interiorPoints = new MultiPoint(null);
interiorPoints.setFlatCoordinates(_ol_geom_GeometryLayout_.XYM,
interiorPoints.setFlatCoordinates(GeometryLayout.XYM,
this.getFlatInteriorPoints().slice());
return interiorPoints;
};
@@ -268,7 +268,7 @@ MultiPolygon.prototype.getSimplifiedGeometryInternal = function(squaredTolerance
simplifiedFlatCoordinates, 0, simplifiedEndss);
var simplifiedMultiPolygon = new MultiPolygon(null);
simplifiedMultiPolygon.setFlatCoordinates(
_ol_geom_GeometryLayout_.XY, simplifiedFlatCoordinates, simplifiedEndss);
GeometryLayout.XY, simplifiedFlatCoordinates, simplifiedEndss);
return simplifiedMultiPolygon;
};
@@ -363,7 +363,7 @@ MultiPolygon.prototype.intersectsExtent = function(extent) {
*/
MultiPolygon.prototype.setCoordinates = function(coordinates, opt_layout) {
if (!coordinates) {
this.setFlatCoordinates(_ol_geom_GeometryLayout_.XY, null, this.endss_);
this.setFlatCoordinates(GeometryLayout.XY, null, this.endss_);
} else {
this.setLayout(opt_layout, coordinates, 3);
if (!this.flatCoordinates) {

4
src/ol/geom/Point.js
View File

@@ -3,7 +3,7 @@
*/
import {inherits} from '../index.js';
import {createOrUpdateFromCoordinate, containsXY} from '../extent.js';
import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
import _ol_geom_flat_deflate_ from '../geom/flat/deflate.js';
@@ -104,7 +104,7 @@ Point.prototype.intersectsExtent = function(extent) {
*/
Point.prototype.setCoordinates = function(coordinates, opt_layout) {
if (!coordinates) {
this.setFlatCoordinates(_ol_geom_GeometryLayout_.XY, null);
this.setFlatCoordinates(GeometryLayout.XY, null);
} else {
this.setLayout(opt_layout, coordinates, 0);
if (!this.flatCoordinates) {

12
src/ol/geom/Polygon.js
View File

@@ -4,7 +4,7 @@
import {inherits} from '../index.js';
import _ol_array_ from '../array.js';
import {closestSquaredDistanceXY, getCenter} from '../extent.js';
import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
import _ol_geom_LinearRing_ from '../geom/LinearRing.js';
import Point from '../geom/Point.js';
@@ -215,7 +215,7 @@ Polygon.prototype.getFlatInteriorPoint = function() {
* @api
*/
Polygon.prototype.getInteriorPoint = function() {
return new Point(this.getFlatInteriorPoint(), _ol_geom_GeometryLayout_.XYM);
return new Point(this.getFlatInteriorPoint(), GeometryLayout.XYM);
};
@@ -308,7 +308,7 @@ Polygon.prototype.getSimplifiedGeometryInternal = function(squaredTolerance) {
simplifiedFlatCoordinates, 0, simplifiedEnds);
var simplifiedPolygon = new Polygon(null);
simplifiedPolygon.setFlatCoordinates(
_ol_geom_GeometryLayout_.XY, simplifiedFlatCoordinates, simplifiedEnds);
GeometryLayout.XY, simplifiedFlatCoordinates, simplifiedEnds);
return simplifiedPolygon;
};
@@ -341,7 +341,7 @@ Polygon.prototype.intersectsExtent = function(extent) {
*/
Polygon.prototype.setCoordinates = function(coordinates, opt_layout) {
if (!coordinates) {
this.setFlatCoordinates(_ol_geom_GeometryLayout_.XY, null, this.ends_);
this.setFlatCoordinates(GeometryLayout.XY, null, this.ends_);
} else {
this.setLayout(opt_layout, coordinates, 2);
if (!this.flatCoordinates) {
@@ -390,7 +390,7 @@ Polygon.circular = function(sphere, center, radius, opt_n) {
flatCoordinates.push(flatCoordinates[0], flatCoordinates[1]);
var polygon = new Polygon(null);
polygon.setFlatCoordinates(
_ol_geom_GeometryLayout_.XY, flatCoordinates, [flatCoordinates.length]);
GeometryLayout.XY, flatCoordinates, [flatCoordinates.length]);
return polygon;
};
@@ -410,7 +410,7 @@ Polygon.fromExtent = function(extent) {
[minX, minY, minX, maxY, maxX, maxY, maxX, minY, minX, minY];
var polygon = new Polygon(null);
polygon.setFlatCoordinates(
_ol_geom_GeometryLayout_.XY, flatCoordinates, [flatCoordinates.length]);
GeometryLayout.XY, flatCoordinates, [flatCoordinates.length]);
return polygon;
};

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

@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
import _ol_functions_ from '../functions.js';
import {createOrUpdateFromFlatCoordinates, getCenter} from '../extent.js';
import Geometry from '../geom/Geometry.js';
import _ol_geom_GeometryLayout_ from '../geom/GeometryLayout.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import _ol_geom_flat_transform_ from '../geom/flat/transform.js';
import _ol_obj_ from '../obj.js';
@@ -27,7 +27,7 @@ var _ol_geom_SimpleGeometry_ = function() {
* @protected
* @type {ol.geom.GeometryLayout}
*/
this.layout = _ol_geom_GeometryLayout_.XY;
this.layout = GeometryLayout.XY;
/**
* @protected
@@ -54,11 +54,11 @@ inherits(_ol_geom_SimpleGeometry_, Geometry);
_ol_geom_SimpleGeometry_.getLayoutForStride_ = function(stride) {
var layout;
if (stride == 2) {
layout = _ol_geom_GeometryLayout_.XY;
layout = GeometryLayout.XY;
} else if (stride == 3) {
layout = _ol_geom_GeometryLayout_.XYZ;
layout = GeometryLayout.XYZ;
} else if (stride == 4) {
layout = _ol_geom_GeometryLayout_.XYZM;
layout = GeometryLayout.XYZM;
}
return /** @type {ol.geom.GeometryLayout} */ (layout);
};
@@ -70,11 +70,11 @@ _ol_geom_SimpleGeometry_.getLayoutForStride_ = function(stride) {
*/
_ol_geom_SimpleGeometry_.getStrideForLayout = function(layout) {
var stride;
if (layout == _ol_geom_GeometryLayout_.XY) {
if (layout == GeometryLayout.XY) {
stride = 2;
} else if (layout == _ol_geom_GeometryLayout_.XYZ || layout == _ol_geom_GeometryLayout_.XYM) {
} else if (layout == GeometryLayout.XYZ || layout == GeometryLayout.XYM) {
stride = 3;
} else if (layout == _ol_geom_GeometryLayout_.XYZM) {
} else if (layout == GeometryLayout.XYZM) {
stride = 4;
}
return /** @type {number} */ (stride);
@@ -234,7 +234,7 @@ _ol_geom_SimpleGeometry_.prototype.setLayout = function(layout, coordinates, nes
var i;
for (i = 0; i < nesting; ++i) {
if (coordinates.length === 0) {
this.layout = _ol_geom_GeometryLayout_.XY;
this.layout = GeometryLayout.XY;
this.stride = 2;
return;
} else {