Merge pull request #41 from DavidLevinsky/master

Fixed surface switching

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vts-browser-js",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "JavaScript WebGL 3D maps rendering engine",
   "main": "src/browser/index.js",
   "scripts": {

src/browser/autopilot/autopilot.js

@@ -118,6 +118,12 @@ Autopilot.prototype.tick = function() {
     var timeFactor =  (time - this.lastTime) / 1000; 
     this.lastTime = time;
 
+    if (this.browser.ui && this.browser.ui.loading &&
+        this.browser.ui.loading.control.getVisible()) {
+        return;
+    }
+
+
     if (this.autoRotate != 0) {
         pos = map.getPosition();
         var o = pos.getOrientation();

src/browser/browser.js

@@ -353,15 +353,15 @@ Browser.prototype.setConfigParam = function(key, value, ignoreCore) {
     case 'sensitivity':          this.config.sensitivity = utils.validateNumberArray(value, 3, [0,0,0], [10, 10, 10], [1, 0.12, 0.05]); break;
     case 'inertia':              this.config.inertia = utils.validateNumberArray(value, 3, [0,0,0], [0.99, 0.99, 0.99], [0.85, 0.9, 0.7]); break;
     case 'rotate':             
-        this.config.autoRotate = utils.validateNumber(value, Number.NEGATIVEINFINITY, Number.POSITIVEINFINITY, 0);
+        this.config.autoRotate = utils.validateNumber(value, Number.NEGATIVE_INFINITY, Number.POSITIVE_INFINITY, 0);
         if (map && this.autopilot) {
             this.autopilot.setAutorotate(this.config.autoRotate);
         }
         break;
     case 'pan':
         if (Array.isArray(value) && value.length == 2){
             this.config.autoPan = [
-                utils.validateNumber(value[0], Number.NEGATIVEINFINITY, Number.POSITIVEINFINITY, 0),
+                utils.validateNumber(value[0], Number.NEGATIVE_INFINITY, Number.POSITIVE_INFINITY, 0),
                 utils.validateNumber(value[1], -360, 360, 0)
             ];
         }

src/core/core.js

@@ -468,7 +468,7 @@ string getCoreVersion()
 */
 
 function getCoreVersion(full) {
-    return (full ? 'Core: ' : '') + '2.2.1';
+    return (full ? 'Core: ' : '') + '2.2.2';
 }
 
 

src/core/inspector/layers.js

@@ -435,31 +435,36 @@ InspectorLayers.prototype.buildSurfaces = function() {
 
 InspectorLayers.prototype.buildBoundLayers = function(id) {
     var view = this.views[this.currentView];
-    var layers = view.surfaces[id].layers;
     var html = '';
 
-    for (var i = 0, li = layers.length; i < li; i++) {
-        var layer = layers[i];
+    if (view.surfaces[id]) {
+        var layers = view.surfaces[id].layers;
 
-        html += '<div class="vts-layers-item"><input id="vts-boundlayer-checkbox-' + layer.id + '" type="checkbox" ' + (layer.enabled ? 'checked' : '')   + '/>'
-                 + '<div class="vts-layers-name">' + layer.id + '</div>'
-                 + '<input id="vts-boundlayer-spinner-' + layer.id + '" type="number" title="Alpha" min="0" max="100" step="10" value="' + layer.alpha + '">'
-                 + '<button id="vts-boundlayer-ubutton-' + layer.id + '" type="button" title="Move Above">&uarr;</button>' 
-                 + '<button id="vts-boundlayer-dbutton-' + layer.id + '" type="button" title="Move Bellow">&darr;</button>' 
-                 + '</div>';
+        for (var i = 0, li = layers.length; i < li; i++) {
+            var layer = layers[i];
+
+            html += '<div class="vts-layers-item"><input id="vts-boundlayer-checkbox-' + layer.id + '" type="checkbox" ' + (layer.enabled ? 'checked' : '')   + '/>'
+                     + '<div class="vts-layers-name">' + layer.id + '</div>'
+                     + '<input id="vts-boundlayer-spinner-' + layer.id + '" type="number" title="Alpha" min="0" max="100" step="10" value="' + layer.alpha + '">'
+                     + '<button id="vts-boundlayer-ubutton-' + layer.id + '" type="button" title="Move Above">&uarr;</button>' 
+                     + '<button id="vts-boundlayer-dbutton-' + layer.id + '" type="button" title="Move Bellow">&darr;</button>' 
+                     + '</div>';
+        }
     }
 
     this.boundLayersItems.innerHTML = html;
 
-    for (i = 0, li = layers.length; i < li; i++) {
-        var htmlId = 'vts-boundlayer-checkbox-' + layers[i].id;
-        document.getElementById(htmlId).onchange = this.switchBoundLayer.bind(this, layers[i].id, htmlId, 'enable');
-        htmlId = 'vts-boundlayer-spinner-' + layers[i].id;
-        document.getElementById(htmlId).onchange = this.switchBoundLayer.bind(this, layers[i].id, htmlId, 'alpha');
-        htmlId = 'vts-boundlayer-ubutton-' + layers[i].id;
-        document.getElementById(htmlId).onclick = this.switchBoundLayer.bind(this, layers[i].id, htmlId, 'up');
-        htmlId = 'vts-boundlayer-dbutton-' + layers[i].id;
-        document.getElementById(htmlId).onclick = this.switchBoundLayer.bind(this, layers[i].id, htmlId, 'down');
+    if (view.surfaces[id]) {
+        for (i = 0, li = layers.length; i < li; i++) {
+            var htmlId = 'vts-boundlayer-checkbox-' + layers[i].id;
+            document.getElementById(htmlId).onchange = this.switchBoundLayer.bind(this, layers[i].id, htmlId, 'enable');
+            htmlId = 'vts-boundlayer-spinner-' + layers[i].id;
+            document.getElementById(htmlId).onchange = this.switchBoundLayer.bind(this, layers[i].id, htmlId, 'alpha');
+            htmlId = 'vts-boundlayer-ubutton-' + layers[i].id;
+            document.getElementById(htmlId).onclick = this.switchBoundLayer.bind(this, layers[i].id, htmlId, 'up');
+            htmlId = 'vts-boundlayer-dbutton-' + layers[i].id;
+            document.getElementById(htmlId).onclick = this.switchBoundLayer.bind(this, layers[i].id, htmlId, 'down');
+        }
     }
 };
 
@@ -664,7 +669,9 @@ InspectorLayers.prototype.selectSurface = function(id) {
 
     //select new one
     element = document.getElementById('vts-surface-item-' + id);
-    element.style.backgroundColor = '#ddd';
+    if (element) {
+        element.style.backgroundColor = '#ddd';
+    }
     this.currentSurface = id;
     this.buildBoundLayers(this.currentSurface);
 };

src/core/map/draw-tiles.js

@@ -629,7 +629,7 @@ MapDrawTiles.prototype.updateTileSurfaceBounds = function(tile, submesh, surface
     var path, extraBound, layer, texture;
 
     //if (tile.id[0] == 18 && tile.id[1] == 70930 && tile.id[2] == 44286) {
-      //  tile = tile;
+        //tile = tile;
     //}
 
     //search map view
@@ -671,7 +671,8 @@ MapDrawTiles.prototype.updateTileSurfaceBounds = function(tile, submesh, surface
                         bound.transparent = true;
                     }
 
-                    var fullAndOpaque = !((surface.boundLayerSequence[j][1] < 1.0) || texture.extraBound || texture.getMaskTexture() || layer.isTransparent);
+                    //var fullAndOpaque = !((surface.boundLayerSequence[j][1] < 1.0) || texture.extraBound || texture.getMaskTexture() || layer.isTransparent);
+                    var fullAndOpaque = !((surface.boundLayerSequence[j][1] < 1.0) || extraBound || texture.getMaskTexture() || layer.isTransparent);
                     if (fullAndOpaque) {
                         fullAndOpaqueCounter++;
                     }
@@ -762,6 +763,12 @@ MapDrawTiles.prototype.updateTileSurfaceBounds = function(tile, submesh, surface
             }
         }
     }
+
+    if (tile.id[0] == 18 && tile.id[1] == 70930 && tile.id[2] == 44286) {
+        console.log(JSON.stringify(bound.sequence))
+        //tile = tile;
+    }
+
 };
 
 

src/core/map/metanode.js

@@ -164,12 +164,12 @@ struct Metanode {
             //console.log("empty-node: id: " + JSON.stringify(this.id));
             //console.log("empty-node: surafce: " + this.metatile.surface.id);
 
-            minExtents[0] = Number.POSITIVEINFINITY;
-            minExtents[1] = Number.POSITIVEINFINITY;
-            minExtents[2] = Number.POSITIVEINFINITY;
-            maxExtents[0] = Number.NEGATIVEINFINITY;
-            maxExtents[1] = Number.NEGATIVEINFINITY;
-            maxExtents[2] = Number.NEGATIVEINFINITY;
+            minExtents[0] = Number.POSITIVE_INFINITY;
+            minExtents[1] = Number.POSITIVE_INFINITY;
+            minExtents[2] = Number.POSITIVE_INFINITY;
+            maxExtents[0] = Number.NEGATIVE_INFINITY;
+            maxExtents[1] = Number.NEGATIVE_INFINITY;
+            maxExtents[2] = Number.NEGATIVE_INFINITY;
         }
 
         this.bbox = new BBox(minExtents[0], minExtents[1], minExtents[2], maxExtents[0], maxExtents[1], maxExtents[2]);
@@ -187,7 +187,7 @@ struct Metanode {
     this.displaySize = streamData.getUint16(stream.index, true); stream.index += 2;
     this.displaySize = 1024;
     if ((this.flags & (1 << 2)) == 0) {
-        this.pixelSize = Number.POSITIVEINFINITY;
+        this.pixelSize = Number.POSITIVE_INFINITY;
     }
 
     if ((this.flags & (1 << 3)) == 0) {

src/core/map/surface-tile.js

@@ -669,10 +669,10 @@ MapSurfaceTile.prototype.getPixelSize = function(bbox, screenPixelSize, cameraPo
             cameraPos[2] > min[2] && cameraPos[2] < max[2]) {
 
             if (returnDistance) {
-                return [Number.POSITIVEINFINITY, 0.1];
+                return [Number.POSITIVE_INFINITY, 0.1];
             }
 
-            return Number.POSITIVEINFINITY;
+            return Number.POSITIVE_INFINITY;
         }
     }
 
@@ -775,7 +775,7 @@ MapSurfaceTile.prototype.getPixelSize3Old = function(node, screenPixelSize, fact
     var d = (camera.geocentDistance*factor) - node.diskDistance;
     if (d < 0) {
         d = -d;
-        //return [Number.POSITIVEINFINITY, 0.1];
+        //return [Number.POSITIVE_INFINITY, 0.1];
     } 
 
     var a = vec3.dot(camera.geocentNormal, node.diskNormal);
@@ -830,7 +830,7 @@ MapSurfaceTile.prototype.getPixelSize3 = function(node, screenPixelSize) {
             if (d2 < 0) { //is camera is belown bottom bbox level?
                 d = -d2;
             } else { //is camera inside bbox
-                return [Number.POSITIVEINFINITY, 0.1];
+                return [Number.POSITIVE_INFINITY, 0.1];
             }
         } 
     }
@@ -874,7 +874,7 @@ MapSurfaceTile.prototype.updateTexelSize = function() {
     var preciseDistance = (map.isGeocent && (map.config.mapPreciseDistanceTest || node.metatile.useVersion >= 4));  
 
     if (node.hasGeometry()) {
-        var screenPixelSize = Number.POSITIVEINFINITY;
+        var screenPixelSize = Number.POSITIVE_INFINITY;
 
         if (node.usedTexelSize()) {
             screenPixelSize = draw.ndcToScreenPixel * node.pixelSize;
@@ -931,7 +931,7 @@ MapSurfaceTile.prototype.updateTexelSize = function() {
         }
 
         //pixelSize = this.getPixelSize(node.bbox, 1, cameraPos, cameraPos, true);
-        pixelSize[0] = Number.POSITIVEINFINITY;
+        pixelSize[0] = Number.POSITIVE_INFINITY;
     }
 
     this.texelSize = pixelSize[0];
@@ -976,7 +976,7 @@ MapSurfaceTile.prototype.updateTexelSize = function() {
 
 
 MapSurfaceTile.prototype.drawGrid = function(cameraPos, divNode, angle) {
-    if ((this.texelSize == Number.POSITIVEINFINITY || this.texelSize > 4.4) && this.metanode && this.metanode.hasChildren()) {
+    if ((this.texelSize == Number.POSITIVE_INFINITY || this.texelSize > 4.4) && this.metanode && this.metanode.hasChildren()) {
         return;
     }
 

src/core/map/surface-tree.js

@@ -301,7 +301,7 @@ MapSurfaceTree.prototype.drawSurface = function() {
 
                 usedNodes++;
 
-                if (tile.texelSize != Number.POSITIVEINFINITY){
+                if (tile.texelSize != Number.POSITIVE_INFINITY){
                     if (tile.texelSize > best) {
                         best = tile.texelSize;
                     }
@@ -533,7 +533,7 @@ MapSurfaceTree.prototype.drawSurfaceFitOnly = function() {
                     storeNodesBuffer.push(tile);
                 }
 
-                if (tile.texelSize  != Number.POSITIVEINFINITY){
+                if (tile.texelSize  != Number.POSITIVE_INFINITY){
                     if (tile.texelSize > best) {
                         best = tile.texelSize;
                     }
@@ -763,7 +763,7 @@ MapSurfaceTree.prototype.drawSurfaceFit = function() {
 
                 usedNodes++;
 
-                if (tile.texelSize  != Number.POSITIVEINFINITY){
+                if (tile.texelSize  != Number.POSITIVE_INFINITY){
                     if (tile.texelSize > best) {
                         best = tile.texelSize;
                     }

src/core/renderer/bbox.js

@@ -3,13 +3,13 @@ var BBox = function(xmin, ymin, zmin, xmax, ymax, zmax) {
     this.min = [];
     this.max = [];
 
-    this.min[0] = (xmin != null) ? xmin : Number.POSITIVEINFINITY;
-    this.min[1] = (ymin != null) ? ymin : Number.POSITIVEINFINITY;
-    this.min[2] = (zmin != null) ? zmin : Number.POSITIVEINFINITY;
+    this.min[0] = (xmin != null) ? xmin : Number.POSITIVE_INFINITY;
+    this.min[1] = (ymin != null) ? ymin : Number.POSITIVE_INFINITY;
+    this.min[2] = (zmin != null) ? zmin : Number.POSITIVE_INFINITY;
 
-    this.max[0] = (xmax != null) ? xmax : Number.NEGATIVEINFINITY;
-    this.max[1] = (ymax != null) ? ymax : Number.NEGATIVEINFINITY;
-    this.max[2] = (zmax != null) ? zmax : Number.NEGATIVEINFINITY;
+    this.max[0] = (xmax != null) ? xmax : Number.NEGATIVE_INFINITY;
+    this.max[1] = (ymax != null) ? ymax : Number.NEGATIVE_INFINITY;
+    this.max[2] = (zmax != null) ? zmax : Number.NEGATIVE_INFINITY;
 
     /*
     this.maxSize = Math.max(this.max[0] - this.min[0],
@@ -43,7 +43,23 @@ BBox.prototype.center = function(vec) {
         vec[1] = (this.min[1] + this.max[1])*0.5;
         return vec;
     } else {
-        return [(this.min[0] + this.max[0])*0.5, (this.min[1] + this.max[1])*0.5, (this.min[2] + this.max[2])*0.5];
+        if (!this.middle) {
+            this.middle = [(this.min[0] + this.max[0])*0.5, (this.min[1] + this.max[1])*0.5, (this.min[2] + this.max[2])*0.5];
+
+            if (Number.isNaN(this.middle[0])) {
+                this.middle[0] = 0;
+            }
+
+            if (Number.isNaN(this.middle[1])) {
+                this.middle[1] = 0;
+            }
+
+            if (Number.isNaN(this.middle[2])) {
+                this.middle[2] = 0;
+            }
+        } 
+
+        return this.middle;
     }
 };
 

src/core/renderer/camera.js

@@ -158,12 +158,12 @@ Camera.prototype.scaleFactor = function(worldPos, returnDist) {
     // resolution independent of camera rotation)
 
     if (returnDist) {
-        if (dist < this.near) return [Number.POSITIVEINFINITY, dist];
+        if (dist < this.near) return [Number.POSITIVE_INFINITY, dist];
         return [this.projection[0] / dist, dist]; 
         //return [(this.projection[5]*0.5) / dist, dist]; //projection by sy
     }
 
-    if (dist < this.near) return Number.POSITIVEINFINITY;
+    if (dist < this.near) return Number.POSITIVE_INFINITY;
     return this.projection[0] / dist;
     //return (this.projection[5]*0.5) / dist; //projection by sy
 };
@@ -172,7 +172,7 @@ Camera.prototype.scaleFactor = function(worldPos, returnDist) {
 Camera.prototype.scaleFactor2 = function(dist) {
     if (this.dirty) this.update();
 
-    if (dist < this.near) return Number.POSITIVEINFINITY;
+    if (dist < this.near) return Number.POSITIVE_INFINITY;
     return this.projection[0] / dist;
     //return (this.projection[5]*0.5) / dist; //projection by sy
 };