@wemap/providers 8.2.0 → 9.0.0-alpha.0

package/package.json

@@ -9,13 +9,13 @@
   ],
   "dependencies": {
     "@wemap/camera": "^8.1.0",
-    "@wemap/geo": "^8.1.0",
+    "@wemap/geo": "^9.0.0-alpha.0",
     "@wemap/geomagnetism": "^0.1.1",
     "@wemap/logger": "^8.0.1",
-    "@wemap/map": "^8.1.0",
+    "@wemap/map": "^9.0.0-alpha.0",
     "@wemap/maths": "^8.1.0",
-    "@wemap/osm": "^8.1.0",
-    "@wemap/routers": "^8.1.0",
+    "@wemap/osm": "^9.0.0-alpha.0",
+    "@wemap/routers": "^9.0.0-alpha.0",
     "@wemap/utils": "^8.1.0"
   },
   "description": "A package using different geoloc systems",
@@ -42,6 +42,6 @@
     "url": "git+https://github.com/wemap/wemap-modules-js.git"
   },
   "type": "module",
-  "version": "8.2.0",
-  "gitHead": "0bc7e5d04957228873973c3b7738b1e7da68cddb"
+  "version": "9.0.0-alpha.0",
+  "gitHead": "fc17cf617195c987813ede500bf67dd0f135cf34"
 }

package/src/providers/position/absolute/PoleStar.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-bitwise */
 
-import { Level, UserPosition } from '@wemap/geo';
+import { UserPosition } from '@wemap/geo';
 import { TimeUtils } from '@wemap/utils';
 
 import Provider from '../../Provider.js';
@@ -94,7 +94,7 @@ class PoleStar extends Provider {
                     json.lat,
                     json.lng,
                     Constants.DEFAULT_ALTITUDE,
-                    new Level(json.alt / 5),
+                    json.alt / 5,
                     timestamp,
                     json.accuracy,
                     json.bearing,

package/src/providers/vision/Vps.js

@@ -1,6 +1,6 @@
 /* eslint-disable max-statements */
 import { SharedCameras, CameraUtils, Camera } from '@wemap/camera';
-import { Attitude, Level, UserPosition } from '@wemap/geo';
+import { Attitude, UserPosition } from '@wemap/geo';
 import Logger from '@wemap/logger';
 import { deg2rad, Quaternion } from '@wemap/maths';
 import { TimeUtils } from '../../../../utils/index.js';
@@ -247,32 +247,34 @@ class Vps extends Provider {
 
     static _parseJsonResponse(json, requestTime) {
 
-        const quaternion = [
+        const enuToCameraRot = [
             json.attitude.w,
             json.attitude.x,
             json.attitude.y,
             json.attitude.z
         ];
-        const quaternionNorm = Quaternion.norm(quaternion);
-        quaternion[0] /= quaternionNorm;
-        quaternion[1] /= quaternionNorm;
-        quaternion[2] /= quaternionNorm;
-        quaternion[3] /= quaternionNorm;
 
-        // TODO: Move camera to smartphone rotation here instead of server
+        const cameraToSmartphoneRot = Quaternion.fromAxisAngle(
+            [1, 0, 0],
+            Math.PI
+        );
+        const enuToSmartphoneRot = Quaternion.multiply(
+            enuToCameraRot,
+            cameraToSmartphoneRot
+        );
 
         const quaternionWithScreenRotation = Quaternion.multiply(
-            Quaternion.fromAxisAngle([0, 0, 1], deg2rad(window.orientation || 0)), quaternion
+            Quaternion.fromAxisAngle([0, 0, 1], deg2rad(window.orientation || 0)),
+            enuToSmartphoneRot
         );
 
         const attitude = new Attitude(quaternionWithScreenRotation, requestTime, 0);
 
-
         const userPosition = new UserPosition(
             json.coordinates.lat,
             json.coordinates.lng,
             json.coordinates.alt,
-            json.coordinates.level ? new Level(json.coordinates.level) : null,
+            typeof json.coordinates.level === 'undefined' ? null : json.coordinates.level,
             requestTime,
             0,
             attitude.heading

package/src/smoothers/PositionSmoother.js

@@ -1,5 +1,5 @@
 /* eslint-disable max-statements */
-import { UserPosition } from '@wemap/geo';
+import { Level, UserPosition } from '@wemap/geo';
 
 class PositionSmoother {
 
@@ -52,11 +52,7 @@ class PositionSmoother {
             let i = 1;
             const nSamples = this.frequency * flybyTime + 1;
 
-            let newPositionLevel = null;
-            if (newPosition.level !== null) {
-                newPositionLevel = newPosition.level.clone();
-            }
-
+            const newPositionLevel = Level.clone(newPosition.level);
             while (i < nSamples + 1) {
                 const smoothedPosition = previousPosition.destinationPoint(distance * i / nSamples, azimuth);
                 smoothedPosition.time = refTimestamp + (i - 1) / this.frequency;