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

Use ol.Sphere#circle to create the accuracy 'circle'

Browse Source
This commit is contained in:
Frederic Junod
2014-03-11 15:42:08 +01:00
parent 0c8552edbb
commit a267ed4e52
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/geolocation.js
View File

@@ -1,7 +1,3 @@
// FIXME use an ol.geom.Circle to display a circle with accuracy
// FIXME this circle will need to compensate for the pointResolution of the
// FIXME EPSG:3857 projection
goog.require('ol.Feature'); goog.require('ol.Feature');
goog.require('ol.FeatureOverlay'); goog.require('ol.FeatureOverlay');
goog.require('ol.Geolocation'); goog.require('ol.Geolocation');

24
src/ol/geolocation.js
View File

@@ -10,8 +10,9 @@ goog.require('goog.math');
goog.require('ol.BrowserFeature'); goog.require('ol.BrowserFeature');
goog.require('ol.Coordinate'); goog.require('ol.Coordinate');
goog.require('ol.Object'); goog.require('ol.Object');
goog.require('ol.geom.Circle'); goog.require('ol.geom.Geometry');
goog.require('ol.proj'); goog.require('ol.proj');
goog.require('ol.sphere.WGS84');
/** /**
@@ -53,8 +54,8 @@ ol.GeolocationProperty = {
* @todo stability experimental * @todo stability experimental
* @todo observable accuracy {number} readonly the accuracy of the position * @todo observable accuracy {number} readonly the accuracy of the position
* measurement in meters * measurement in meters
* @todo observable accuracyGeometry {ol.geom.Circle} readonly a * @todo observable accuracyGeometry {ol.geom.Geometry} readonly a
* `ol.geom.Circle` geometry of the position accuracy. * geometry of the position accuracy.
* @todo observable altitude {number} readonly the altitude of the position in * @todo observable altitude {number} readonly the altitude of the position in
* meters above mean sea level * meters above mean sea level
* @todo observable altitudeAccuracy {number} readonly the accuracy of the * @todo observable altitudeAccuracy {number} readonly the accuracy of the
@@ -186,14 +187,9 @@ ol.Geolocation.prototype.positionChange_ = function(position) {
this.set(ol.GeolocationProperty.SPEED, this.set(ol.GeolocationProperty.SPEED,
goog.isNull(coords.speed) ? undefined : coords.speed); goog.isNull(coords.speed) ? undefined : coords.speed);
var accuracyGeometry = this.getAccuracyGeometry(); var geometry = ol.sphere.WGS84.circle(this.position_, coords.accuracy);
if (goog.isNull(accuracyGeometry)) { geometry.transform(this.transform_);
accuracyGeometry = new ol.geom.Circle(projectedPosition, coords.accuracy); this.set(ol.GeolocationProperty.ACCURACY_GEOMETRY, geometry);
} else {
goog.asserts.assertInstanceof(accuracyGeometry, ol.geom.Circle);
accuracyGeometry.setCenterAndRadius(projectedPosition, coords.accuracy);
}
this.set(ol.GeolocationProperty.ACCURACY_GEOMETRY, accuracyGeometry);
}; };
@@ -223,12 +219,12 @@ goog.exportProperty(
/** /**
* Get a `ol.geom.Circle` geometry of the position accuracy. * Get a geometry of the position accuracy.
* @return {?ol.geom.Circle} Accuracy geometry. * @return {?ol.geom.Geometry} Accuracy geometry.
* @todo stability experimental * @todo stability experimental
*/ */
ol.Geolocation.prototype.getAccuracyGeometry = function() { ol.Geolocation.prototype.getAccuracyGeometry = function() {
return /** @type {?ol.geom.Circle} */ ( return /** @type {?ol.geom.Geometry} */ (
this.get(ol.GeolocationProperty.ACCURACY_GEOMETRY) || null); this.get(ol.GeolocationProperty.ACCURACY_GEOMETRY) || null);
}; };
goog.exportProperty( goog.exportProperty(