@openglobus/og 0.10.6 → 0.11.1

package/package.json

@@ -1,20 +1,22 @@
 {
   "name": "@openglobus/og",
-  "version": "0.10.6",
+  "version": "0.11.1",
   "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"
   },
   "main": "./src/og/index.js",
   "style": "./css/og.css",
+  "types": "./types/index.d.ts",
   "scripts": {
-    "api": ".jsdoc -t ./jsdoc -r ./src/ -c ./jsdoc/conf.json -d ./api",
+    "api": "jsdoc -t ./jsdoc -r ./src/ -c ./jsdoc/conf.json -d ./api",
     "serve": "ws",
     "build": "rollup -c",
     "webgl": "rollup -c --environment entry:webgl",
     "core": "rollup -c --environment entry:core",
-    "test": "jest --coverage",
+    "test": "jest --env=jsdom",
     "lint": "eslint src/og",
+    "generate_types": "rm -rf types; tsc src/**/*.js --declaration --allowJs --emitDeclarationOnly --outDir types; exit 0",
     "prepare": "husky install"
   },
   "repository": {
@@ -48,11 +50,10 @@
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.3.1",
-    "eslint-plugin-react": "^7.21.5",
     "eslint-plugin-standard": "^4.1.0",
     "husky": "^6.0.0",
     "jaguarjs-jsdoc": "^1.1.0",
-    "jest": "^26.6.3",
+    "jest": "^27.2.3",
     "jsdoc": "^3.6.7",
     "lint-staged": "^11.0.0",
     "local-web-server": "^5.1.1",
@@ -61,7 +62,8 @@
     "prettier": "^2.3.0",
     "rollup": "^1.32.1",
     "rollup-plugin-postcss": "^4.0.0",
-    "rollup-plugin-terser": "^5.3.1"
+    "rollup-plugin-terser": "^5.3.1",
+    "typescript": "^4.4.3"
   },
   "lint-staged": {
     "*.{js,ts}": [
@@ -70,7 +72,8 @@
   },
   "files": [
     "src/**/*",
-    "css/**/*"
+    "css/**/*",
+    "types/**/*"
   ],
   "keywords": [
     "map",

package/src/og/Extent.js

@@ -48,7 +48,7 @@ export class Extent {
     /**
      * Creates extent instance from values in array.
      * @static
-     * @param {Array.<number,number,number,number>} arr - South west and north east longitude and latidudes packed in array.
+     * @param {Array.<number>} arr - South west and north east longitude and latidudes packed in array. (exactly 4 entries)
      * @return {og.Extent} Extent object.
      */
     static createFromArray(arr) {

package/src/og/LonLat.js

@@ -21,6 +21,11 @@ const INV_PI_BY_180_HALF_PI = INV_PI_BY_180 * HALF_PI;
  */
 export class LonLat {
 
+    /**
+     * @param {number} [lon] 
+     * @param {number} [lat] 
+     * @param {number} [height] 
+     */
     constructor(lon, lat, height) {
 
         /**
@@ -52,7 +57,7 @@ export class LonLat {
     /**
      * Creates coordinates array.
      * @static
-     * @param{Array.<Array<number,number,number>>} arr - Coordinates array data.
+     * @param{Array.<Array<number>>} arr - Coordinates array data. (exactly 3 entries)
      * @return{Array.<og.LonLat>} the same coordinates array but each element is LonLat instance.
      */
     static join(arr) {
@@ -67,7 +72,7 @@ export class LonLat {
     /**
      * Creates an object by coordinate array.
      * @static
-     * @param {Array.<number,number,number>} arr - Coordiante array, where first is longitude, second is latitude and third is a height.
+     * @param {Array.<number>} arr - Coordiante array, where first is longitude, second is latitude and third is a height. (exactly 3 entries)
      * @returns {og.LonLat} -
      */
     static createFromArray(arr) {

package/src/og/Popup.js

@@ -72,7 +72,7 @@ class Popup {
 
     setScreen(p) {
         if (this._planet) {
-            this.el.style.transform = "translate(" + (p.x - this.clientWidth * 0.5) + "px, " + (p.y - this._planet.renderer.handler.canvas.height - this.clientHeight * 0.5) + "px)"
+            this.el.style.transform = "translate(" + (p.x - this.clientWidth * 0.5) + "px, " + (p.y - this._planet.renderer.handler.canvas.height - this._tipEl.clientHeight) + "px)"
         }
     }
 
@@ -98,6 +98,7 @@ class Popup {
         this.el = this._renderTemplate(params);
         this._contentEl = this.el.querySelector(".og-popup-content");
         this._titleEl = this.el.querySelector(".og-popup-title")
+        this._tipEl = this.el.querySelector(".og-popup-tip-container")
         this.setOffset(this._offset[0], this._offset[1]);
         this.setContent(this._content);
         this.setTitle(this._title);

package/src/og/camera/PlanetCamera.js

@@ -297,6 +297,7 @@ class PlanetCamera extends Camera {
      * @param {Number} [ampl] - Altitude amplitude factor.
      * @param {cameraCallback} [completeCallback] - Callback that calls after flying when flying is finished.
      * @param {cameraCallback} [startCallback] - Callback that calls befor the flying begins.
+     * @param [frameCallback]
      */
     flyExtent(extent, height, up, ampl, completeCallback, startCallback, frameCallback) {
         this.flyCartesian(
@@ -361,6 +362,7 @@ class PlanetCamera extends Camera {
      * @param {Number} [ampl=1.0] - Altitude amplitude factor.
      * @param {cameraCallback} [completeCallback] - Callback that calls after flying when flying is finished.
      * @param {cameraCallback} [startCallback] - Callback that calls befor the flying begins.
+     * @param [frameCallback]
      */
     flyCartesian(cartesian, look, up, ampl = 1.0, completeCallback, startCallback, frameCallback) {
         this.stopFlying();
@@ -551,9 +553,9 @@ class PlanetCamera extends Camera {
         let slope = n.dot(eyeNorm);
 
         if (minSlope) {
-            //let dSlope = slope - this.slope;
+            let dSlope = slope - this.slope;
 
-            //if (slope < minSlope && dSlope < 0) return;
+            if (slope < minSlope && dSlope < 0) return;
 
             if (
                 (slope > 0.1 && v.dot(eyeNorm) > 0) ||

package/src/og/entity/EntityCollection.js

@@ -21,7 +21,7 @@ import { ShapeHandler } from './ShapeHandler.js';
  * @param {Object} [options] - Entity options:
  * @param {Array.<og.Entity>} [options.entities] - Entities array.
  * @param {boolean} [options.visibility=true] - Entity visibility.
- * @param {Array.<number,number,number>} [options.scaleByDistance] - Entity scale by distance parameters.
+ * @param {Array.<number>} [options.scaleByDistance] - Entity scale by distance parameters. (exactly 3 entries)
  * First index - near distance to the entity, after entity becomes full scale.
  * Second index - far distance to the entity, when entity becomes zero scale.
  * Third index - far distance to the entity, when entity becomes invisible.