@openglobus/og 0.11.1 → 0.11.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.11.1",
+  "version": "0.11.6",
   "description": "[OpenGlobus](http://www.openglobus.org/) is a javascript library designed to display interactive 3d maps and planets with map tiles, imagery and vector data, markers and 3d objects. It uses the WebGL technology, open source and completely free.",
   "directories": {
     "example": "./sandbox"
@@ -15,9 +15,10 @@
     "webgl": "rollup -c --environment entry:webgl",
     "core": "rollup -c --environment entry:core",
     "test": "jest --env=jsdom",
+    "test_watch": "jest --env=jsdom --watch",
     "lint": "eslint src/og",
     "generate_types": "rm -rf types; tsc src/**/*.js --declaration --allowJs --emitDeclarationOnly --outDir types; exit 0",
-    "prepare": "husky install"
+    "compile_js_as_ts": "tsc src/og/index.js --AllowJs --checkJs --outDir dist/@openglobus/src/"
   },
   "repository": {
     "type": "git",
@@ -42,28 +43,24 @@
     "./css/og.css": "./css/og.css"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.12.17",
+    "@babel/preset-env": "^7.16.0",
     "@rollup/plugin-json": "^4.1.0",
-    "eslint": "^6.8.0",
-    "eslint-config-defaults": "^9.0.0",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.3.1",
-    "eslint-plugin-standard": "^4.1.0",
-    "husky": "^6.0.0",
+    "@types/jest": "^27.0.2",
+    "eslint": "^8.2.0",
     "jaguarjs-jsdoc": "^1.1.0",
-    "jest": "^27.2.3",
+    "jest": "^27.3.1",
+    "jest-canvas-mock": "^2.3.1",
+    "jest-webgl-canvas-mock": "^0.2.3",
     "jsdoc": "^3.6.7",
-    "lint-staged": "^11.0.0",
+    "lint-staged": "^11.2.6",
     "local-web-server": "^5.1.1",
-    "msdf-bmfont-xml": "^2.3.6",
-    "postcss": "^8.3.0",
-    "prettier": "^2.3.0",
-    "rollup": "^1.32.1",
-    "rollup-plugin-postcss": "^4.0.0",
-    "rollup-plugin-terser": "^5.3.1",
-    "typescript": "^4.4.3"
+    "msdf-bmfont-xml": "^2.5.4",
+    "postcss": "^8.3.11",
+    "prettier": "^2.4.1",
+    "rollup": "^2.60.0",
+    "rollup-plugin-postcss": "^4.0.1",
+    "rollup-plugin-terser": "^7.0.2",
+    "typescript": "^4.4.4"
   },
   "lint-staged": {
     "*.{js,ts}": [
@@ -72,6 +69,7 @@
   },
   "files": [
     "src/**/*",
+    "dist/**/*",
     "css/**/*",
     "types/**/*"
   ],

package/src/og/Clock.js

@@ -2,22 +2,21 @@
  * @module og/Clock
  */
 
-'use strict';
+"use strict";
 
-import { Events } from './Events.js';
-import * as jd from './astro/jd.js';
+import { Events } from "./Events.js";
+import * as jd from "./astro/jd.js";
 
 /**
  * Class represents application timer that stores custom current julian datetime, and time speed multiplier.
  * @class
- * @param {Object} [params]: - Clock parameters:
+ * @param {Object} [params] - Clock parameters:
  * @param {number} [params.startDate=0.0] - Julian start date.
  * @param {number} [params.endDate=0.0] - Julian end date.
  * @param {number} [params.currentDate] - Julian current date. Default: current date.
  * @param {number} [params.multiplier=1.0] - Time speed multiolier.
  */
 class Clock {
-
     static get _staticCounter() {
         if (!this._counter && this._counter !== 0) {
             this._counter = 0;
@@ -29,6 +28,10 @@ class Clock {
         this._counter = n;
     }
 
+    /**
+     *
+     * @param {Object} [params] - Clock parameters:
+     */
     constructor(params) {
         params = params || {};
 
@@ -46,10 +49,7 @@ class Clock {
          * @public
          * @type {Events}
          */
-        this.events = new Events([
-            "tick",
-            "end"
-        ], this);
+        this.events = new Events(["tick", "end"], this);
 
         /**
          * Start julian date clock loop.
@@ -189,6 +189,6 @@ class Clock {
     equal(clock) {
         return this._id === clock._id;
     }
-};
+}
 
-export { Clock };
+export { Clock };

package/src/og/Deferred.js

@@ -8,4 +8,4 @@ export function Deferred() {
         this.reject = reject;
     }.bind(this));
     Object.freeze(this);
-};
+}

package/src/og/Events.js

@@ -2,17 +2,20 @@
  * @module og/Events
  */
 
-'use strict';
+"use strict";
 
-import { stamp, binaryInsert } from './utils/shared.js';
+import { stamp, binaryInsert } from "./utils/shared.js";
 
 /**
  * Base events class to handle custom events.
  * @class
- * @param {Array.<string>} [eventNames] - Event names that could be dispatched.
  */
 class Events {
-
+    /**
+     *
+     * @param {Array.<string>} [eventNames] - Event names that could be dispatched.
+     * @param {*} [sender]
+     */
     constructor(eventNames, sender) {
         /**
          * Registered event names.
@@ -76,7 +79,6 @@ class Events {
      * @return {boolean} -
      */
     _stamp(name, obj) {
-
         var ogid = stamp(obj);
 
         var st = this._getStamp(name, this.__id, ogid);
@@ -181,6 +183,6 @@ class Events {
         this._eventNames.length = 0;
         this._eventNames = [];
     }
-};
+}
 
-export { Events };
+export { Events };

package/src/og/Extent.js

@@ -2,20 +2,23 @@
  * @module og/Extent
  */
 
-'use strict';
+"use strict";
 
-import * as math from './math.js';
-import * as mercator from './mercator.js';
-import { LonLat } from './LonLat.js';
+import * as math from "./math.js";
+import * as mercator from "./mercator.js";
+import { LonLat } from "./LonLat.js";
 
 /**
  * Represents geographical coordinates extent.
  * @class
- * @param {og.LonLat} [sw] - South West extent corner coordiantes.
- * @param {og.LonLat} [ne] - North East extent corner coordiantes.
+ * @param {LonLat} [sw] - South West extent corner coordiantes.
+ * @param {LonLat} [ne] - North East extent corner coordiantes.
  */
 export class Extent {
-
+    /**
+     * @param {LonLat} [sw] - South West extent corner coordiantes.
+     * @param {LonLat} [ne] - North East extent corner coordiantes.
+     */
     constructor(sw, ne) {
         /**
          * @public
@@ -31,39 +34,47 @@ export class Extent {
      * Whole mercator extent.
      * @const
      */
-    static get FULL_MERC() { return new Extent(LonLat.SW_MERC, LonLat.NE_MERC) };
+    static get FULL_MERC() {
+        return new Extent(LonLat.SW_MERC, LonLat.NE_MERC);
+    }
 
     /**
      * Degrees extent from north mercator limit to north pole.
      * @const
      */
-    static get NORTH_POLE_DEG() { return new Extent(LonLat.NW_MERC_DEG, new LonLat(180.0, 90.0)); }
+    static get NORTH_POLE_DEG() {
+        return new Extent(LonLat.NW_MERC_DEG, new LonLat(180.0, 90.0));
+    }
 
     /**
      * Degrees extent from south pole to south mercator limit.
      * @const
      */
-    static get SOUTH_POLE_DEG() { return new Extent(new LonLat(-180.0, -90.0), LonLat.SE_MERC_DEG) };
+    static get SOUTH_POLE_DEG() {
+        return new Extent(new LonLat(-180.0, -90.0), LonLat.SE_MERC_DEG);
+    }
 
     /**
      * Creates extent instance from values in array.
      * @static
      * @param {Array.<number>} arr - South west and north east longitude and latidudes packed in array. (exactly 4 entries)
-     * @return {og.Extent} Extent object.
+     * @return {Extent} Extent object.
      */
     static createFromArray(arr) {
         return new Extent(new LonLat(arr[0], arr[1]), new LonLat(arr[2], arr[3]));
-    };
+    }
 
     /**
      * Creates bound extent instance by coordinate array.
      * @static
-     * @param {Array.<og.LonLat>} arr - Coordinate array.
-     * @return {og.Extent} Extent object.
+     * @param {Array.<LonLat>} arr - Coordinate array.
+     * @return {Extent} Extent object.
      */
     static createByCoordinates(arr) {
-        let lonmin = math.MAX, lonmax = math.MIN,
-            latmin = math.MAX, latmax = math.MIN;
+        let lonmin = math.MAX,
+            lonmax = math.MIN,
+            latmin = math.MAX,
+            latmax = math.MIN;
         for (let i = 0; i < arr.length; i++) {
             const vi = arr[i];
             if (vi.lon < lonmin) lonmin = vi.lon;
@@ -72,17 +83,19 @@ export class Extent {
             if (vi.lat > latmax) latmax = vi.lat;
         }
         return new Extent(new LonLat(lonmin, latmin), new LonLat(lonmax, latmax));
-    };
+    }
 
     /**
      * Creates bound extent instance by coordinate array.
      * @static
-     * @param {Array.<Array<number,number>>} arr - Coordinate array.
-     * @return {og.Extent} Extent object.
+     * @param {Array.<Array<number>>} arr - Coordinate array. (exactly 2 entries)
+     * @return {Extent} Extent object.
      */
     static createByCoordinatesArr(arr) {
-        let lonmin = math.MAX, lonmax = math.MIN,
-            latmin = math.MAX, latmax = math.MIN;
+        let lonmin = math.MAX,
+            lonmax = math.MIN,
+            latmin = math.MAX,
+            latmax = math.MIN;
         for (let i = 0; i < arr.length; i++) {
             const vi = arr[i];
             if (vi[0] < lonmin) lonmin = vi[0];
@@ -91,7 +104,7 @@ export class Extent {
             if (vi[1] > latmax) latmax = vi[1];
         }
         return new Extent(new LonLat(lonmin, latmin), new LonLat(lonmax, latmax));
-    };
+    }
 
     /**
      * Creates extent by meractor grid tile coordinates.
@@ -101,7 +114,7 @@ export class Extent {
      * @param {number} z -
      * @param {number} width -
      * @param {number} height -
-     * @returns {og.Extent} -
+     * @returns {Extent} -
      */
     static fromTile(x, y, z, width, height) {
         width = width || mercator.POLE_DOUBLE;
@@ -117,17 +130,19 @@ export class Extent {
             right = left + lnSize;
 
         return new Extent(new LonLat(left, bottom), new LonLat(right, top));
-    };
+    }
 
     /**
      * Sets current bounding extent object by coordinate array.
      * @public
-     * @param {Array.<og.LonLat>} arr - Coordinate array.
-     * @return {og.Extent} Current extent.
+     * @param {Array.<LonLat>} arr - Coordinate array.
+     * @return {Extent} Current extent.
      */
     setByCoordinates(arr) {
-        let lonmin = math.MAX, lonmax = math.MIN,
-            latmin = math.MAX, latmax = math.MIN;
+        let lonmin = math.MAX,
+            lonmax = math.MIN,
+            latmin = math.MAX,
+            latmax = math.MIN;
         for (let i = 0; i < arr.length; i++) {
             const vi = arr[i];
             if (vi.lon < lonmin) lonmin = vi.lon;
@@ -140,7 +155,7 @@ export class Extent {
         this.northEast.lon = lonmax;
         this.northEast.lat = latmax;
         return this;
-    };
+    }
 
     /**
      * Determines if point inside extent.
@@ -151,9 +166,13 @@ export class Extent {
     isInside(lonlat) {
         const sw = this.southWest,
             ne = this.northEast;
-        return lonlat.lon >= sw.lon && lonlat.lon <= ne.lon &&
-            lonlat.lat >= sw.lat && lonlat.lat <= ne.lat;
-    };
+        return (
+            lonlat.lon >= sw.lon &&
+            lonlat.lon <= ne.lon &&
+            lonlat.lat >= sw.lat &&
+            lonlat.lat <= ne.lat
+        );
+    }
 
     /**
      * Returns true if two extent overlap each other.
@@ -164,9 +183,13 @@ export class Extent {
     overlaps(e) {
         const sw = this.southWest,
             ne = this.northEast;
-        return sw.lon <= e.northEast.lon && ne.lon >= e.southWest.lon &&
-            sw.lat <= e.northEast.lat && ne.lat >= e.southWest.lat;
-    };
+        return (
+            sw.lon <= e.northEast.lon &&
+            ne.lon >= e.southWest.lon &&
+            sw.lat <= e.northEast.lat &&
+            ne.lat >= e.southWest.lat
+        );
+    }
 
     /**
      * Gets extent width.
@@ -175,7 +198,7 @@ export class Extent {
      */
     getWidth() {
         return this.northEast.lon - this.southWest.lon;
-    };
+    }
 
     /**
      * Gets extent height.
@@ -184,16 +207,16 @@ export class Extent {
      */
     getHeight() {
         return this.northEast.lat - this.southWest.lat;
-    };
+    }
 
     /**
      * Creates clone instance of the current extent.
      * @public
-     * @return {og.Extent} Extent clone.
+     * @return {Extent} Extent clone.
      */
     clone() {
         return new Extent(this.southWest.clone(), this.northEast.clone());
-    };
+    }
 
     /**
      * Gets the center coordinate of the extent.
@@ -201,106 +224,119 @@ export class Extent {
      * @return {number} Center coordinate.
      */
     getCenter() {
-        const sw = this.southWest, ne = this.northEast;
+        const sw = this.southWest,
+            ne = this.northEast;
         return new LonLat(sw.lon + (ne.lon - sw.lon) * 0.5, sw.lat + (ne.lat - sw.lat) * 0.5);
-    };
+    }
 
     /**
      * @public
      */
     getNorthWest() {
         return new LonLat(this.southWest.lon, this.northEast.lat);
-    };
+    }
 
     /**
      * @public
      */
     getNorthEast() {
         return new LonLat(this.northEast.lon, this.northEast.lat);
-    };
+    }
 
     getSouthWest() {
         return new LonLat(this.southWest.lon, this.southWest.lat);
-    };
+    }
 
     /**
      * @public
      */
     getSouthEast() {
         return new LonLat(this.northEast.lon, this.southWest.lat);
-    };
+    }
 
     /**
      * @public
      */
     getNorth() {
         return this.northEast.lat;
-    };
+    }
 
     getEast() {
         return this.northEast.lon;
-    };
+    }
 
     /**
      * @public
      */
     getWest() {
         return this.southWest.lon;
-    };
+    }
 
     /**
      * @public
      */
     getSouth() {
         return this.southWest.lat;
-    };
+    }
 
     /**
      * Returns extents are equals.
-     * @param {og.Extent} extent - Extent.
+     * @param {Extent} extent - Extent.
      * @returns {boolean} -
      */
     equals(extent) {
-        return this.southWest.lon === extent.southWest.lon && this.southWest.lat === extent.southWest.lat &&
-            this.northEast.lon === extent.northEast.lon && this.northEast.lat === extent.northEast.lat;
-    };
+        return (
+            this.southWest.lon === extent.southWest.lon &&
+            this.southWest.lat === extent.southWest.lat &&
+            this.northEast.lon === extent.northEast.lon &&
+            this.northEast.lat === extent.northEast.lat
+        );
+    }
 
     /**
      * Converts extent coordinates to mercator projection coordinates.
      * @public
-     * @return {og.Extent} New instance of the current extent.
+     * @return {Extent} New instance of the current extent.
      */
     forwardMercator() {
         return new Extent(this.southWest.forwardMercator(), this.northEast.forwardMercator());
-    };
+    }
 
     /**
      * Converts extent coordinates from mercator projection to degrees.
      * @public
-     * @return {og.Extent} New instance of the current extent.
+     * @return {Extent} New instance of the current extent.
      */
     inverseMercator() {
         return new Extent(this.southWest.inverseMercator(), this.northEast.inverseMercator());
-    };
+    }
 
     /**
      * Gets cartesian bounding bounds of the current ellipsoid.
      * @public
-     * @param {og.Ellipsoid} ellipsoid - Ellipsoid.
-     * @return {Array.<number,number,number,number,number,number>} Cartesian 3d coordinate array.
+     * @param {Ellipsoid} ellipsoid - Ellipsoid.
+     * @return {Array.<number>} Cartesian 3d coordinate array. (exactly 6 entries)
      */
     getCartesianBounds(ellipsoid) {
-        let xmin = math.MAX, xmax = math.MIN, ymin = math.MAX,
-            ymax = math.MIN, zmin = math.MAX, zmax = math.MIN;
-
-        const v = [new LonLat(this.southWest.lon, this.southWest.lat),
-        new LonLat(this.southWest.lon, this.northEast.lat),
-        new LonLat(this.northEast.lon, this.northEast.lat),
-        new LonLat(this.northEast.lon, this.southWest.lat)];
+        let xmin = math.MAX,
+            xmax = math.MIN,
+            ymin = math.MAX,
+            ymax = math.MIN,
+            zmin = math.MAX,
+            zmax = math.MIN;
+
+        const v = [
+            new LonLat(this.southWest.lon, this.southWest.lat),
+            new LonLat(this.southWest.lon, this.northEast.lat),
+            new LonLat(this.northEast.lon, this.northEast.lat),
+            new LonLat(this.northEast.lon, this.southWest.lat)
+        ];
 
         for (let i = 0; i < v.length; i++) {
             const coord = ellipsoid.lonLatToCartesian(v[i]);
-            const x = coord.x, y = coord.y, z = coord.z;
+            const x = coord.x,
+                y = coord.y,
+                z = coord.z;
             if (x < xmin) xmin = x;
             if (x > xmax) xmax = x;
             if (y < ymin) ymin = y;
@@ -310,10 +346,19 @@ export class Extent {
         }
 
         return [xmin, ymin, zmin, xmax, ymax, zmax];
-    };
+    }
 
     toString() {
-        return "[" + this.southWest.lon + ", " + this.southWest.lat + ", " + this.northEast.lon + ", " + this.northEast.lat + "]";
-    };
-
-}
+        return (
+            "[" +
+            this.southWest.lon +
+            ", " +
+            this.southWest.lat +
+            ", " +
+            this.northEast.lon +
+            ", " +
+            this.northEast.lat +
+            "]"
+        );
+    }
+}