@openglobus/og 0.14.10 → 0.15.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.14.10",
+  "version": "0.15.1",
   "description": "[OpenGlobus](https://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"
@@ -11,7 +11,7 @@
   "scripts": {
     "api": "jsdoc -r ./src/ -c ./jsdoc.conf.json -d ./api",
     "serve": "ws",
-    "build": "rollup -c",
+    "build": "rollup -c --bundleConfigAsCjs",
     "webgl": "rollup -c --environment entry:webgl",
     "core": "rollup -c --environment entry:core",
     "test": "jest --env=jsdom --runInBand --ci --coverage=false",
@@ -44,24 +44,25 @@
     "./css/og.css": "./css/og.css"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.18.9",
-    "@rollup/plugin-json": "^4.1.0",
-    "@types/jest": "^28.1.6",
-    "eslint": "^8.20.0",
-    "jaguarjs-jsdoc": "^1.1.0",
-    "jest": "^28.1.3",
+    "@babel/preset-env": "^7.20.2",
+    "@rollup/plugin-json": "^6.0.0",
+    "@rollup/plugin-terser": "^0.3.0",
+    "@types/jest": "^29.2.6",
+    "eslint": "^8.32.0",
+    "jaguarjs-jsdoc": "^1.0.2",
+    "jest": "^29.3.1",
     "jest-canvas-mock": "^2.4.0",
-    "jest-environment-jsdom": "^28.1.3",
+    "jest-environment-jsdom": "^29.3.1",
     "jest-webgl-canvas-mock": "^0.2.3",
-    "jsdoc": "^3.6.11",
-    "lint-staged": "^13.0.3",
+    "jsdoc": "^4.0.2",
+    "lint-staged": "^13.1.0",
     "local-web-server": "^5.2.1",
-    "postcss": "^8.4.14",
-    "prettier": "^2.7.1",
-    "rollup": "^2.77.1",
+    "postcss": "^8.4.21",
+    "prettier": "^2.8.3",
+    "rollup": "^3.10.0",
     "rollup-plugin-postcss": "^4.0.2",
-    "rollup-plugin-terser": "^7.0.2",
-    "typescript": "^4.7.4"
+    "taffydb": "^2.7.3",
+    "typescript": "^4.9.4"
   },
   "lint-staged": {
     "*.{js,ts}": [
@@ -81,4 +82,4 @@
     "globe",
     "og"
   ]
-}
+}

package/src/og/Clock.js

@@ -1,194 +1,218 @@
-/**
- * @module og/Clock
- */
-
-"use strict";
-
-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 {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;
-        }
-        return this._counter;
-    }
-
-    static set _staticCounter(n) {
-        this._counter = n;
-    }
-
-    /**
-     *
-     * @param {Object} [params] - Clock parameters:
-     */
-    constructor(params) {
-        params = params || {};
-
-        this._id = Clock._staticCounter++;
-
-        /**
-         * Clock name.
-         * @public
-         * @type {string}
-         */
-        this.name = params.name || "";
-
-        /**
-         * Clock events.
-         * @public
-         * @type {Events}
-         */
-        this.events = new Events(["tick", "end"], this);
-
-        /**
-         * Start julian date clock loop.
-         * @public
-         * @type {number}
-         */
-        this.startDate = params.startDate || 0;
-
-        /**
-         * End julian date clock loop.
-         * @public
-         * @type {number}
-         */
-        this.endDate = params.endDate || 0;
-
-        var currentDate = params.currentDate || jd.DateToUTC(new Date());
-        if (params.startDate && currentDate < params.startDate) {
-            currentDate = params.startDate;
-        }
-        if (params.endDate && currentDate > params.endDate) {
-            currentDate = params.endDate;
-        }
-
-        /**
-         * Current julian datetime.
-         * @public
-         * @type {number}
-         */
-        this.currentDate = currentDate;
-
-        /**
-         * Timer speed multiplier.
-         * @public
-         * @type {number}
-         */
-        this.multiplier = params.multiplier !== undefined ? params.multiplier : 1.0;
-
-        /**
-         * Animation frame delta time.
-         * @public
-         * @readonly
-         * @type {number}
-         */
-        this.deltaTicks = 0;
-
-        /**
-         * Timer activity.
-         * @public
-         * @type {boolean}
-         */
-        this.active = true;
-
-        this._intervalDelay = 0;
-        this._intervalStart = 0;
-        this._intervalCallback = null;
-    }
-
-    clearInterval() {
-        this._intervalDelay = 0;
-        this._intervalStart = 0;
-        this._intervalCallback = null;
-    }
-
-    setInterval(delay, callback) {
-        this._intervalStart = this.currentDate;
-        this._intervalDelay = delay * jd.ONE_BY_MILLISECONDS_PER_DAY;
-        this._intervalCallback = callback;
-    }
-
-    /**
-     * Sets current clock datetime.
-     * @public
-     * @param {Object} date - JavaScript Date object.
-     */
-    setDate(date) {
-        var d = jd.DateToUTC(date);
-        if (this.startDate && d < this.startDate) {
-            d = this.startDate;
-        }
-        if (this.endDate && d > this.endDate) {
-            d = this.endDate;
-        }
-        this.currentDate = d;
-    }
-
-    /**
-     * Returns current application date.
-     * @public
-     * @returns {Date} - Current date.
-     */
-    getDate() {
-        return jd.UTCtoDate(this.currentDate);
-    }
-
-    reset() {
-        if (this.startDate) {
-            this.currentDate = this.startDate;
-        }
-    }
-
-    _tick(dt) {
-        this.deltaTicks = dt * this.multiplier;
-        if (this.active) {
-            var cd = jd.addMilliseconds(this.currentDate, this.deltaTicks);
-            if (this.multiplier > 0) {
-                if (this.endDate && cd > this.endDate) {
-                    this.currentDate = this.startDate;
-                    this.events.dispatch(this.events.end, this);
-                } else {
-                    this.currentDate = cd;
-                }
-            } else {
-                if (this.startDate && cd < this.startDate) {
-                    this.currentDate = this.endDate;
-                    this.events.dispatch(this.events.end, this);
-                } else {
-                    this.currentDate = cd;
-                }
-            }
-
-            if (this._intervalCallback) {
-                if (this.currentDate - this._intervalStart >= this._intervalDelay) {
-                    this._intervalStart = this.currentDate;
-                    this._intervalCallback(this);
-                }
-            }
-
-            this.events.dispatch(this.events.tick, this);
-        }
-    }
-
-    /**
-     * @public
-     * @param {Clock} clock - Clock instance to compare.
-     * @returns {boolean} - Returns true if a clock is the same instance.
-     */
-    equal(clock) {
-        return this._id === clock._id;
-    }
-}
-
-export { Clock };
+/**
+ * @module og/Clock
+ */
+
+"use strict";
+
+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 {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;
+        }
+        return this._counter;
+    }
+
+    static set _staticCounter(n) {
+        this._counter = n;
+    }
+
+    /**
+     *
+     * @param {Object} [params] - Clock parameters:
+     */
+    constructor(params) {
+        params = params || {};
+
+        this._id = Clock._staticCounter++;
+
+        /**
+         * Clock name.
+         * @public
+         * @type {string}
+         */
+        this.name = params.name || "";
+
+        /**
+         * Clock events.
+         * @public
+         * @type {Events}
+         */
+        this.events = new Events(["tick", "end", "start", "stop"], this);
+
+        /**
+         * Start julian date clock loop.
+         * @public
+         * @type {number}
+         */
+        this.startDate = params.startDate || 0;
+
+        /**
+         * End julian date clock loop.
+         * @public
+         * @type {number}
+         */
+        this.endDate = params.endDate || 0;
+
+        var currentDate = params.currentDate || jd.DateToUTC(new Date());
+        if (params.startDate && currentDate < params.startDate) {
+            currentDate = params.startDate;
+        }
+        if (params.endDate && currentDate > params.endDate) {
+            currentDate = params.endDate;
+        }
+
+        /**
+         * Current julian datetime.
+         * @public
+         * @type {number}
+         */
+        this.currentDate = currentDate;
+
+        /**
+         * Timer speed multiplier.
+         * @public
+         * @type {number}
+         */
+        this._multiplier = params.multiplier !== undefined ? params.multiplier : 1.0;
+        this._running = 1;
+
+        /**
+         * Animation frame delta time.
+         * @public
+         * @readonly
+         * @type {number}
+         */
+        this.deltaTicks = 0;
+
+        /**
+         * Timer activity.
+         * @public
+         * @type {boolean}
+         */
+        this.active = true;
+
+        this._intervalDelay = 0;
+        this._intervalStart = 0;
+        this._intervalCallback = null;
+    }
+
+    clearInterval() {
+        this._intervalDelay = 0;
+        this._intervalStart = 0;
+        this._intervalCallback = null;
+    }
+
+    setInterval(delay, callback) {
+        this._intervalStart = this.currentDate;
+        this._intervalDelay = delay * jd.ONE_BY_MILLISECONDS_PER_DAY;
+        this._intervalCallback = callback;
+    }
+
+    /**
+     * Sets current clock datetime.
+     * @public
+     * @param {Object} date - JavaScript Date object.
+     */
+    setDate(date) {
+        var d = jd.DateToUTC(date);
+        if (this.startDate && d < this.startDate) {
+            d = this.startDate;
+        }
+        if (this.endDate && d > this.endDate) {
+            d = this.endDate;
+        }
+        this.currentDate = d;
+    }
+
+    /**
+     * Returns current application date.
+     * @public
+     * @returns {Date} - Current date.
+     */
+    getDate() {
+        return jd.UTCtoDate(this.currentDate);
+    }
+
+    reset() {
+        if (this.startDate) {
+            this.currentDate = this.startDate;
+        }
+    }
+
+    _tick(dt) {
+        let m = this._multiplier * this._running;
+        this.deltaTicks = dt * m
+        if (this.active) {
+            let cd = jd.addMilliseconds(this.currentDate, this.deltaTicks);
+            if (m > 0) {
+                if (this.endDate && cd > this.endDate) {
+                    this.currentDate = this.startDate;
+                    this.events.dispatch(this.events.end, this);
+                } else {
+                    this.currentDate = cd;
+                }
+            } else {
+                if (this.startDate && cd < this.startDate) {
+                    this.currentDate = this.endDate;
+                    this.events.dispatch(this.events.end, this);
+                } else {
+                    this.currentDate = cd;
+                }
+            }
+
+            if (this._intervalCallback) {
+                if (this.currentDate - this._intervalStart >= this._intervalDelay) {
+                    this._intervalStart = this.currentDate;
+                    this._intervalCallback(this);
+                }
+            }
+
+            this.events.dispatch(this.events.tick, this);
+        }
+    }
+
+    /**
+     * @public
+     * @param {Clock} clock - Clock instance to compare.
+     * @returns {boolean} - Returns true if a clock is the same instance.
+     */
+    isEqual(clock) {
+        return this._id === clock._id;
+    }
+
+    start() {
+        if (this._running === 0) {
+            this._running = 1;
+            this.events.dispatch(this.events.start, this);
+        }
+    }
+
+    get multiplier() {
+        return this._multiplier;
+    }
+
+    set multiplier(value) {
+        this._multiplier = value;
+    }
+
+    stop() {
+        if (this._running === 1) {
+            this._running = 0;
+            this.events.dispatch(this.events.stop, this);
+        }
+    }
+}
+
+export { Clock };

package/src/og/Globe.js

@@ -69,7 +69,7 @@ const PLANET_NAME_PREFIX = "globus_planet_";
  * @param {Number} [options.maxEqualZoomAltitude=15000000.0] - Maximal altitude since segments on the screen bacame the same zoom level
  * @param {Number} [options.minEqualZoomAltitude=10000.0] - Minimal altitude since segments on the screen bacame the same zoom level
  * @param {Number} [options.minEqualZoomCameraSlope=0.8] - Minimal camera slope above te globe where segments on the screen bacame the same zoom level
- * @param {Number} [options.loadingBatchSize=12] - 
+ * @param {Number} [options.loadingBatchSize=12] -
  * @param {Number} [options.quadTreeStrategyPrototype] - Prototype of quadTree. QuadTreeStrategy for Earth is default.
  */
 
@@ -129,12 +129,12 @@ class Globe {
                 context: {
                     alpha: false,
                     antialias: false,
-                    premultipliedAlpha: true
+                    premultipliedAlpha: false
                 }
             }), {
-            autoActivate: false,
-            backgroundColor: createColorRGB(options.backgroundColor, new Vec3(115 / 255, 203 / 255, 249 / 255))
-        }
+                autoActivate: false,
+                backgroundColor: createColorRGB(options.backgroundColor, new Vec3(115 / 255, 203 / 255, 249 / 255))
+            }
         );
         this.renderer.initialize();
         this.renderer.div = this.div;