@openglobus/og 0.11.1 → 0.11.6

package/src/og/terrain/GlobusTerrain.js

@@ -17,7 +17,6 @@ import { Vec3 } from "../math/Vec3.js";
 import { Ray } from "../math/Ray.js";
 import { Extent } from "../Extent.js";
 import { LonLat } from "../LonLat.js";
-import { MAX_NORMAL_ZOOM } from "../segment/Segment.js";
 
 const EVENT_NAMES = [
     /**
@@ -36,7 +35,7 @@ const EVENT_NAMES = [
 /**
  * Class that loads segment elevation data, converts it to the array and passes it to the planet segment.
  * @class
- * @extends {og.terrain.EmptyTerrain}
+ * @extends {EmptyTerrain}
  * @param {string} [name=""] - Terrain provider name.
  * @param {Object} [options] - Provider options:
  * @param {number} [options.minZoom=3] - Minimal visible zoom index when terrain handler works.
@@ -63,7 +62,7 @@ class GlobusTerrain extends EmptyTerrain {
         /**
          * Events handler.
          * @public
-         * @type {og.Events}
+         * @type {Events}
          */
         this.events = new Events(EVENT_NAMES, this);
 
@@ -81,7 +80,7 @@ class GlobusTerrain extends EmptyTerrain {
          * @public
          * @type {number}
          */
-        this.minZoom = options.minZoom || 3;
+        this.minZoom = options.minZoom || 2;
 
         /**
          * Maximal visible zoom index when terrain handler works.
@@ -140,7 +139,7 @@ class GlobusTerrain extends EmptyTerrain {
          * Rewrites elevation storage url query.
          * @private
          * @callback og.terrain.GlobusTerrain~_urlRewriteCallback
-         * @param {og.planetSegment.Segment} segment - Segment to load.
+         * @param {Segment} segment - Segment to load.
          * @param {string} url - Created url.
          * @returns {string} - Url query string.
          */
@@ -350,7 +349,8 @@ class GlobusTerrain extends EmptyTerrain {
      * Starts to load segment data.
      * @public
      * @virtual
-     * @param {og.planetSegment.Segment} segment - Segment that wants a terrain data.
+     * @param {Segment} segment - Segment that wants a terrain data.
+     * @param {boolean} forceLoading
      */
     loadTerrain(segment, forceLoading) {
         if (this._planet.terrainLock.isFree()) {
@@ -400,7 +400,7 @@ class GlobusTerrain extends EmptyTerrain {
      * Creates query url.
      * @protected
      * @virtual
-     * @param {og.planetSegment.Segment} segment -
+     * @param {Segment} segment -
      * @returns {string} -
      */
     _createUrl(segment) {
@@ -414,7 +414,7 @@ class GlobusTerrain extends EmptyTerrain {
     /**
      * Returns actual url query string.
      * @protected
-     * @param {og.planetSegment.Segment} segment - Segment that loads image data.
+     * @param {Segment} segment - Segment that loads image data.
      * @returns {string} - Url string.
      */
     _getHTTPRequestString(segment) {
@@ -426,7 +426,7 @@ class GlobusTerrain extends EmptyTerrain {
     /**
      * Sets url rewrite callback, used for custom url rewriting for every tile laoding.
      * @public
-     * @param {og.terrain.GlobusTerrain~_urlRewriteCallback} ur - The callback that returns tile custom created url.
+     * @param {GlobusTerrain~_urlRewriteCallback} ur - The callback that returns tile custom created url.
      */
     setUrlRewriteCallback(ur) {
         this._urlRewriteCallback = ur;
@@ -445,7 +445,7 @@ class GlobusTerrain extends EmptyTerrain {
 
     /**
      * @protected
-     * @param {og.planetSegment.Segment} segment -
+     * @param {Segment} segment -
      * @param {*} data -
      */
     _applyElevationsData(segment, elevations) {

package/src/og/terrain/MapboxTerrain.js

@@ -17,7 +17,7 @@ class MapboxTerrain extends GlobusTerrain {
 
         this.equalizeNormals = options.equalizeNormals || false;
 
-        this.minZoom = options.minZoom != undefined ? options.minZoom : 3;
+        this.minZoom = options.minZoom != undefined ? options.minZoom : 2;
 
         this.maxZoom = options.maxZoom != undefined ? options.maxZoom : 17;
 

package/src/og/utils/GeoImageCreator.js

@@ -19,17 +19,17 @@ export class GeoImageCreator {
         this._queue = [];
         this._animate = [];
         this._initialize();
-    };
+    }
 
     _initialize() {
         this._initShaders();
         this._initBuffers();
-    };
+    }
 
     /**
      * Creates geoImage corners coordinates grid buffer.
      * @public
-     * @param{Array.<og.LonLat>} c - GeoImage corners coordinates.
+     * @param{Array.<LonLat>} c - GeoImage corners coordinates.
      * @return{WebGLBuffer} Grid coordinates buffer.
      */
     createGridBuffer(c, toMerc) {
@@ -62,7 +62,7 @@ export class GeoImageCreator {
             }
         }
         return this._planet.renderer.handler.createArrayBuffer(grid, 2, grid.length / 2);
-    };
+    }
 
     frame() {
         var i = this.MAX_FRAMES;
@@ -76,7 +76,7 @@ export class GeoImageCreator {
         while (i--) {
             this._animate[i].rendering();
         }
-    };
+    }
 
     add(geoImage) {
         if (!geoImage._isRendering) {
@@ -87,7 +87,7 @@ export class GeoImageCreator {
                 this._queue.push(geoImage);
             }
         }
-    };
+    }
 
     remove(geoImage) {
         if (geoImage._isRendering) {
@@ -106,7 +106,7 @@ export class GeoImageCreator {
                 }
             }
         }
-    };
+    }
 
     _initBuffers() {
 
@@ -126,7 +126,7 @@ export class GeoImageCreator {
 
         this._quadTexCoordsBuffer = h.createArrayBuffer(new Float32Array([0, 1, 1, 1, 0, 0, 1, 0]), 2, 4);
         this._quadVertexBuffer = h.createArrayBuffer(new Float32Array([-1, 1, 1, 1, -1, -1, 1, -1]), 2, 4);
-    };
+    }
 
     _initShaders() {
 
@@ -155,6 +155,6 @@ export class GeoImageCreator {
                             gl_FragColor = texture2D(sourceTexture, v_texCoords);
                         }`
         }));
-    };
+    }
 
 }

package/src/og/utils/Loader.js

@@ -12,7 +12,7 @@ if (window && !('createImageBitmap' in window)) {
             img.src = URL.createObjectURL(blob);
         });
     };
-};
+}
 
 export class Loader {
 
@@ -33,12 +33,12 @@ export class Loader {
             'imageBitmap': r => r.blob().then(createImageBitmap),
             'text': r => r.text()
         };
-    };
+    }
 
     load(params, callback) {
         this._queue.push({ 'params': params, 'callback': callback });
         this._exec();
-    };
+    }
 
     fetch(params) {
         return fetch(
@@ -60,7 +60,7 @@ export class Loader {
             .catch(err => {
                 return { 'status': "error", 'msg': err.toString() };
             });
-    };
+    }
 
     _exec() {
 
@@ -98,7 +98,7 @@ export class Loader {
         } else if (this._loading === 0) {
             this.events.dispatch(this.events.loadend);
         }
-    };
+    }
 
     abort() {
         //this._queue.each(e => e.callback({ 'status': "abort" }));
@@ -109,5 +109,5 @@ export class Loader {
             this._queue[i] = null;
         }
         this._queue = [];
-    };
+    }
 }

package/src/og/utils/NormalMapCreator.js

@@ -35,7 +35,7 @@ export class NormalMapCreator {
         this._lock = new Lock();
 
         this._init();
-    };
+    }
 
     _init() {
         var isWebkit = false; //('WebkitAppearance' in document.documentElement.style) && !/^((?!chrome).)*safari/i.test(navigator.userAgent);
@@ -161,7 +161,7 @@ export class NormalMapCreator {
         var positions = new Float32Array([-1.0, -1.0, 1.0, -1.0, -1.0, 1.0, 1.0, 1.0]);
 
         this._positionBuffer = this._handler.createArrayBuffer(positions, 2, positions.length / 2);
-    };
+    }
 
     _drawNormalMapBlur(segment) {
         var normals = segment.normalMapNormals;
@@ -242,7 +242,7 @@ export class NormalMapCreator {
             }
         }
         return false;
-    };
+    }
 
     _drawNormalMapNoBlur(segment) {
         var normals = segment.normalMapNormals;
@@ -302,7 +302,7 @@ export class NormalMapCreator {
             }
         }
         return false;
-    };
+    }
 
     _drawNormalMap(segment) {
         let t = segment.planet.terrain;
@@ -312,7 +312,7 @@ export class NormalMapCreator {
         } else {
             return this._drawNormalMapNoBlur(segment);
         }
-    };
+    }
 
     drawSingle(segment) {
         var h = this._handler,
@@ -337,7 +337,7 @@ export class NormalMapCreator {
         gl.enable(gl.CULL_FACE);
 
         this._framebuffer.deactivate();
-    };
+    }
 
     frame() {
         if (this._queue.length) {
@@ -371,28 +371,28 @@ export class NormalMapCreator {
 
             this._framebuffer.deactivate();
         }
-    };
+    }
 
     queue(segment) {
         segment._inTheQueue = true;
         this._queue.push(segment);
-    };
+    }
 
     unshift(segment) {
         segment._inTheQueue = true;
         this._queue.unshift(segment);
-    };
+    }
 
     remove(segment) {
         //...
-    };
+    }
 
     clear() {
         while (this._queue.length) {
             var s = this._queue.pop();
             s._inTheQueue = false;
         }
-    };
+    }
 
     /**
      * Set activity off
@@ -400,7 +400,7 @@ export class NormalMapCreator {
      */
     lock(key) {
         this._lock.lock(key);
-    };
+    }
 
     /**
      * Set activity on
@@ -408,6 +408,6 @@ export class NormalMapCreator {
      */
     free(key) {
         this._lock.free(key);
-    };
+    }
 
 }

package/src/og/utils/TerrainWorker.js

@@ -84,7 +84,7 @@ class TerrainWorker {
             this.check();
         }
     }
-};
+}
 
 const _programm =
     `'use strict';

package/src/og/utils/TextureAtlas.js

@@ -1,11 +1,11 @@
-'use strict';
+"use strict";
 
-import { ImageCanvas } from '../ImageCanvas.js';
-import { Rectangle } from '../Rectangle.js';
-import { ImagesCacheManager } from './ImagesCacheManager.js';
+import { ImageCanvas } from "../ImageCanvas.js";
+import { Rectangle } from "../Rectangle.js";
+import { ImagesCacheManager } from "./ImagesCacheManager.js";
 
 /**
- * Texture atlas stores images in one texture. Each image has its own 
+ * Texture atlas stores images in one texture. Each image has its own
  * atlas texture coordinates.
  * @class
  * @param {number} [width] - Texture atlas width, if it hasn't 1024 default.
@@ -13,11 +13,10 @@ import { ImagesCacheManager } from './ImagesCacheManager.js';
  */
 class TextureAtlas {
     constructor(width, height) {
-
         /**
          * Atlas nodes where input images store. It can be access by image.__nodeIndex.
          * @public
-         * @type {Array.<og.utils.TextureAtlasNode >}
+         * @type {Array.<utils.TextureAtlasNode >}
          */
         this.nodes = [];
 
@@ -71,7 +70,7 @@ class TextureAtlas {
     /**
      * Sets openglobus gl handler that creates gl texture.
      * @public
-     * @param {og.webgl.Handler} handler - WebGL handler.
+     * @param {Handler} handler - WebGL handler.
      */
     assignHandler(handler) {
         this._handler = handler;
@@ -93,12 +92,11 @@ class TextureAtlas {
      * Adds image to the atlas and returns creted node with texture coordinates of the stored image.
      * @public
      * @param {Object} image - Input javascript image object.
-     * @param {boolean} [fastInsert] - If it's true atlas doesnt restore all images again 
+     * @param {boolean} [fastInsert] - If it's true atlas doesnt restore all images again
      * and store image in the curent atlas sheme.
-     * @returns {og.utils.TextureAtlasNode} -
+     * @returns {utils.TextureAtlasNode} -
      */
     addImage(image, fastInsert) {
-
         if (!(image.width && image.height)) {
             return;
         }
@@ -145,11 +143,10 @@ class TextureAtlas {
     /**
      * Main atlas making function.
      * @private
-     * @param {boolean} [fastInsert] - If it's true atlas doesnt restore all images again 
+     * @param {boolean} [fastInsert] - If it's true atlas doesnt restore all images again
      * and store image in the curent atlas sheme.
      */
     _makeAtlas(fastInsert) {
-
         if (fastInsert && this._btree) {
             let im = this._images[this._images.length - 1];
             this._completeNode(this.nodes, this._btree.insert(im));
@@ -157,10 +154,15 @@ class TextureAtlas {
             let im = this._images.slice(0);
 
             im.sort(function (b, a) {
-                return ((a.atlasWidth || a.width) - (b.atlasWidth || b.width)) || ((a.atlasHeight || a.height) - (b.atlasHeight || b.height));
+                return (
+                    (a.atlasWidth || a.width) - (b.atlasWidth || b.width) ||
+                    (a.atlasHeight || a.height) - (b.atlasHeight || b.height)
+                );
             });
 
-            this._btree = new TextureAtlasNode(new Rectangle(0, 0, this.canvas.getWidth(), this.canvas.getHeight()));
+            this._btree = new TextureAtlasNode(
+                new Rectangle(0, 0, this.canvas.getWidth(), this.canvas.getHeight())
+            );
             this._btree.atlas = this;
 
             this.clearCanvas();
@@ -190,7 +192,7 @@ class TextureAtlas {
     }
 
     /**
-     * Image handler callback. 
+     * Image handler callback.
      * @callback Object~successCallback
      * @param {Image} img - Loaded image.
      */
@@ -215,7 +217,7 @@ class TextureAtlas {
 /**
  * Atlas binary tree node.
  * @class
- * @param {og.Rectangle} rect - Node image rectangle.
+ * @param {Rectangle} rect - Node image rectangle.
  */
 class TextureAtlasNode {
     constructor(rect, texCoords) {
@@ -227,9 +229,7 @@ class TextureAtlasNode {
     }
 
     insert(img) {
-
         if (this.childNodes) {
-
             var newNode = this.childNodes[0].insert(img);
 
             if (newNode != null) {
@@ -237,9 +237,7 @@ class TextureAtlasNode {
             }
 
             return this.childNodes[1].insert(img);
-
         } else {
-
             if (this.image != null) {
                 return null;
             }
@@ -279,4 +277,4 @@ class TextureAtlasNode {
     }
 }
 
-export { TextureAtlas, TextureAtlasNode };
+export { TextureAtlas, TextureAtlasNode };

package/src/og/utils/VectorTileCreator.js

@@ -24,7 +24,7 @@ export class VectorTileCreator {
         this._currentFrame = 0;
         this._queue = [];
         this._initialize();
-    };
+    }
 
     _initialize() {
 
@@ -189,7 +189,7 @@ export class VectorTileCreator {
             useDepth: false
         });
         this._framebuffer.init();
-    };
+    }
 
     frame() {
         if (this._planet.layerLock.isFree() && this._queue.length) {
@@ -404,13 +404,13 @@ export class VectorTileCreator {
 
             f.deactivate();
         }
-    };
+    }
 
     add(material) {
         this._queue.push(material);
-    };
+    }
 
     remove(material) {
         //...
-    };
+    }
 }

package/src/og/utils/earcut.js

@@ -629,7 +629,7 @@ function deviation(data, holeIndices, dim, triangles) {
 
     return polygonArea === 0 && trianglesArea === 0 ? 0 :
         Math.abs((trianglesArea - polygonArea) / polygonArea);
-};
+}
 
 function signedArea(data, start, end, dim) {
     var sum = 0;

package/src/og/utils/shared.js

@@ -56,7 +56,7 @@ export function readTextFile(fileUrl) {
  * Convert html color string to the RGBA number vector.
  * @param {string} htmlColor - HTML string("#C6C6C6" or "#EF5" or "rgb(8,8,8)" or "rgba(8,8,8)") color.
  * @param {number} [opacity] - Opacity for the output vector.
- * @returns {og.math.Vec4} -
+ * @returns {math.Vec4} -
  */
 export function htmlColorToRgba(htmlColor, opacity) {
     var hColor = colorTable[htmlColor];
@@ -99,7 +99,7 @@ export function htmlColorToFloat32Array(htmlColor, opacity) {
  * Convert html color string to the RGB number vector.
  * @param {string} htmlColor - HTML string("#C6C6C6" or "#EF5" or "rgb(8,8,8)" or "rgba(8,8,8)") color.
  * @param {number} [opacity] - Opacity for the output vector.
- * @returns {og.Vec3} -
+ * @returns {Vec3} -
  */
 export function htmlColorToRgb(htmlColor) {
     var hColor = colorTable[htmlColor];
@@ -283,7 +283,7 @@ export function binarySearchFast(arr, x) {
  * Finds an item in a sorted array.
  * @param {Array} ar The sorted array to search.
  * @param {Object} el The item to find in the array.
- * @param {og.utils.binarySearch~compare_fn} compare_fn comparator The function to use to compare the item to
+ * @param {utils.binarySearch~compare_fn} compare_fn comparator The function to use to compare the item to
  *        elements in the array.
  * @returns {Number} a negative number  if a is less than b; 0 if a is equal to b;a positive number of a is greater than b.
  *
@@ -316,7 +316,7 @@ export function binarySearch(ar, el, compare_fn) {
  * Binary insertion that uses binarySearch algorithm.
  * @param {Array} ar - The sorted array to insert.
  * @param {Object} el - The item to insert.
- * @param {og.utils.binarySearch~compare_fn} compare_fn - comparator The function to use to compare the item to
+ * @param {utils.binarySearch~compare_fn} compare_fn - comparator The function to use to compare the item to
  *        elements in the array.
  * @returns {Number} Array index position in which item inserted in.
  */
@@ -332,12 +332,12 @@ export function binaryInsert(ar, el, compare_fn) {
 /**
  * Returns two segment lines intersection coordinate.
  * @static
- * @param {og.math.Vec2} start1 - First line first coordinate.
- * @param {og.math.Vec2} end1 - First line second coordinate.
- * @param {og.math.Vec2} start2 - Second line first coordinate.
- * @param {og.math.Vec2} end2 - Second line second coordinate.
+ * @param {math.Vec2} start1 - First line first coordinate.
+ * @param {math.Vec2} end1 - First line second coordinate.
+ * @param {math.Vec2} start2 - Second line first coordinate.
+ * @param {math.Vec2} end2 - Second line second coordinate.
  * @param {boolean} [isSegment] - Lines are segments.
- * @return {og.math.Vec2} - Intersection coordinate.
+ * @return {math.Vec2} - Intersection coordinate.
  */
 export function getLinesIntersection2v(start1, end1, start2, end2, isSegment) {
     var dir1 = end1.sub(start1);
@@ -372,12 +372,12 @@ export function getLinesIntersection2v(start1, end1, start2, end2, isSegment) {
 /**
  * Returns two segment lines intersection coordinate.
  * @static
- * @param {og.math.Vec2} start1 - First line first coordinate.
- * @param {og.math.Vec2} end1 - First line second coordinate.
- * @param {og.math.Vec2} start2 - Second line first coordinate.
- * @param {og.math.Vec2} end2 - Second line second coordinate.
+ * @param {math.Vec2} start1 - First line first coordinate.
+ * @param {math.Vec2} end1 - First line second coordinate.
+ * @param {math.Vec2} start2 - Second line first coordinate.
+ * @param {math.Vec2} end2 - Second line second coordinate.
  * @param {boolean} [isSegment] - Lines are segments.
- * @return {og.math.Vec2} - Intersection coordinate.
+ * @return {math.Vec2} - Intersection coordinate.
  */
 export function getLinesIntersectionLonLat(start1, end1, start2, end2, isSegment) {
     var dir1 = new LonLat(end1.lon - start1.lon, end1.lat - start1.lat);
@@ -752,7 +752,7 @@ export function concatTypedArrays(a, b) {
  * @param {TypedArray | Array} a
  * @param {TypedArray | Array} b
  */
-export function concatArrays(a, b) {
+export function concatArrays(a = [], b) {
     if (ArrayBuffer.isView(a)) {
         return concatTypedArrays(a, b);
     } else {