Merge pull request #2465 from camptocamp/fix_geolocation_fit_accuracy

Fix geolocation accuracy recenter

src/directives/mobilegeolocation.js

@@ -171,14 +171,15 @@ ngeo.MobileGeolocationController = function($scope, $element,
       function() {
         this.accuracyFeature_.setGeometry(
             this.geolocation_.getAccuracyGeometry());
+        this.setPosition_();
       },
       this);
 
   ol.events.listen(
       this.geolocation_,
       ol.Object.getChangeEventType(ol.Geolocation.Property.POSITION),
-      function(e) {
-        this.setPosition_(e);
+      function() {
+        this.setPosition_();
       },
       this);
 
@@ -258,24 +259,23 @@ ngeo.MobileGeolocationController.prototype.untrack_ = function() {
 
 
 /**
- * @param {ol.ObjectEvent} event Event.
  * @private
  */
-ngeo.MobileGeolocationController.prototype.setPosition_ = function(event) {
+ngeo.MobileGeolocationController.prototype.setPosition_ = function() {
   var position = /** @type {ol.Coordinate} */ (this.geolocation_.getPosition());
   var point = new ol.geom.Point(position);
 
   this.positionFeature_.setGeometry(point);
+  var accuracy = this.accuracyFeature_.getGeometry();
 
   if (this.follow_) {
     this.viewChangedByMe_ = true;
     if (this.zoom_ !== undefined) {
       this.map_.getView().setCenter(position);
       this.map_.getView().setZoom(this.zoom_);
-    } else {
-      var polygon = /** @type {!ol.geom.Polygon} */ (this.geolocation_.getAccuracyGeometry());
+    } else if (accuracy) {
       var size = /** @type {!ol.Size} */ (this.map_.getSize());
-      this.map_.getView().fit(polygon, size);
+      this.map_.getView().fit(/** @type {!ol.geom.Polygon} */ (accuracy), size);
     }
     this.viewChangedByMe_ = false;
   }