@openglobus/og 0.16.3 → 0.17.0

package/src/og/input/MouseHandler.js

@@ -1,98 +1,94 @@
-/**
- * @module og/input/MouseHandler
- */
-
-'use strict';
-
-class MouseHandler {
-
-    constructor(htmlObject) {
-        this._htmlObject = htmlObject;
-    }
-
-    setEvent(event, sender, callback) {
-        switch (event) {
-            case "mousewheel":
-                this._htmlObject.addEventListener('mousewheel', function (evt) {
-                    var delta = evt.deltaY || evt.detail || evt.wheelDelta;
-                    if (evt.wheelDelta == undefined) {
-                        evt.wheelDelta = delta * (-120);
-                    }
-                    callback.call(sender, evt);
-                    evt.preventDefault();
-                }, false);
-
-                this._htmlObject.addEventListener('wheel', function (evt) {
-                    var delta = evt.deltaY || evt.detail || evt.wheelDelta;
-                    if (evt.wheelDelta == undefined) {
-                        evt.wheelDelta = delta * (-120);
-                    }
-                    callback.call(sender, evt);
-                    evt.preventDefault();
-                }, false);
-                break;
-
-            case "mousedown":
-                this._htmlObject.addEventListener('mousedown', function (event) {
-                    var rect = this.getBoundingClientRect();
-                    callback.call(sender, {
-                        button: event.button,
-                        clientX: event.clientX - rect.left,
-                        clientY: event.clientY - rect.top
-                    }, event);
-                });
-                this._htmlObject.addEventListener('contextmenu', function (event) {
-                    event.preventDefault();
-                    return false;
-                });
-                break;
-
-            case "mouseup":
-                this._htmlObject.addEventListener('mouseup', function (event) {
-                    var rect = this.getBoundingClientRect();
-                    callback.call(sender, {
-                        button: event.button,
-                        clientX: event.clientX - rect.left,
-                        clientY: event.clientY - rect.top
-                    }, event);
-                });
-                break;
-
-            case "mousemove":
-                this._htmlObject.addEventListener('mousemove', function (event) {
-                    var rect = this.getBoundingClientRect();
-                    callback.call(sender, {
-                        clientX: event.clientX - rect.left,
-                        clientY: event.clientY - rect.top
-                    }, event);
-                });
-                break;
-
-            case "mouseleave":
-                this._htmlObject.addEventListener('mouseleave', function (event) {
-                    callback.call(sender, event);
-                });
-                break;
-
-            case "mouseout":
-                this._htmlObject.addEventListener('mouseout', function (event) {
-                    callback.call(sender, event);
-                });
-                break;
-
-            case "mouseover":
-                this._htmlObject.addEventListener('mouseover', function (event) {
-                    callback.call(sender, event);
-                });
-                break;
-
-            case "mouseenter":
-                this._htmlObject.addEventListener('mouseenter', function (event) {
-                    callback.call(sender, event);
-                });
-                break;
-        }
-    }
-}
-
-export { MouseHandler };
+'use strict';
+
+class MouseHandler {
+
+    constructor(htmlObject) {
+        this._htmlObject = htmlObject;
+    }
+
+    setEvent(event, sender, callback) {
+        switch (event) {
+            case "mousewheel":
+                this._htmlObject.addEventListener('mousewheel', function (evt) {
+                    var delta = evt.deltaY || evt.detail || evt.wheelDelta;
+                    if (evt.wheelDelta == undefined) {
+                        evt.wheelDelta = delta * (-120);
+                    }
+                    callback.call(sender, evt);
+                    evt.preventDefault();
+                }, false);
+
+                this._htmlObject.addEventListener('wheel', function (evt) {
+                    var delta = evt.deltaY || evt.detail || evt.wheelDelta;
+                    if (evt.wheelDelta == undefined) {
+                        evt.wheelDelta = delta * (-120);
+                    }
+                    callback.call(sender, evt);
+                    evt.preventDefault();
+                }, false);
+                break;
+
+            case "mousedown":
+                this._htmlObject.addEventListener('mousedown', function (event) {
+                    var rect = this.getBoundingClientRect();
+                    callback.call(sender, {
+                        button: event.button,
+                        clientX: event.clientX - rect.left,
+                        clientY: event.clientY - rect.top
+                    }, event);
+                });
+                this._htmlObject.addEventListener('contextmenu', function (event) {
+                    event.preventDefault();
+                    return false;
+                });
+                break;
+
+            case "mouseup":
+                this._htmlObject.addEventListener('mouseup', function (event) {
+                    var rect = this.getBoundingClientRect();
+                    callback.call(sender, {
+                        button: event.button,
+                        clientX: event.clientX - rect.left,
+                        clientY: event.clientY - rect.top
+                    }, event);
+                });
+                break;
+
+            case "mousemove":
+                this._htmlObject.addEventListener('mousemove', function (event) {
+                    var rect = this.getBoundingClientRect();
+                    callback.call(sender, {
+                        clientX: event.clientX - rect.left,
+                        clientY: event.clientY - rect.top
+                    }, event);
+                });
+                break;
+
+            case "mouseleave":
+                this._htmlObject.addEventListener('mouseleave', function (event) {
+                    callback.call(sender, event);
+                });
+                break;
+
+            case "mouseout":
+                this._htmlObject.addEventListener('mouseout', function (event) {
+                    callback.call(sender, event);
+                });
+                break;
+
+            case "mouseover":
+                this._htmlObject.addEventListener('mouseover', function (event) {
+                    callback.call(sender, event);
+                });
+                break;
+
+            case "mouseenter":
+                this._htmlObject.addEventListener('mouseenter', function (event) {
+                    callback.call(sender, event);
+                });
+                break;
+        }
+    }
+}
+
+export { MouseHandler };

package/src/og/input/TouchHandler.js

@@ -1,63 +1,59 @@
-/**
- * @module og/input/TouchHandler
- */
-
-'use strict';
-
-class TouchHandler {
-
-    constructor(htmlObject) {
-        this._htmlObject = htmlObject;
-    }
-
-    setEvent(event, sender, callback) {
-        switch (event) {
-            case "touchcancel":
-                this._htmlObject.addEventListener('touchcancel', function (event) {
-                    event.preventDefault();
-                    var rect = this.getBoundingClientRect();
-                    event.offsetLeft = rect.left;
-                    event.offsetTop = rect.top;
-                    callback.call(sender, event);
-                    event.preventDefault();
-                });
-                break;
-
-            case "touchstart":
-                this._htmlObject.addEventListener('touchstart', function (event) {
-                    event.preventDefault();
-                    var rect = this.getBoundingClientRect();
-                    event.offsetLeft = rect.left;
-                    event.offsetTop = rect.top;
-                    callback.call(sender, event);
-                    event.preventDefault();
-                });
-                break;
-
-            case "touchend":
-                this._htmlObject.addEventListener('touchend', function (event) {
-                    event.preventDefault();
-                    var rect = this.getBoundingClientRect();
-                    event.offsetLeft = rect.left;
-                    event.offsetTop = rect.top;
-                    callback.call(sender, event);
-                    event.preventDefault();
-                });
-                break;
-
-            case "touchmove":
-                this._htmlObject.addEventListener('touchmove', function (event) {
-                    event.preventDefault();
-                    var rect = this.getBoundingClientRect();
-                    event.offsetLeft = rect.left;
-                    event.offsetTop = rect.top;
-                    callback.call(sender, event);
-                    event.preventDefault();
-                });
-                break;
-        }
-    }
-}
-
-export { TouchHandler };
-
+'use strict';
+
+class TouchHandler {
+
+    constructor(htmlObject) {
+        this._htmlObject = htmlObject;
+    }
+
+    setEvent(event, sender, callback) {
+        switch (event) {
+            case "touchcancel":
+                this._htmlObject.addEventListener('touchcancel', function (event) {
+                    event.preventDefault();
+                    var rect = this.getBoundingClientRect();
+                    event.offsetLeft = rect.left;
+                    event.offsetTop = rect.top;
+                    callback.call(sender, event);
+                    event.preventDefault();
+                });
+                break;
+
+            case "touchstart":
+                this._htmlObject.addEventListener('touchstart', function (event) {
+                    event.preventDefault();
+                    var rect = this.getBoundingClientRect();
+                    event.offsetLeft = rect.left;
+                    event.offsetTop = rect.top;
+                    callback.call(sender, event);
+                    event.preventDefault();
+                });
+                break;
+
+            case "touchend":
+                this._htmlObject.addEventListener('touchend', function (event) {
+                    event.preventDefault();
+                    var rect = this.getBoundingClientRect();
+                    event.offsetLeft = rect.left;
+                    event.offsetTop = rect.top;
+                    callback.call(sender, event);
+                    event.preventDefault();
+                });
+                break;
+
+            case "touchmove":
+                this._htmlObject.addEventListener('touchmove', function (event) {
+                    event.preventDefault();
+                    var rect = this.getBoundingClientRect();
+                    event.offsetLeft = rect.left;
+                    event.offsetTop = rect.top;
+                    callback.call(sender, event);
+                    event.preventDefault();
+                });
+                break;
+        }
+    }
+}
+
+export { TouchHandler };
+

package/src/og/input/input.js

@@ -1,48 +1,44 @@
-/**
- * @module og/input/input
- */
-
-'use strict';
-
-export const input = {
-    KEY_CTRL: 17,
-    KEY_ALT: 18,
-    KEY_SHIFT: 16,
-    KEY_SPACE: 32,
-    KEY_PGUP: 33,
-    KEY_PGDN: 34,
-    KEY_LEFT: 37,
-    KEY_UP: 38,
-    KEY_RIGHT: 39,
-    KEY_DOWN: 40,
-    KEY_PRINTSCREEN: 44,
-    KEY_EQUALS: 61,
-    KEY_A: 65,
-    KEY_C: 67,
-    KEY_D: 68,
-    KEY_E: 69,
-    KEY_F: 70,
-    KEY_H: 72,
-    KEY_I: 73,
-    KEY_K: 75,
-    KEY_L: 76,
-    KEY_N: 78,
-    KEY_O: 79,
-    KEY_P: 80,
-    KEY_Q: 81,
-    KEY_R: 82,
-    KEY_S: 83,
-    KEY_V: 86,
-    KEY_W: 87,
-    KEY_X: 88,
-    KEY_Z: 90,
-    KEY_PLUS: 107,
-    KEY_F1: 112,
-    KEY_MINUS: 173,
-    KEY_APOSTROPHE: 192,
-    MB_LEFT: 0,
-    MB_RIGHT: 2,
-    MB_MIDDLE: 1,
-    KEY_BACK_SLASH: 220,
-    KEY_SINGLE_QUOTE: 222
-};
+'use strict';
+
+export const input = {
+    KEY_CTRL: 17,
+    KEY_ALT: 18,
+    KEY_SHIFT: 16,
+    KEY_SPACE: 32,
+    KEY_PGUP: 33,
+    KEY_PGDN: 34,
+    KEY_LEFT: 37,
+    KEY_UP: 38,
+    KEY_RIGHT: 39,
+    KEY_DOWN: 40,
+    KEY_PRINTSCREEN: 44,
+    KEY_EQUALS: 61,
+    KEY_A: 65,
+    KEY_C: 67,
+    KEY_D: 68,
+    KEY_E: 69,
+    KEY_F: 70,
+    KEY_H: 72,
+    KEY_I: 73,
+    KEY_K: 75,
+    KEY_L: 76,
+    KEY_N: 78,
+    KEY_O: 79,
+    KEY_P: 80,
+    KEY_Q: 81,
+    KEY_R: 82,
+    KEY_S: 83,
+    KEY_V: 86,
+    KEY_W: 87,
+    KEY_X: 88,
+    KEY_Z: 90,
+    KEY_PLUS: 107,
+    KEY_F1: 112,
+    KEY_MINUS: 173,
+    KEY_APOSTROPHE: 192,
+    MB_LEFT: 0,
+    MB_RIGHT: 2,
+    MB_MIDDLE: 1,
+    KEY_BACK_SLASH: 220,
+    KEY_SINGLE_QUOTE: 222
+};

package/src/og/layer/BaseGeoImage.js

@@ -1,7 +1,3 @@
-/**
- * @module og/layer/BaseGeoImage
- */
-
 "use strict";
 
 import { Extent } from "../Extent.js";
@@ -265,10 +261,11 @@ class BaseGeoImage extends Layer {
             this._creationProceeding && p._geoImageCreator.remove(this);
             p._clearLayerMaterial(this);
 
-            gl.deleteBuffer(this._gridBuffer);
-
-            gl.deleteTexture(this._sourceTexture);
-            !this._materialTexture.default && gl.deleteTexture(this._materialTexture);
+            if (gl) {
+                gl.deleteBuffer(this._gridBuffer);
+                gl.deleteTexture(this._sourceTexture);
+                this._materialTexture && !this._materialTexture.default && gl.deleteTexture(this._materialTexture);
+            }
         }
 
         this._sourceTexture = null;

package/src/og/layer/CanvasTiles.js

@@ -1,7 +1,3 @@
-/**
- * @module og/layer/CanvasTiles
- */
-
 "use strict";
 
 import * as quadTree from "../quadTree/quadTree.js";

package/src/og/layer/GeoImage.js

@@ -1,7 +1,3 @@
-/**
- * @module og/layer/GeoImage
- */
-
 "use strict";
 
 import { nextHighestPowerOfTwo } from "../math.js";

package/src/og/layer/GeoTexture2d.js

@@ -1,7 +1,3 @@
-/**
- * @module og/layer/GeoTexture2d
- */
-
 'use strict';
 
 import * as math from '../math.js';

package/src/og/layer/GeoVideo.js

@@ -1,7 +1,3 @@
-/**
- * @module og/layer/GeoVideo
- */
-
 "use strict";
 
 import { BaseGeoImage } from "./BaseGeoImage.js";

package/src/og/layer/KML.js

@@ -1,4 +1,5 @@
 "use strict";
+
 import { Billboard } from "../entity/Billboard.js";
 import { Entity } from "../entity/Entity.js";
 import { Extent } from "../Extent.js";

package/src/og/layer/Layer.js

@@ -1,7 +1,3 @@
-/**
- * @module og/layer/Layer
- */
-
 "use strict";
 
 import { Events } from "../Events.js";
@@ -360,32 +356,33 @@ class Layer {
      * @param {Planet} planet - Planet render node.
      */
     _assignPlanet(planet) {
-        // TODO: webgl1
-        if (this._isSRGB) {
-            this._internalFormat = planet.renderer.handler.gl.SRGB8_ALPHA8;
-        } else {
-            this._internalFormat = planet.renderer.handler.gl.RGBA8;
-        }
 
-        this.createTexture = planet.renderer.handler.createTexture[this._textureFilter];
-
-        // TODO: replace to planet
+        this._planet = planet;
         planet._layers.push(this);
 
-        this._planet = planet;
-        this.events.on("visibilitychange", planet._onLayerVisibilityChanged, planet);
-        if (this._isBaseLayer && this._visibility) {
-            planet.setBaseLayer(this);
-        }
+        if (planet.renderer.isInitialized()) {
+            // TODO: webgl1
+            if (this._isSRGB) {
+                this._internalFormat = planet.renderer.handler.gl.SRGB8_ALPHA8;
+            } else {
+                this._internalFormat = planet.renderer.handler.gl.RGBA8;
+            }
+            this.createTexture = planet.renderer.handler.createTexture[this._textureFilter];
 
-        if (this._visibility && this.hasImageryTiles()) {
-            this._preLoad();
-        }
+            this.events.on("visibilitychange", planet._onLayerVisibilityChanged, planet);
+            if (this._isBaseLayer && this._visibility) {
+                planet.setBaseLayer(this);
+            }
 
-        planet.events.dispatch(planet.events.layeradd, this);
-        this.events.dispatch(this.events.add, planet);
-        planet.updateVisibleLayers();
-        this._bindPicking();
+            planet.events.dispatch(planet.events.layeradd, this);
+            this.events.dispatch(this.events.add, planet);
+            planet.updateVisibleLayers();
+            this._bindPicking();
+
+            if (this._visibility && this.hasImageryTiles()) {
+                this._preLoad();
+            }
+        }
     }
 
     get isIdle() {
@@ -410,7 +407,6 @@ class Layer {
         if (!this._planet) {
             this._assignPlanet(planet);
         }
-        return this;
     }
 
     /**

package/src/og/layer/Material.js

@@ -1,7 +1,3 @@
-/**
- * @module og/layer/Material
- */
-
 "use strict";
 
 class Material {

package/src/og/layer/Vector.js

@@ -1,7 +1,3 @@
-/**
- * @module og/layer/Vector
- */
-
 "use strict";
 
 import { Entity } from "../entity/Entity.js";
@@ -198,6 +194,13 @@ class Vector extends Layer {
         return this;
     }
 
+    remove() {
+        super.remove();
+        this._polylineEntityCollection.remove();
+        this._stripEntityCollection.remove();
+        this._geoObjectEntityCollection.remove();
+    }
+
     /**
      * Returns stored entities.
      * @public
@@ -300,21 +303,21 @@ class Vector extends Layer {
             }
         }
 
-        if (entity.billboard || entity.label) {
+        if (entity.billboard || entity.label || entity.geoObject) {
             if (this._planet) {
-                if (entity._cartesian.isZero() && !entity._lonlat.isZero()) {
+                if (entity._cartesian.isZero() && !entity._lonLat.isZero()) {
                     entity._setCartesian3vSilent(
-                        this._planet.ellipsoid.lonLatToCartesian(entity._lonlat)
+                        this._planet.ellipsoid.lonLatToCartesian(entity._lonLat)
                     );
                 } else {
-                    entity._lonlat = this._planet.ellipsoid.cartesianToLonLat(entity._cartesian);
+                    entity._lonLat = this._planet.ellipsoid.cartesianToLonLat(entity._cartesian);
                 }
 
                 // north tree
-                if (entity._lonlat.lat > mercator.MAX_LAT) {
+                if (entity._lonLat.lat > mercator.MAX_LAT) {
                     this._entityCollectionsTreeNorth.__setLonLat__(entity);
                     this._entityCollectionsTreeNorth.insertEntity(entity, rightNow);
-                } else if (entity._lonlat.lat < mercator.MIN_LAT) {
+                } else if (entity._lonLat.lat < mercator.MIN_LAT) {
                     // south tree
                     this._entityCollectionsTreeSouth.__setLonLat__(entity);
                     this._entityCollectionsTreeSouth.insertEntity(entity, rightNow);
@@ -609,9 +612,9 @@ class Vector extends Layer {
             for (let i = 0, len = entitiesForTree.length; i < len; i++) {
                 let entity = entitiesForTree[i];
                 // north tree
-                if (entity._lonlat.lat > mercator.MAX_LAT) {
+                if (entity._lonLat.lat > mercator.MAX_LAT) {
                     this._entityCollectionsTreeNorth.__setLonLat__(entity);
-                } else if (entity._lonlat.lat < mercator.MIN_LAT) {
+                } else if (entity._lonLat.lat < mercator.MIN_LAT) {
                     // south tree
                     this._entityCollectionsTreeSouth.__setLonLat__(entity);
                 } else {
@@ -845,7 +848,7 @@ class Vector extends Layer {
             // Merc nodes
             this._secondPASS = [];
             this._entityCollectionsTree &&
-                this._entityCollectionsTree.collectRenderCollectionsPASS1(p._visibleNodes, outArr);
+            this._entityCollectionsTree.collectRenderCollectionsPASS1(p._visibleNodes, outArr);
             var i = this._secondPASS.length;
             while (i--) {
                 this._secondPASS[i].collectRenderCollectionsPASS2(
@@ -858,9 +861,9 @@ class Vector extends Layer {
             // North nodes
             this._secondPASS = [];
             this._entityCollectionsTreeNorth &&
-                this._entityCollectionsTreeNorth.collectRenderCollectionsPASS1(
-                    p._visibleNodesNorth,
-                    outArr
+            this._entityCollectionsTreeNorth.collectRenderCollectionsPASS1(
+                p._visibleNodesNorth,
+                outArr
             );
             i = this._secondPASS.length;
             while (i--) {
@@ -874,10 +877,10 @@ class Vector extends Layer {
             // South nodes
             this._secondPASS = [];
             this._entityCollectionsTreeSouth &&
-                this._entityCollectionsTreeSouth.collectRenderCollectionsPASS1(
-                    p._visibleNodesSouth,
-                    outArr
-                );
+            this._entityCollectionsTreeSouth.collectRenderCollectionsPASS1(
+                p._visibleNodesSouth,
+                outArr
+            );
             i = this._secondPASS.length;
             while (i--) {
                 this._secondPASS[i].collectRenderCollectionsPASS2(