Merge pull request #2739 from elemoine/circular

Revert "Function circular renamed to createCircularOnSphere"
This commit is contained in:
Éric Lemoine
2014-09-23 14:47:13 +02:00
3 changed files with 3 additions and 5 deletions

View File

@@ -63,8 +63,7 @@ var radius = 800000;
var x, y;
for (x = -180; x < 180; x += 30) {
for (y = -90; y < 90; y += 30) {
var circle4326 = ol.geom.Polygon.createCircularOnSphere(
wgs84Sphere, [x, y], radius, 64);
var circle4326 = ol.geom.Polygon.circular(wgs84Sphere, [x, y], radius, 64);
var circle3857 = circle4326.clone().transform('EPSG:4326', 'EPSG:3857');
vectorLayer4326.getSource().addFeature(new ol.Feature(circle4326));
vectorLayer3857.getSource().addFeature(new ol.Feature(circle3857));

View File

@@ -169,7 +169,7 @@ ol.Geolocation.prototype.positionChange_ = function(position) {
this.set(ol.GeolocationProperty.POSITION, projectedPosition);
this.set(ol.GeolocationProperty.SPEED,
goog.isNull(coords.speed) ? undefined : coords.speed);
var geometry = ol.geom.Polygon.createCircularOnSphere(
var geometry = ol.geom.Polygon.circular(
ol.sphere.WGS84, this.position_, coords.accuracy);
geometry.applyTransform(this.transform_);
this.set(ol.GeolocationProperty.ACCURACY_GEOMETRY, geometry);

View File

@@ -359,8 +359,7 @@ ol.geom.Polygon.prototype.setFlatCoordinates =
* @return {ol.geom.Polygon} The "circular" polygon.
* @api stable
*/
ol.geom.Polygon.createCircularOnSphere =
function(sphere, center, radius, opt_n) {
ol.geom.Polygon.circular = function(sphere, center, radius, opt_n) {
var n = goog.isDef(opt_n) ? opt_n : 32;
/** @type {Array.<number>} */
var flatCoordinates = [];