@wemap/providers 3.2.17 → 3.2.18

package/package.json

@@ -42,6 +42,6 @@
     "url": "git+https://github.com/wemap/wemap-modules-js.git"
   },
   "type": "module",
-  "version": "3.2.17",
-  "gitHead": "8b5e0144472bfaa8e07ac24cb227294c83a7541a"
+  "version": "3.2.18",
+  "gitHead": "5b5342754059b05298d7961f78c13b8198685a85"
 }

package/src/providers/Provider.js

@@ -127,7 +127,7 @@ class Provider {
     }
 
     get nativeInterface() {
-        return typeof window !== 'undefined' ? (window.WemapProvidersAndroid || null) : null;
+        return typeof window !== 'undefined' ? (window.__nativeProviders || null) : null;
     }
 
     get useCameraNatively() {

package/src/providers/attitude/absolute/AbsoluteAttitudeFromBrowserProvider.js

@@ -152,6 +152,9 @@ class AbsoluteAttitudeFromBrowserProvider extends Provider {
     };
 
 
+    iosPreviousQuat = null;
+    iosIsSkyMode;
+
     onDeviceOrientationSafariEvent = e => {
 
         this.magQuaternionTimestamp = e.timeStamp / 1e3;
@@ -166,17 +169,47 @@ class AbsoluteAttitudeFromBrowserProvider extends Provider {
             return;
         }
 
-        // The following code works only in beta < 135.
-        // TODO: enhance
+        /**
+         * Trying the best to retrieve a good quaternion from devicemotion event.
+         */
 
         let alpha;
-        // Next condition is not optimal
-        // if (Math.abs(e.beta) > 135) {
-        //     alpha = 180 - e.webkitCompassHeading;
-        // } else {
-        alpha = AbsoluteAttitudeFromBrowserProvider.webkitCompassToHeading(
-            e.webkitCompassHeading, e.beta, e.gamma);
-        // }
+        const [qw, qx, qy, qz] = Rotations.eulerToQuaternionZXYDegrees([e.webkitCompassHeading, e.beta, e.gamma]);
+        const groundAngle = rad2deg(Math.acos(qw ** 2 - qx ** 2 - qy ** 2 + qz ** 2));
+
+        let isSkyMode;
+        if (groundAngle > 136) {
+            isSkyMode = true;
+        } else if (groundAngle < 134) {
+            isSkyMode = false;
+        } else if (this.iosPreviousQuat && this.iosIsSkyMode !== null) {
+            /**
+             * This condition is true only if :
+             * - we are in the [134°; 136°] ground angle range
+             * - we know the previous quaternion
+             * - one of the both previous condition has been reached during this session
+             *
+             * In this case, we define a threshold to detect if there is a "jump" in the quaternion calculation,
+             * then, the mode is switched.
+             */
+            isSkyMode = Quaternion.distance([qw, qx, qy, qz], this.iosPreviousQuat) < 0.5
+                ? this.iosIsSkyMode
+                : !this.iosIsSkyMode;
+        }
+        this.iosPreviousQuat = [qw, qx, qy, qz];
+        this.iosIsSkyMode = isSkyMode;
+
+        if (typeof (isSkyMode) === 'undefined') {
+            // Algorithm uncertainity
+            return;
+        }
+
+        if (isSkyMode) {
+            alpha = 180 - e.webkitCompassHeading;
+        } else {
+            alpha = AbsoluteAttitudeFromBrowserProvider.webkitCompassToHeading(
+                e.webkitCompassHeading, e.beta, e.gamma);
+        }
 
         this.magQuaternion = Rotations.eulerToQuaternionZXYDegrees([alpha, e.beta, e.gamma]);