@avs/go 0.12.71731 → 0.13.71740

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avs/go",
-  "version": "0.12.71731",
+  "version": "0.13.71740",
   "description": "AVS Go",
   "keywords": [
     "polymer",
@@ -23,6 +23,7 @@
   "scripts": {
     "build": "webpack --mode production",
     "dev": "webpack --mode development --watch",
+	"start": "http-server -o demo/jsonView.html",
     "type-check": "echo 'No TypeScript in core package'"
   },
   "license": "Apache-2.0",

package/src/avs-go-dataviz.js

@@ -888,15 +888,12 @@ export class AvsGoDataViz extends AvsDataSourceMixin(AvsStreamMixin(AvsHttpMixin
    * @param json JSON parsed from HTTP response.
    */
   _handleHttpResponse(json) {
-    var loadComplete = true;
-
-    if (json !== undefined) {
-
-      if (json.selectionInfo !== undefined) {
+    if (json) {
+      if (json.selectionInfo) {
         this._dispatchPickEvents(json.selectionInfo);
 	  }
 
-      if (json.sceneInfo !== undefined) {
+      if (json.sceneInfo) {
         var sceneEvent = {detail: json.sceneInfo};
         /**
          * Scene info from the server.
@@ -905,7 +902,7 @@ export class AvsGoDataViz extends AvsDataSourceMixin(AvsStreamMixin(AvsHttpMixin
         this.dispatchEvent(new CustomEvent('avs-scene-info', sceneEvent));
 
         // Set tooltip and zoom overlay style to reversed theme
-        if (json.sceneInfo.backgroundColor !== undefined) {
+        if (json.sceneInfo.backgroundColor) {
           var col = json.sceneInfo.backgroundColor.match(/[0-9.]+/gi);
           var bgCol = window.getComputedStyle(this.parentNode, null).getPropertyValue("background-color").trim().match(/[0-9.]+/gi);
           var blendedR = (col[0] * col[3]);
@@ -920,27 +917,21 @@ export class AvsGoDataViz extends AvsDataSourceMixin(AvsStreamMixin(AvsHttpMixin
           this.$.zoomOverlay.style.color = "var(--avs-zoom-overlay-color, rgb(" + blendedR + "," + blendedG + "," + blendedB + "))";
           this.$.tooltip.style.color = "var(--avs-tooltip-color, rgb(" + blendedR + "," + blendedG + "," + blendedB + "))";
         }
-        if (json.sceneInfo.color !== undefined) {
+        if (json.sceneInfo.color) {
           var col = json.sceneInfo.color.match(/[0-9.]+/gi);
           this.$.zoomOverlay.style.background = "var(--avs-zoom-overlay-background, rgba(" + col[0] + "," + col[1] + "," + col[2] + "))";
           this.$.tooltip.style.background = "var(--avs-tooltip-background, rgb(" + col[0] + "," + col[1] + "," + col[2] + "))";
         }
-        if (json.sceneInfo.fontFamily !== undefined) {
+        if (json.sceneInfo.fontFamily) {
           this.$.zoomOverlay.style.fontFamily = "var(--avs-zoom-overlay-font-family, " + json.sceneInfo.fontFamily + ")";
           this.$.tooltip.style.fontFamily = "var(--avs-tooltip-font-family, " + json.sceneInfo.fontFamily + ")";
         }
       }
 
-  	  if (json.image !== undefined) {
-
-        if (json.image.startsWith("?app=image")) {
-          this.sceneImage.src = this.url + json.image;
-        }
-        else {	
-	      this.sceneImage.src = json.image;
-        }
+  	  if (json.image) {
+        this.sceneImage.src = json.image;
 
-	    if (json.imagemap !== undefined) {
+	    if (json.imagemap) {
 	      this.sceneImageMap.innerHTML = decodeURIComponent(json.imagemap.replace(/\+/g, '%20'));
 
           this.imageMapData = Array.from(this.sceneImageMap.querySelectorAll('area')).map(area => {
@@ -957,53 +948,59 @@ export class AvsGoDataViz extends AvsDataSourceMixin(AvsStreamMixin(AvsHttpMixin
           this.sceneImageMap.innerHTML = "";
           this.imageMapData = undefined;
         }
+		
+		this._handleLoadComplete();
 	  }
-	  else if (json.svg !== undefined) {
+	  else if (json.svg) {
 	    this.svgDiv.innerHTML = decodeURIComponent(json.svg.replace(/\+/g, '%20'));
+		this._handleLoadComplete();
 	  }
-      else if (json.threejs !== undefined) {
-        this.threeViewer.loadGeometryAsJson(json.threejs);
-      }
-      else if (json.chunkId !== undefined) {
-        this.threeViewer.loadGeometryAsEvents(json);
-
-        if (json.moreChunks === true) {
-          if (this.urlLoadJsonFile) {
-            this.chunkFile++;
-			const urlBase = this.url.substring(0, this.url.lastIndexOf('.')) || this.url;
-			const ext = this.url.split('.').pop();
-            this._httpRequest(urlBase + '-' + this.chunkFile + '.' + ext, this._handleHttpResponse.bind(this), undefined, this._handleHttpError.bind(this));
-          }
-          else {
-            var model = this._assembleModel();
-            if (model !== undefined) {
-              model.rendererProperties.streamProperties.chunkId = json.chunkId;
-              this._httpRequest(this.url, this._handleHttpResponse.bind(this), undefined, this._handleHttpError.bind(this), model);
+      else if (json.threejs) {
+        if (json.threejs.chunkId) {
+          this.threeViewer.loadGeometryAsEvents(json.threejs, this._handleLoadComplete.bind(this));
+
+          if (json.threejs.moreChunks === true) {
+            if (this.urlLoadJsonFile) {
+              // Load the next chunk file
+              this.chunkFile++;
+			  const urlBase = this.url.substring(0, this.url.lastIndexOf('.')) || this.url;
+			  const ext = this.url.split('.').pop();
+              this._httpRequest(urlBase + '-' + this.chunkFile + '.' + ext, this._handleHttpResponse.bind(this), undefined, this._handleHttpError.bind(this));
+            }
+            else {
+              // Get the next chunk from the server
+              var model = this._assembleModel();
+              if (model) {
+                model.rendererProperties.streamProperties.chunkId = json.threejs.chunkId;
+                this._httpRequest(this.url, this._handleHttpResponse.bind(this), undefined, this._handleHttpError.bind(this), model);
+              }
             }
           }
-          loadComplete = false;
+        }
+        else {
+          this.threeViewer.loadGeometryAsJson(json.threejs, this._handleLoadComplete.bind(this));
         }
       }
-      else if (this.urlLoadJsonFile) {
-        this.threeViewer.loadGeometryAsJson(json);
+      else {
+        console.log("ERROR: No image, SVG, or ThreeJS found in response.");
+        this._handleLoadComplete();
       }
     }
+  }
 
-    if (loadComplete) {
-      // Hide the spinner and grab the scene background color for next time
-      // Disable background temporarily
-      this.hideSpinner();
-      this.stopSpinner();
-/*      if (json.backgroundColor !== undefined) {
-        this.updateStyles({'--avs-spinner-background-color': json.backgroundColor});
-      }*/
+  /**
+   *
+   */
+  _handleLoadComplete() {
+    // Stop and hide the spinner
+    this.hideSpinner();
+    this.stopSpinner();
 
-      /**
-       * Scene load has completed.
-       * @event avs-load-complete
-       */
-      this.dispatchEvent(new CustomEvent('avs-load-complete'));
-    }
+    /**
+     * Scene load has completed.
+     * @event avs-load-complete
+     */
+    this.dispatchEvent(new CustomEvent('avs-load-complete'));
   }
 
   /**

package/src/constants.js

@@ -18,4 +18,4 @@
  * Advanced Visual Systems Inc. (http://www.avs.com)
  */
 
-export var VERSION = '0.12.71731';
+export var VERSION = '0.13.71740';