@wemap/geo 10.7.0 → 10.9.0

package/index.d.ts

@@ -69,6 +69,12 @@ declare module '@wemap/geo' {
     }
 
 
+    export type GeoRefJson = {
+        origin: CoordinatesJson,
+        scale?: number,
+        heading?: number
+    };
+
     export class GeoRef {
         origin: Coordinates;
         scale: number;
@@ -76,9 +82,9 @@ declare module '@wemap/geo' {
 
         localToWorld(localPosition: [number, number, number]): Coordinates;
         worldToLocal(coords: Coordinates): [number, number, number];
-        toJson(): object;
+        toJson(): GeoRefJson;
 
-        static fromJson(json: object): GeoRef;
+        static fromJson(json: GeoRefJson): GeoRef;
     }
 
     export type UserPositionJson = CoordinatesJson & {

package/package.json

@@ -13,7 +13,7 @@
         "directory": "packages/geo"
     },
     "name": "@wemap/geo",
-    "version": "10.7.0",
+    "version": "10.9.0",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -29,7 +29,7 @@
     "license": "ISC",
     "dependencies": {
         "@wemap/logger": "^10.0.0",
-        "@wemap/maths": "^10.7.0"
+        "@wemap/maths": "^10.9.0"
     },
-    "gitHead": "d9e85b1ff0458dc3f904dbdbe8fa098f02cf8d87"
+    "gitHead": "9cfaff0891646b7a7f888fe220011b3261884f15"
 }

package/src/coordinates/GeoRef.js

@@ -43,11 +43,14 @@ class GeoRef {
      * @returns {Object}
      */
     toJson() {
-        return {
-            origin: this.origin.toJson(),
-            scale: this.scale,
-            heading: this.heading
-        };
+        const obj = {origin: this.origin.toJson()};
+        if (this.scale !== 1) {
+            obj.scale = this.scale;
+        }
+        if (this.heading !== 0) {
+            obj.heading = this.heading;
+        }
+        return obj;
     }
 
     /**
@@ -57,8 +60,8 @@ class GeoRef {
     static fromJson(json) {
         const geoRef = new GeoRef();
         geoRef.origin = Coordinates.fromJson(json.origin);
-        geoRef.scale = json.scale;
-        geoRef.heading = json.heading;
+        geoRef.scale = 'scale' in json ? json.scale : 1;
+        geoRef.heading = 'heading' in json ? json.heading : 0;
         return geoRef;
     }
 }

package/src/coordinates/GeoRef.spec.js

@@ -0,0 +1,43 @@
+import chai from 'chai';
+import Coordinates from './Coordinates.js';
+import GeoRef from './GeoRef.js';
+
+const { expect } = chai;
+
+
+describe('GeoRef', () => {
+
+    it('toJson', () => {
+        const geoRef = new GeoRef();
+        geoRef.origin = new Coordinates(45, 5);
+
+        geoRef.scale = 2;
+        geoRef.heading = 1;
+        expect(geoRef.toJson()).deep.equals({ origin: { lat: 45, lng: 5 }, scale: 2, heading: 1 });
+
+        geoRef.scale = 1;
+        geoRef.heading = 0;
+        geoRef.origin.alt = 10;
+        expect(geoRef.toJson()).deep.equals({ origin: { lat: 45, lng: 5, alt: 10 }});
+    });
+
+    it('fromJson', () => {
+        let geoRefJson;
+
+        geoRefJson = GeoRef.fromJson({ origin: { lat: 45, lng: 5 }, scale: 2, heading: 1 });
+        expect(geoRefJson.origin.lat).equals(45);
+        expect(geoRefJson.origin.lng).equals(5);
+        expect(geoRefJson.origin.alt).is.null;
+        expect(geoRefJson.origin.level).is.null;
+        expect(geoRefJson.scale).equals(2);
+        expect(geoRefJson.heading).equals(1);
+
+        geoRefJson = GeoRef.fromJson({ origin: { lat: 45, lng: 5, alt: 10 } });
+        expect(geoRefJson.origin.lat).equals(45);
+        expect(geoRefJson.origin.lng).equals(5);
+        expect(geoRefJson.origin.alt).equals(10);
+        expect(geoRefJson.origin.level).is.null;
+        expect(geoRefJson.scale).equals(1);
+        expect(geoRefJson.heading).equals(0);
+    });
+});