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

Rename _ol_geom_SimpleGeometry_ to SimpleGeometry

Browse Source
This commit is contained in:
Tim Schaub
2017-12-14 09:03:51 -07:00
parent 64a0d40361
commit fca8b13ddd
14 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/View.js
View File

@@ -16,7 +16,7 @@ import {inAndOut} from './easing.js';
import {getForViewAndSize, getCenter, getHeight, getWidth, isEmpty} from './extent.js';
import GeometryType from './geom/GeometryType.js';
import Polygon from './geom/Polygon.js';
import _ol_geom_SimpleGeometry_ from './geom/SimpleGeometry.js';
import SimpleGeometry from './geom/SimpleGeometry.js';
import _ol_math_ from './math.js';
import _ol_obj_ from './obj.js';
import {createProjection, METERS_PER_UNIT} from './proj.js';
@@ -879,7 +879,7 @@ _ol_View_.prototype.fit = function(geometryOrExtent, opt_options) {
}
/** @type {ol.geom.SimpleGeometry} */
var geometry;
if (!(geometryOrExtent instanceof _ol_geom_SimpleGeometry_)) {
if (!(geometryOrExtent instanceof SimpleGeometry)) {
_ol_asserts_.assert(Array.isArray(geometryOrExtent),
24); // Invalid extent or geometry provided as `geometry`
_ol_asserts_.assert(!isEmpty(geometryOrExtent),

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

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

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

@@ -14,7 +14,7 @@ import MultiPoint from '../geom/MultiPoint.js';
import MultiPolygon from '../geom/MultiPolygon.js';
import Point from '../geom/Point.js';
import Polygon from '../geom/Polygon.js';
import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
import SimpleGeometry from '../geom/SimpleGeometry.js';
/**
* @classdesc
@@ -208,7 +208,7 @@ _ol_format_WKT_.encode_ = function(geom) {
var geometryEncoder = _ol_format_WKT_.GeometryEncoder_[type];
var enc = geometryEncoder(geom);
type = type.toUpperCase();
if (geom instanceof _ol_geom_SimpleGeometry_) {
if (geom instanceof SimpleGeometry) {
var dimInfo = _ol_format_WKT_.encodeGeometryLayout_(geom);
if (dimInfo.length > 0) {
type += ' ' + dimInfo;

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

@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
import {createOrUpdate, forEachCorner, intersects} from '../extent.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import GeometryType from '../geom/GeometryType.js';
import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
import SimpleGeometry from '../geom/SimpleGeometry.js';
import _ol_geom_flat_deflate_ from '../geom/flat/deflate.js';
/**
@@ -20,12 +20,12 @@ import _ol_geom_flat_deflate_ from '../geom/flat/deflate.js';
* @api
*/
var Circle = function(center, opt_radius, opt_layout) {
_ol_geom_SimpleGeometry_.call(this);
SimpleGeometry.call(this);
var radius = opt_radius ? opt_radius : 0;
this.setCenterAndRadius(center, radius, opt_layout);
};
inherits(Circle, _ol_geom_SimpleGeometry_);
inherits(Circle, SimpleGeometry);
/**

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

@@ -6,7 +6,7 @@ import _ol_array_ from '../array.js';
import {closestSquaredDistanceXY} from '../extent.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import GeometryType from '../geom/GeometryType.js';
import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.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';
@@ -28,7 +28,7 @@ import _ol_geom_flat_simplify_ from '../geom/flat/simplify.js';
*/
var LineString = function(coordinates, opt_layout) {
_ol_geom_SimpleGeometry_.call(this);
SimpleGeometry.call(this);
/**
* @private
@@ -58,7 +58,7 @@ var LineString = function(coordinates, opt_layout) {
};
inherits(LineString, _ol_geom_SimpleGeometry_);
inherits(LineString, SimpleGeometry);
/**

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

@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
import {closestSquaredDistanceXY} from '../extent.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import GeometryType from '../geom/GeometryType.js';
import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
import SimpleGeometry from '../geom/SimpleGeometry.js';
import _ol_geom_flat_area_ 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';
@@ -25,7 +25,7 @@ import _ol_geom_flat_simplify_ from '../geom/flat/simplify.js';
*/
var LinearRing = function(coordinates, opt_layout) {
_ol_geom_SimpleGeometry_.call(this);
SimpleGeometry.call(this);
/**
* @private
@@ -43,7 +43,7 @@ var LinearRing = function(coordinates, opt_layout) {
};
inherits(LinearRing, _ol_geom_SimpleGeometry_);
inherits(LinearRing, SimpleGeometry);
/**

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

@@ -7,7 +7,7 @@ import {closestSquaredDistanceXY} from '../extent.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import GeometryType from '../geom/GeometryType.js';
import LineString from '../geom/LineString.js';
import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.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';
@@ -27,7 +27,7 @@ import _ol_geom_flat_simplify_ from '../geom/flat/simplify.js';
*/
var MultiLineString = function(coordinates, opt_layout) {
_ol_geom_SimpleGeometry_.call(this);
SimpleGeometry.call(this);
/**
* @type {Array.<number>}
@@ -51,7 +51,7 @@ var MultiLineString = function(coordinates, opt_layout) {
};
inherits(MultiLineString, _ol_geom_SimpleGeometry_);
inherits(MultiLineString, SimpleGeometry);
/**

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

@@ -7,7 +7,7 @@ import {closestSquaredDistanceXY, containsXY} from '../extent.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import GeometryType from '../geom/GeometryType.js';
import Point from '../geom/Point.js';
import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.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 _ol_math_ from '../math.js';
@@ -23,11 +23,11 @@ import _ol_math_ from '../math.js';
* @api
*/
var MultiPoint = function(coordinates, opt_layout) {
_ol_geom_SimpleGeometry_.call(this);
SimpleGeometry.call(this);
this.setCoordinates(coordinates, opt_layout);
};
inherits(MultiPoint, _ol_geom_SimpleGeometry_);
inherits(MultiPoint, SimpleGeometry);
/**

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

@@ -8,7 +8,7 @@ import GeometryLayout from '../geom/GeometryLayout.js';
import GeometryType from '../geom/GeometryType.js';
import MultiPoint from '../geom/MultiPoint.js';
import Polygon from '../geom/Polygon.js';
import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
import SimpleGeometry from '../geom/SimpleGeometry.js';
import _ol_geom_flat_area_ from '../geom/flat/area.js';
import _ol_geom_flat_center_ from '../geom/flat/center.js';
import _ol_geom_flat_closest_ from '../geom/flat/closest.js';
@@ -32,7 +32,7 @@ import _ol_geom_flat_simplify_ from '../geom/flat/simplify.js';
*/
var MultiPolygon = function(coordinates, opt_layout) {
_ol_geom_SimpleGeometry_.call(this);
SimpleGeometry.call(this);
/**
* @type {Array.<Array.<number>>}
@@ -80,7 +80,7 @@ var MultiPolygon = function(coordinates, opt_layout) {
};
inherits(MultiPolygon, _ol_geom_SimpleGeometry_);
inherits(MultiPolygon, SimpleGeometry);
/**

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

@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
import {createOrUpdateFromCoordinate, containsXY} from '../extent.js';
import GeometryLayout from '../geom/GeometryLayout.js';
import GeometryType from '../geom/GeometryType.js';
import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
import SimpleGeometry from '../geom/SimpleGeometry.js';
import _ol_geom_flat_deflate_ from '../geom/flat/deflate.js';
import _ol_math_ from '../math.js';
@@ -20,11 +20,11 @@ import _ol_math_ from '../math.js';
* @api
*/
var Point = function(coordinates, opt_layout) {
_ol_geom_SimpleGeometry_.call(this);
SimpleGeometry.call(this);
this.setCoordinates(coordinates, opt_layout);
};
inherits(Point, _ol_geom_SimpleGeometry_);
inherits(Point, SimpleGeometry);
/**

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

@@ -8,7 +8,7 @@ import GeometryLayout from '../geom/GeometryLayout.js';
import GeometryType from '../geom/GeometryType.js';
import LinearRing from '../geom/LinearRing.js';
import Point from '../geom/Point.js';
import _ol_geom_SimpleGeometry_ from '../geom/SimpleGeometry.js';
import SimpleGeometry from '../geom/SimpleGeometry.js';
import _ol_geom_flat_area_ from '../geom/flat/area.js';
import _ol_geom_flat_closest_ from '../geom/flat/closest.js';
import _ol_geom_flat_contains_ from '../geom/flat/contains.js';
@@ -37,7 +37,7 @@ import _ol_math_ from '../math.js';
*/
var Polygon = function(coordinates, opt_layout) {
_ol_geom_SimpleGeometry_.call(this);
SimpleGeometry.call(this);
/**
* @type {Array.<number>}
@@ -85,7 +85,7 @@ var Polygon = function(coordinates, opt_layout) {
};
inherits(Polygon, _ol_geom_SimpleGeometry_);
inherits(Polygon, SimpleGeometry);
/**

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

@@ -19,7 +19,7 @@ import _ol_obj_ from '../obj.js';
* @extends {ol.geom.Geometry}
* @api
*/
var _ol_geom_SimpleGeometry_ = function() {
var SimpleGeometry = function() {
Geometry.call(this);
@@ -43,7 +43,7 @@ var _ol_geom_SimpleGeometry_ = function() {
};
inherits(_ol_geom_SimpleGeometry_, Geometry);
inherits(SimpleGeometry, Geometry);
/**
@@ -51,7 +51,7 @@ inherits(_ol_geom_SimpleGeometry_, Geometry);
* @private
* @return {ol.geom.GeometryLayout} layout Layout.
*/
_ol_geom_SimpleGeometry_.getLayoutForStride_ = function(stride) {
SimpleGeometry.getLayoutForStride_ = function(stride) {
var layout;
if (stride == 2) {
layout = GeometryLayout.XY;
@@ -68,7 +68,7 @@ _ol_geom_SimpleGeometry_.getLayoutForStride_ = function(stride) {
* @param {ol.geom.GeometryLayout} layout Layout.
* @return {number} Stride.
*/
_ol_geom_SimpleGeometry_.getStrideForLayout = function(layout) {
SimpleGeometry.getStrideForLayout = function(layout) {
var stride;
if (layout == GeometryLayout.XY) {
stride = 2;
@@ -84,13 +84,13 @@ _ol_geom_SimpleGeometry_.getStrideForLayout = function(layout) {
/**
* @inheritDoc
*/
_ol_geom_SimpleGeometry_.prototype.containsXY = _ol_functions_.FALSE;
SimpleGeometry.prototype.containsXY = _ol_functions_.FALSE;
/**
* @inheritDoc
*/
_ol_geom_SimpleGeometry_.prototype.computeExtent = function(extent) {
SimpleGeometry.prototype.computeExtent = function(extent) {
return createOrUpdateFromFlatCoordinates(this.flatCoordinates,
0, this.flatCoordinates.length, this.stride, extent);
};
@@ -100,7 +100,7 @@ _ol_geom_SimpleGeometry_.prototype.computeExtent = function(extent) {
* @abstract
* @return {Array} Coordinates.
*/
_ol_geom_SimpleGeometry_.prototype.getCoordinates = function() {};
SimpleGeometry.prototype.getCoordinates = function() {};
/**
@@ -108,7 +108,7 @@ _ol_geom_SimpleGeometry_.prototype.getCoordinates = function() {};
* @return {ol.Coordinate} First coordinate.
* @api
*/
_ol_geom_SimpleGeometry_.prototype.getFirstCoordinate = function() {
SimpleGeometry.prototype.getFirstCoordinate = function() {
return this.flatCoordinates.slice(0, this.stride);
};
@@ -116,7 +116,7 @@ _ol_geom_SimpleGeometry_.prototype.getFirstCoordinate = function() {
/**
* @return {Array.<number>} Flat coordinates.
*/
_ol_geom_SimpleGeometry_.prototype.getFlatCoordinates = function() {
SimpleGeometry.prototype.getFlatCoordinates = function() {
return this.flatCoordinates;
};
@@ -126,7 +126,7 @@ _ol_geom_SimpleGeometry_.prototype.getFlatCoordinates = function() {
* @return {ol.Coordinate} Last point.
* @api
*/
_ol_geom_SimpleGeometry_.prototype.getLastCoordinate = function() {
SimpleGeometry.prototype.getLastCoordinate = function() {
return this.flatCoordinates.slice(this.flatCoordinates.length - this.stride);
};
@@ -136,7 +136,7 @@ _ol_geom_SimpleGeometry_.prototype.getLastCoordinate = function() {
* @return {ol.geom.GeometryLayout} Layout.
* @api
*/
_ol_geom_SimpleGeometry_.prototype.getLayout = function() {
SimpleGeometry.prototype.getLayout = function() {
return this.layout;
};
@@ -144,7 +144,7 @@ _ol_geom_SimpleGeometry_.prototype.getLayout = function() {
/**
* @inheritDoc
*/
_ol_geom_SimpleGeometry_.prototype.getSimplifiedGeometry = function(squaredTolerance) {
SimpleGeometry.prototype.getSimplifiedGeometry = function(squaredTolerance) {
if (this.simplifiedGeometryRevision != this.getRevision()) {
_ol_obj_.clear(this.simplifiedGeometryCache);
this.simplifiedGeometryMaxMinSquaredTolerance = 0;
@@ -186,7 +186,7 @@ _ol_geom_SimpleGeometry_.prototype.getSimplifiedGeometry = function(squaredToler
* @return {ol.geom.SimpleGeometry} Simplified geometry.
* @protected
*/
_ol_geom_SimpleGeometry_.prototype.getSimplifiedGeometryInternal = function(squaredTolerance) {
SimpleGeometry.prototype.getSimplifiedGeometryInternal = function(squaredTolerance) {
return this;
};
@@ -194,7 +194,7 @@ _ol_geom_SimpleGeometry_.prototype.getSimplifiedGeometryInternal = function(squa
/**
* @return {number} Stride.
*/
_ol_geom_SimpleGeometry_.prototype.getStride = function() {
SimpleGeometry.prototype.getStride = function() {
return this.stride;
};
@@ -204,8 +204,8 @@ _ol_geom_SimpleGeometry_.prototype.getStride = function() {
* @param {Array.<number>} flatCoordinates Flat coordinates.
* @protected
*/
_ol_geom_SimpleGeometry_.prototype.setFlatCoordinatesInternal = function(layout, flatCoordinates) {
this.stride = _ol_geom_SimpleGeometry_.getStrideForLayout(layout);
SimpleGeometry.prototype.setFlatCoordinatesInternal = function(layout, flatCoordinates) {
this.stride = SimpleGeometry.getStrideForLayout(layout);
this.layout = layout;
this.flatCoordinates = flatCoordinates;
};
@@ -216,7 +216,7 @@ _ol_geom_SimpleGeometry_.prototype.setFlatCoordinatesInternal = function(layout,
* @param {Array} coordinates Coordinates.
* @param {ol.geom.GeometryLayout=} opt_layout Layout.
*/
_ol_geom_SimpleGeometry_.prototype.setCoordinates = function(coordinates, opt_layout) {};
SimpleGeometry.prototype.setCoordinates = function(coordinates, opt_layout) {};
/**
@@ -225,11 +225,11 @@ _ol_geom_SimpleGeometry_.prototype.setCoordinates = function(coordinates, opt_la
* @param {number} nesting Nesting.
* @protected
*/
_ol_geom_SimpleGeometry_.prototype.setLayout = function(layout, coordinates, nesting) {
SimpleGeometry.prototype.setLayout = function(layout, coordinates, nesting) {
/** @type {number} */
var stride;
if (layout) {
stride = _ol_geom_SimpleGeometry_.getStrideForLayout(layout);
stride = SimpleGeometry.getStrideForLayout(layout);
} else {
var i;
for (i = 0; i < nesting; ++i) {
@@ -242,7 +242,7 @@ _ol_geom_SimpleGeometry_.prototype.setLayout = function(layout, coordinates, nes
}
}
stride = coordinates.length;
layout = _ol_geom_SimpleGeometry_.getLayoutForStride_(stride);
layout = SimpleGeometry.getLayoutForStride_(stride);
}
this.layout = layout;
this.stride = stride;
@@ -253,7 +253,7 @@ _ol_geom_SimpleGeometry_.prototype.setLayout = function(layout, coordinates, nes
* @inheritDoc
* @api
*/
_ol_geom_SimpleGeometry_.prototype.applyTransform = function(transformFn) {
SimpleGeometry.prototype.applyTransform = function(transformFn) {
if (this.flatCoordinates) {
transformFn(this.flatCoordinates, this.flatCoordinates, this.stride);
this.changed();
@@ -265,7 +265,7 @@ _ol_geom_SimpleGeometry_.prototype.applyTransform = function(transformFn) {
* @inheritDoc
* @api
*/
_ol_geom_SimpleGeometry_.prototype.rotate = function(angle, anchor) {
SimpleGeometry.prototype.rotate = function(angle, anchor) {
var flatCoordinates = this.getFlatCoordinates();
if (flatCoordinates) {
var stride = this.getStride();
@@ -281,7 +281,7 @@ _ol_geom_SimpleGeometry_.prototype.rotate = function(angle, anchor) {
* @inheritDoc
* @api
*/
_ol_geom_SimpleGeometry_.prototype.scale = function(sx, opt_sy, opt_anchor) {
SimpleGeometry.prototype.scale = function(sx, opt_sy, opt_anchor) {
var sy = opt_sy;
if (sy === undefined) {
sy = sx;
@@ -305,7 +305,7 @@ _ol_geom_SimpleGeometry_.prototype.scale = function(sx, opt_sy, opt_anchor) {
* @inheritDoc
* @api
*/
_ol_geom_SimpleGeometry_.prototype.translate = function(deltaX, deltaY) {
SimpleGeometry.prototype.translate = function(deltaX, deltaY) {
var flatCoordinates = this.getFlatCoordinates();
if (flatCoordinates) {
var stride = this.getStride();
@@ -323,7 +323,7 @@ _ol_geom_SimpleGeometry_.prototype.translate = function(deltaX, deltaY) {
* @param {Array.<number>=} opt_dest Destination.
* @return {Array.<number>} Transformed flat coordinates.
*/
_ol_geom_SimpleGeometry_.transform2D = function(simpleGeometry, transform, opt_dest) {
SimpleGeometry.transform2D = function(simpleGeometry, transform, opt_dest) {
var flatCoordinates = simpleGeometry.getFlatCoordinates();
if (!flatCoordinates) {
return null;
@@ -334,4 +334,4 @@ _ol_geom_SimpleGeometry_.transform2D = function(simpleGeometry, transform, opt_d
transform, opt_dest);
}
};
export default _ol_geom_SimpleGeometry_;
export default SimpleGeometry;

4
src/ol/render/canvas/Immediate.js
View File

@@ -10,7 +10,7 @@ import _ol_array_ from '../../array.js';
import _ol_colorlike_ from '../../colorlike.js';
import {intersects} from '../../extent.js';
import GeometryType from '../../geom/GeometryType.js';
import _ol_geom_SimpleGeometry_ from '../../geom/SimpleGeometry.js';
import SimpleGeometry from '../../geom/SimpleGeometry.js';
import _ol_geom_flat_transform_ from '../../geom/flat/transform.js';
import _ol_has_ from '../../has.js';
import _ol_render_VectorContext_ from '../VectorContext.js';
@@ -412,7 +412,7 @@ _ol_render_canvas_Immediate_.prototype.drawCircle = function(geometry) {
if (this.strokeState_) {
this.setContextStrokeState_(this.strokeState_);
}
var pixelCoordinates = _ol_geom_SimpleGeometry_.transform2D(
var pixelCoordinates = SimpleGeometry.transform2D(
geometry, this.transform_, this.pixelCoordinates_);
var dx = pixelCoordinates[2] - pixelCoordinates[0];
var dy = pixelCoordinates[3] - pixelCoordinates[1];

4
test/spec/ol/geom/flat/transform.test.js
View File

@@ -1,5 +1,5 @@
import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js';
import _ol_geom_SimpleGeometry_ from '../../../../../src/ol/geom/SimpleGeometry.js';
import SimpleGeometry from '../../../../../src/ol/geom/SimpleGeometry.js';
import _ol_geom_flat_transform_ from '../../../../../src/ol/geom/flat/transform.js';
@@ -31,7 +31,7 @@ describe('ol.geom.flat.transform', function() {
0, -0.0004088332670837288,
4480.991370439071, 1529.5752568707105
];
var pixelCoordinates = _ol_geom_SimpleGeometry_.transform2D(
var pixelCoordinates = SimpleGeometry.transform2D(
multiPolygonGeometry, transform, []);
expect(pixelCoordinates[0]).to.roughlyEqual(806.6035275946265, 1e-9);
expect(pixelCoordinates[1]).to.roughlyEqual(160.48916296287916, 1e-9);