@wemap/geo 3.1.11 → 3.1.15

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/geo"
     },
     "name": "@wemap/geo",
-    "version": "3.1.11",
+    "version": "3.1.15",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -28,10 +28,10 @@
     "license": "ISC",
     "dependencies": {
         "@wemap/logger": "^3.0.0",
-        "@wemap/maths": "^3.1.11",
+        "@wemap/maths": "^3.1.15",
         "lodash.isfinite": "^3.3.2",
         "lodash.isnumber": "^3.0.3",
         "lodash.isstring": "^4.0.1"
     },
-    "gitHead": "1e72b637bcc6e4d378bdb7c93870228636bdcb35"
+    "gitHead": "44d9ad40afa3e6522a01bc86891082a753199f9a"
 }

package/src/rotations/Attitude.spec.js

@@ -3,11 +3,84 @@ import chai from 'chai';
 import chaiAlmost from 'chai-almost';
 
 import Attitude from './Attitude';
-import { deg2rad } from '@wemap/maths';
+import {
+    deg2rad, Quaternion, Utils
+} from '@wemap/maths';
 
 const expect = chai.expect;
 chai.use(chaiAlmost());
 
+
+const checkAngles = (val, expected, range = [-Math.PI, Math.PI]) => {
+    expect(Utils.diffAngle(val, expected)).almost.equal(0);
+    expect(val).least(range[0]);
+    expect(val).most(range[1]);
+};
+
+
+const LAYED_PORTRAIT_NORTH = Quaternion.identity;
+const LAYED_PORTRAIT_EAST = Quaternion.fromAxisAngle([0, 0, 1], - Math.PI / 2);
+const LAYED_PORTRAIT_SOUTH = Quaternion.fromAxisAngle([0, 0, 1], Math.PI);
+const LAYED_PORTRAIT_WEST = Quaternion.fromAxisAngle([0, 0, 1], Math.PI / 2);
+
+const STAND_PORTRAIT_NORTH = Quaternion.multiply(
+    LAYED_PORTRAIT_NORTH,
+    Quaternion.fromAxisAngle([1, 0, 0], Math.PI / 2)
+);
+const STAND_PORTRAIT_EAST = Quaternion.multiply(
+    LAYED_PORTRAIT_EAST,
+    Quaternion.fromAxisAngle([1, 0, 0], Math.PI / 2)
+);
+const STAND_PORTRAIT_SOUTH = Quaternion.multiply(
+    LAYED_PORTRAIT_SOUTH,
+    Quaternion.fromAxisAngle([1, 0, 0], Math.PI / 2)
+);
+const STAND_PORTRAIT_WEST = Quaternion.multiply(
+    LAYED_PORTRAIT_WEST,
+    Quaternion.fromAxisAngle([1, 0, 0], Math.PI / 2)
+);
+
+const STAND_PORTRAIT_NORTH_SKY = Quaternion.multiply(
+    STAND_PORTRAIT_NORTH,
+    Quaternion.fromAxisAngle([1, 0, 0], 3 * Math.PI / 8)
+);
+const STAND_PORTRAIT_EAST_SKY = Quaternion.multiply(
+    STAND_PORTRAIT_EAST,
+    Quaternion.fromAxisAngle([1, 0, 0], 3 * Math.PI / 8)
+);
+const STAND_PORTRAIT_SOUTH_SKY = Quaternion.multiply(
+    STAND_PORTRAIT_SOUTH,
+    Quaternion.fromAxisAngle([1, 0, 0], 3 * Math.PI / 8)
+);
+const STAND_PORTRAIT_WEST_SKY = Quaternion.multiply(
+    STAND_PORTRAIT_WEST,
+    Quaternion.fromAxisAngle([1, 0, 0], 3 * Math.PI / 8)
+);
+
+
+// Landscape = Top to the left
+const LAYED_LANDSCAPE_NORTH = Quaternion.fromAxisAngle([0, 0, 1], Math.PI / 2);
+const LAYED_LANDSCAPE_EAST = [1, 0, 0, 0];
+const LAYED_LANDSCAPE_SOUTH = Quaternion.fromAxisAngle([0, 0, 1], -Math.PI / 2);
+const LAYED_LANDSCAPE_WEST = Quaternion.fromAxisAngle([0, 0, 1], Math.PI);
+
+const STAND_LANDSCAPE_NORTH = Quaternion.multiply(
+    LAYED_LANDSCAPE_NORTH,
+    Quaternion.fromAxisAngle([0, 1, 0], -Math.PI / 2)
+);
+const STAND_LANDSCAPE_EAST = Quaternion.multiply(
+    LAYED_LANDSCAPE_EAST,
+    Quaternion.fromAxisAngle([0, 1, 0], -Math.PI / 2)
+);
+const STAND_LANDSCAPE_SOUTH = Quaternion.multiply(
+    LAYED_LANDSCAPE_SOUTH,
+    Quaternion.fromAxisAngle([0, 1, 0], -Math.PI / 2)
+);
+const STAND_LANDSCAPE_WEST = Quaternion.multiply(
+    LAYED_LANDSCAPE_WEST,
+    Quaternion.fromAxisAngle([0, 1, 0], -Math.PI / 2)
+);
+
 describe('Attitude', () => {
 
     it('creation', () => {
@@ -75,21 +148,40 @@ describe('Attitude', () => {
     });
 
     it('heading', () => {
-        const attitude = new Attitude([1, 0, 0, 0]);
-        expect(attitude.heading).equals(0);
-        expect(attitude.heading).equals(0);
+        checkAngles(new Attitude(LAYED_PORTRAIT_NORTH).heading, 0);
+        checkAngles(new Attitude(STAND_PORTRAIT_NORTH).heading, 0);
+        checkAngles(new Attitude(STAND_PORTRAIT_NORTH_SKY).heading, 0);
+
+        checkAngles(new Attitude(LAYED_PORTRAIT_EAST).heading, Math.PI / 2);
+        checkAngles(new Attitude(STAND_PORTRAIT_EAST).heading, Math.PI / 2);
+        checkAngles(new Attitude(STAND_PORTRAIT_EAST_SKY).heading, Math.PI / 2);
+
+        checkAngles(new Attitude(LAYED_PORTRAIT_SOUTH).heading, Math.PI);
+        checkAngles(new Attitude(STAND_PORTRAIT_SOUTH).heading, Math.PI);
+        checkAngles(new Attitude(STAND_PORTRAIT_SOUTH_SKY).heading, Math.PI);
+
+        checkAngles(new Attitude(LAYED_PORTRAIT_WEST).heading, -Math.PI / 2);
+        checkAngles(new Attitude(STAND_PORTRAIT_WEST).heading, -Math.PI / 2);
+        checkAngles(new Attitude(STAND_PORTRAIT_WEST_SKY).heading, -Math.PI / 2);
 
-        expect(new Attitude([Math.sqrt(2) / 2, Math.sqrt(2) / 2, 0, 0]).heading).equals(0);
-        expect(new Attitude([-0.5, 0.5, 0.5, 0.5]).heading).equals(Math.PI / 2);
 
         const tmpWindow = global.window;
         global.window = { orientation: 90 };
-        expect(new Attitude([1, 0, 0, 0]).heading).equals(Math.PI / 2);
-        expect(new Attitude([Math.sqrt(2) / 2, Math.sqrt(2) / 2, 0, 0]).heading).equals(Math.PI / 2);
-        expect(new Attitude([-0.5, 0.5, 0.5, 0.5]).heading).equals(Math.PI);
+
+        checkAngles(new Attitude(LAYED_LANDSCAPE_NORTH).heading, 0);
+        checkAngles(new Attitude(STAND_LANDSCAPE_NORTH).heading, 0);
+
+        checkAngles(new Attitude(LAYED_LANDSCAPE_EAST).heading, Math.PI / 2);
+        checkAngles(new Attitude(STAND_LANDSCAPE_EAST).heading, Math.PI / 2);
+
+        checkAngles(new Attitude(LAYED_LANDSCAPE_SOUTH).heading, Math.PI);
+        checkAngles(new Attitude(STAND_LANDSCAPE_SOUTH).heading, Math.PI);
+
+        checkAngles(new Attitude(LAYED_LANDSCAPE_WEST).heading, -Math.PI / 2);
+        checkAngles(new Attitude(STAND_LANDSCAPE_WEST).heading, -Math.PI / 2);
+
         global.window = tmpWindow;
 
-        expect(new Attitude([-0.5, 0.5, 0.5, 0.5]).headingDegrees).equals(90);
     });
 
     it('equalsTo', () => {