@openglobus/og 0.10.5 → 0.10.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.10.5",
+  "version": "0.10.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"

package/src/og/camera/PlanetCamera.js

@@ -551,9 +551,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/layer/CanvasTiles.js

@@ -2,10 +2,10 @@
  * @module og/layer/CanvasTiles
  */
 
-'use strict';
+"use strict";
 
-import * as quadTree from '../quadTree/quadTree.js';
-import { Layer } from './Layer.js';
+import * as quadTree from "../quadTree/quadTree.js";
+import { Layer } from "./Layer.js";
 
 /**
  * Maximum tiles per frame.
@@ -92,7 +92,7 @@ class CanvasTiles extends Layer {
         }
         this._pendingsQueue = [];
         // this._pendingsQueue.clear();
-    };
+    }
 
     /**
      * Sets layer visibility.
@@ -119,11 +119,12 @@ class CanvasTiles extends Layer {
      * @param {og.planetSegment.Material} material -
      */
     loadMaterial(material) {
-
         var seg = material.segment;
 
         if (this._isBaseLayer) {
-            material.texture = seg._isNorth ? seg.planet.solidTextureOne : seg.planet.solidTextureTwo;
+            material.texture = seg._isNorth
+                ? seg.planet.solidTextureOne
+                : seg.planet.solidTextureTwo;
         } else {
             material.texture = seg.planet.transparentTexture;
         }
@@ -149,33 +150,32 @@ class CanvasTiles extends Layer {
         this._counter++;
         var that = this;
         if (this.drawTile) {
-
             /**
              * Tile custom draw function.
              * @callback og.layer.CanvasTiles~drawTileCallback
              * @param {og.planetSegment.Material} material
              * @param {applyCanvasCallback} applyCanvasCallback
              */
-            setTimeout(function () {
-                var e = that.events.load;
-                if (e.handlers.length) {
-                    that.events.dispatch(e, material);
+            var e = that.events.load;
+            if (e.handlers.length) {
+                that.events.dispatch(e, material);
+            }
+            that.drawTile(
+                material,
+                /**
+                 * Apply canvas.
+                 * @callback applyCanvasCallback
+                 * @param {Object} canvas -
+                 */
+                function (canvas) {
+                    that._counter--;
+                    CanvasTiles.__requestsCounter--;
+                    if (material.isLoading) {
+                        material.applyImage(canvas);
+                    }
+                    that._dequeueRequest();
                 }
-                that.drawTile(material,
-                    /**
-                     * Apply canvas.
-                     * @callback applyCanvasCallback
-                     * @param {Object} canvas -
-                     */
-                    function (canvas) {
-                        that._counter--;
-                        CanvasTiles.__requestsCounter--;
-                        if (material.isLoading) {
-                            material.applyImage(canvas);
-                        }
-                        that._dequeueRequest();
-                    });
-            }, 50);
+            );
         } else {
             material.textureNotExists();
         }
@@ -214,7 +214,10 @@ class CanvasTiles extends Layer {
         while (this._pendingsQueue.length) {
             var pmat = this._pendingsQueue.pop();
             if (pmat.segment.node) {
-                if (pmat.segment.initialized && pmat.segment.node.getState() === quadTree.RENDERING) {
+                if (
+                    pmat.segment.initialized &&
+                    pmat.segment.node.getState() === quadTree.RENDERING
+                ) {
                     return pmat;
                 }
                 pmat.isLoading = false;
@@ -227,7 +230,6 @@ class CanvasTiles extends Layer {
         if (material.isReady) {
             return [0, 0, 1, 1];
         } else {
-
             !material.isLoading && this.loadMaterial(material);
 
             var segment = material.segment;
@@ -278,10 +280,10 @@ class CanvasTiles extends Layer {
         material.textureExists = false;
 
         if (material.image) {
-            material.image.src = '';
+            material.image.src = "";
             material.image = null;
         }
     }
-};
+}
 
 export { CanvasTiles };

package/src/og/quadTree/Node.js

@@ -477,26 +477,80 @@ Node.prototype.getCommonSide = function (node) {
             b_sw_lon = b_sw.lon,
             b_sw_lat = b_sw.lat;
 
+        if (as._tileGroup === bs._tileGroup) {
+            if (
+                a_ne_lon === b_sw_lon &&
+                ((a_ne_lat <= b_ne_lat && a_sw_lat >= b_sw_lat) ||
+                    (a_ne_lat >= b_ne_lat && a_sw_lat <= b_sw_lat))
+            ) {
+                return E;
+            } else if (
+                a_sw_lon === b_ne_lon &&
+                ((a_ne_lat <= b_ne_lat && a_sw_lat >= b_sw_lat) ||
+                    (a_ne_lat >= b_ne_lat && a_sw_lat <= b_sw_lat))
+            ) {
+                return W;
+            } else if (
+                a_ne_lat === b_sw_lat &&
+                ((a_sw_lon >= b_sw_lon && a_ne_lon <= b_ne_lon) ||
+                    (a_sw_lon <= b_sw_lon && a_ne_lon >= b_ne_lon))
+            ) {
+                return N;
+            } else if (
+                a_sw_lat === b_ne_lat &&
+                ((a_sw_lon >= b_sw_lon && a_ne_lon <= b_ne_lon) ||
+                    (a_sw_lon <= b_sw_lon && a_ne_lon >= b_ne_lon))
+            ) {
+                return S;
+            } else if (
+                bs.tileX === 0 &&
+                as.tileX === Math.pow(2, as.tileZoom) - 1 &&
+                ((a_ne_lat <= b_ne_lat && a_sw_lat >= b_sw_lat) ||
+                    (a_ne_lat >= b_ne_lat && a_sw_lat <= b_sw_lat))
+            ) {
+                return E;
+            } else if (
+                as.tileX === 0 &&
+                bs.tileX === Math.pow(2, bs.tileZoom) - 1 &&
+                ((a_ne_lat <= b_ne_lat && a_sw_lat >= b_sw_lat) ||
+                    (a_ne_lat >= b_ne_lat && a_sw_lat <= b_sw_lat))
+            ) {
+                return W;
+            }
+        }
+
         if (
-            a_ne_lon === b_sw_lon &&
-            ((a_ne_lat <= b_ne_lat && a_sw_lat >= b_sw_lat) ||
-                (a_ne_lat >= b_ne_lat && a_sw_lat <= b_sw_lat))
+            as._tileGroup === 0 &&
+            bs._tileGroup === 1 &&
+            as.tileY === 0 &&
+            bs.tileY === Math.pow(2, bs.tileZoom) - 1 &&
+            ((a_sw_lon >= b_sw_lon && a_ne_lon <= b_ne_lon) ||
+                (a_sw_lon <= b_sw_lon && a_ne_lon >= b_ne_lon))
         ) {
-            return E;
+            return N;
         } else if (
-            a_sw_lon === b_ne_lon &&
-            ((a_ne_lat <= b_ne_lat && a_sw_lat >= b_sw_lat) ||
-                (a_ne_lat >= b_ne_lat && a_sw_lat <= b_sw_lat))
+            as._tileGroup === 2 &&
+            bs._tileGroup === 0 &&
+            as.tileY === 0 &&
+            bs.tileY === Math.pow(2, bs.tileZoom) - 1 &&
+            ((a_sw_lon >= b_sw_lon && a_ne_lon <= b_ne_lon) ||
+                (a_sw_lon <= b_sw_lon && a_ne_lon >= b_ne_lon))
         ) {
-            return W;
+            return N;
         } else if (
-            a_ne_lat === b_sw_lat &&
+            bs._tileGroup === 1 &&
+            as._tileGroup === 0 &&
+            as.tileY === Math.pow(2, as.tileZoom) - 1 &&
+            bs.tileY === 0 &&
             ((a_sw_lon >= b_sw_lon && a_ne_lon <= b_ne_lon) ||
                 (a_sw_lon <= b_sw_lon && a_ne_lon >= b_ne_lon))
         ) {
-            return N;
+            return S;
         } else if (
-            a_sw_lat === b_ne_lat &&
+            as._tileGroup === 1 &&
+            bs._tileGroup === 0 &&
+            as.tileY === Math.pow(2, as.tileZoom) - 1 &&
+            bs.tileY === 0 &&
             ((a_sw_lon >= b_sw_lon && a_ne_lon <= b_ne_lon) ||
                 (a_sw_lon <= b_sw_lon && a_ne_lon >= b_ne_lon))
         ) {

package/src/og/scene/Planet.js

@@ -805,11 +805,11 @@ class Planet extends RenderNode {
         this._quadTree.renderNode();
         this._normalMapCreator.drawSingle(this._quadTree.segment);
 
-        //for (var i = 0; i < this._quadTree.nodes.length; i++) {
-        //    this._quadTree.nodes[i].segment.createPlainSegment();
-        //    this._quadTree.nodes[i].renderNode(true);
-        //    this._normalMapCreator.drawSingle(this._quadTree.nodes[i].segment);
-        //}
+        for (var i = 0; i < this._quadTree.nodes.length; i++) {
+            this._quadTree.nodes[i].segment.createPlainSegment();
+            this._quadTree.nodes[i].renderNode(true);
+            this._normalMapCreator.drawSingle(this._quadTree.nodes[i].segment);
+        }
 
         this._quadTreeNorth.createChildrenNodes();
         this._quadTreeNorth.segment.createPlainSegment();