Merge pull request #560 from AR-js-org/issue500

Allow real GPS position to be used, even after fake GPS has been set

Author: nickw1

aframe/build/aframe-ar-new-location-only.js

@@ -36,6 +36,8 @@ AFRAME.registerComponent("gps-new-camera", {
   init: function () {
     this._testForOrientationControls();
 
+    this.fakeGpsStarted = false;
+
     this.threeLoc = new THREEx.LocationBased(
       this.el.sceneEl.object3D,
       this.el.object3D,
@@ -96,6 +98,7 @@ AFRAME.registerComponent("gps-new-camera", {
       maximumAge: this.data.gpsTimeInterval,
     });
     if (
+      !this.fakeGpsStarted &&
       (this.data.simulateLatitude !== 0 || this.data.simulateLongitude !== 0) &&
       (this.data.simulateLatitude != oldData.simulateLatitude ||
         this.data.simulateLongitude != oldData.simulateLongitude)
@@ -105,8 +108,7 @@ AFRAME.registerComponent("gps-new-camera", {
         this.data.simulateLongitude,
         this.data.simulateLatitude
       );
-      this.data.simulateLatitude = 0;
-      this.data.simulateLongitude = 0;
+      this.fakeGpsStarted = true;
     }
     if (this.data.simulateAltitude > -Number.MAX_VALUE) {
       this.threeLoc.setElevation(this.data.simulateAltitude + 1.6);