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

Rename _ol_geom_Circle_ to Circle

Browse Source
This commit is contained in:
Tim Schaub
2017-12-14 08:57:52 -07:00
parent 9d396280b0
commit ac7985a5ad
15 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,13 +19,13 @@ import _ol_geom_flat_deflate_ from '../geom/flat/deflate.js';
* @param {ol.geom.GeometryLayout=} opt_layout Layout.
* @api
*/
var _ol_geom_Circle_ = function(center, opt_radius, opt_layout) {
var Circle = function(center, opt_radius, opt_layout) {
_ol_geom_SimpleGeometry_.call(this);
var radius = opt_radius ? opt_radius : 0;
this.setCenterAndRadius(center, radius, opt_layout);
};
inherits(_ol_geom_Circle_, _ol_geom_SimpleGeometry_);
inherits(Circle, _ol_geom_SimpleGeometry_);
/**
@@ -34,8 +34,8 @@ inherits(_ol_geom_Circle_, _ol_geom_SimpleGeometry_);
* @override
* @api
*/
_ol_geom_Circle_.prototype.clone = function() {
var circle = new _ol_geom_Circle_(null);
Circle.prototype.clone = function() {
var circle = new Circle(null);
circle.setFlatCoordinates(this.layout, this.flatCoordinates.slice());
return circle;
};
@@ -44,7 +44,7 @@ _ol_geom_Circle_.prototype.clone = function() {
/**
* @inheritDoc
*/
_ol_geom_Circle_.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) {
Circle.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) {
var flatCoordinates = this.flatCoordinates;
var dx = x - flatCoordinates[0];
var dy = y - flatCoordinates[1];
@@ -74,7 +74,7 @@ _ol_geom_Circle_.prototype.closestPointXY = function(x, y, closestPoint, minSqua
/**
* @inheritDoc
*/
_ol_geom_Circle_.prototype.containsXY = function(x, y) {
Circle.prototype.containsXY = function(x, y) {
var flatCoordinates = this.flatCoordinates;
var dx = x - flatCoordinates[0];
var dy = y - flatCoordinates[1];
@@ -87,7 +87,7 @@ _ol_geom_Circle_.prototype.containsXY = function(x, y) {
* @return {ol.Coordinate} Center.
* @api
*/
_ol_geom_Circle_.prototype.getCenter = function() {
Circle.prototype.getCenter = function() {
return this.flatCoordinates.slice(0, this.stride);
};
@@ -95,7 +95,7 @@ _ol_geom_Circle_.prototype.getCenter = function() {
/**
* @inheritDoc
*/
_ol_geom_Circle_.prototype.computeExtent = function(extent) {
Circle.prototype.computeExtent = function(extent) {
var flatCoordinates = this.flatCoordinates;
var radius = flatCoordinates[this.stride] - flatCoordinates[0];
return createOrUpdate(
@@ -110,7 +110,7 @@ _ol_geom_Circle_.prototype.computeExtent = function(extent) {
* @return {number} Radius.
* @api
*/
_ol_geom_Circle_.prototype.getRadius = function() {
Circle.prototype.getRadius = function() {
return Math.sqrt(this.getRadiusSquared_());
};
@@ -119,7 +119,7 @@ _ol_geom_Circle_.prototype.getRadius = function() {
* @private
* @return {number} Radius squared.
*/
_ol_geom_Circle_.prototype.getRadiusSquared_ = function() {
Circle.prototype.getRadiusSquared_ = function() {
var dx = this.flatCoordinates[this.stride] - this.flatCoordinates[0];
var dy = this.flatCoordinates[this.stride + 1] - this.flatCoordinates[1];
return dx * dx + dy * dy;
@@ -130,7 +130,7 @@ _ol_geom_Circle_.prototype.getRadiusSquared_ = function() {
* @inheritDoc
* @api
*/
_ol_geom_Circle_.prototype.getType = function() {
Circle.prototype.getType = function() {
return _ol_geom_GeometryType_.CIRCLE;
};
@@ -139,7 +139,7 @@ _ol_geom_Circle_.prototype.getType = function() {
* @inheritDoc
* @api
*/
_ol_geom_Circle_.prototype.intersectsExtent = function(extent) {
Circle.prototype.intersectsExtent = function(extent) {
var circleExtent = this.getExtent();
if (intersects(extent, circleExtent)) {
var center = this.getCenter();
@@ -163,7 +163,7 @@ _ol_geom_Circle_.prototype.intersectsExtent = function(extent) {
* @param {ol.Coordinate} center Center.
* @api
*/
_ol_geom_Circle_.prototype.setCenter = function(center) {
Circle.prototype.setCenter = function(center) {
var stride = this.stride;
var radius = this.flatCoordinates[stride] - this.flatCoordinates[0];
var flatCoordinates = center.slice();
@@ -184,7 +184,7 @@ _ol_geom_Circle_.prototype.setCenter = function(center) {
* @param {ol.geom.GeometryLayout=} opt_layout Layout.
* @api
*/
_ol_geom_Circle_.prototype.setCenterAndRadius = function(center, radius, opt_layout) {
Circle.prototype.setCenterAndRadius = function(center, radius, opt_layout) {
if (!center) {
this.setFlatCoordinates(_ol_geom_GeometryLayout_.XY, null);
} else {
@@ -210,20 +210,20 @@ _ol_geom_Circle_.prototype.setCenterAndRadius = function(center, radius, opt_lay
/**
* @inheritDoc
*/
_ol_geom_Circle_.prototype.getCoordinates = function() {};
Circle.prototype.getCoordinates = function() {};
/**
* @inheritDoc
*/
_ol_geom_Circle_.prototype.setCoordinates = function(coordinates, opt_layout) {};
Circle.prototype.setCoordinates = function(coordinates, opt_layout) {};
/**
* @param {ol.geom.GeometryLayout} layout Layout.
* @param {Array.<number>} flatCoordinates Flat coordinates.
*/
_ol_geom_Circle_.prototype.setFlatCoordinates = function(layout, flatCoordinates) {
Circle.prototype.setFlatCoordinates = function(layout, flatCoordinates) {
this.setFlatCoordinatesInternal(layout, flatCoordinates);
this.changed();
};
@@ -234,7 +234,7 @@ _ol_geom_Circle_.prototype.setFlatCoordinates = function(layout, flatCoordinates
* @param {number} radius Radius.
* @api
*/
_ol_geom_Circle_.prototype.setRadius = function(radius) {
Circle.prototype.setRadius = function(radius) {
this.flatCoordinates[this.stride] = this.flatCoordinates[0] + radius;
this.changed();
};
@@ -262,5 +262,5 @@ _ol_geom_Circle_.prototype.setRadius = function(radius) {
* @function
* @api
*/
_ol_geom_Circle_.prototype.transform;
export default _ol_geom_Circle_;
Circle.prototype.transform;
export default Circle;

6
src/ol/interaction/Draw.js
View File

@@ -11,7 +11,7 @@ import _ol_events_Event_ from '../events/Event.js';
import _ol_events_condition_ from '../events/condition.js';
import {boundingExtent, getBottomLeft, getBottomRight, getTopLeft, getTopRight} from '../extent.js';
import _ol_functions_ from '../functions.js';
import _ol_geom_Circle_ from '../geom/Circle.js';
import Circle from '../geom/Circle.js';
import _ol_geom_GeometryType_ from '../geom/GeometryType.js';
import LineString from '../geom/LineString.js';
import MultiLineString from '../geom/MultiLineString.js';
@@ -142,7 +142,7 @@ var _ol_interaction_Draw_ = function(options) {
*/
geometryFunction = function(coordinates, opt_geometry) {
var circle = opt_geometry ? /** @type {ol.geom.Circle} */ (opt_geometry) :
new _ol_geom_Circle_([NaN, NaN]);
new Circle([NaN, NaN]);
var squaredLength = _ol_coordinate_.squaredDistance(
coordinates[0], coordinates[1]);
circle.setCenterAndRadius(coordinates[0], Math.sqrt(squaredLength));
@@ -798,7 +798,7 @@ _ol_interaction_Draw_.createRegularPolygon = function(opt_sides, opt_angle) {
var radius = Math.sqrt(
_ol_coordinate_.squaredDistance(center, end));
var geometry = opt_geometry ? /** @type {ol.geom.Polygon} */ (opt_geometry) :
Polygon.fromCircle(new _ol_geom_Circle_(center), opt_sides);
Polygon.fromCircle(new Circle(center), opt_sides);
var angle = opt_angle ? opt_angle :
Math.atan((end[1] - center[1]) / (end[0] - center[0]));
Polygon.makeRegular(geometry, center, radius, angle);