Added support for TySON decoding

sk8net · Mar 24, 2014 · ec782bf · ec782bf
1 parent d25574a
commit ec782bf
Show file tree

Hide file tree

Showing 2 changed files with 670 additions and 3 deletions.
diff --git a/public/javascript/data_loader.js b/public/javascript/data_loader.js
@@ -162,6 +162,7 @@ define(["THREE", "underscore", "assembly", "product", "shape", "annotation", "sh
         switch (filetype) {
             case "xml": req.contentType = "application/xml"; break;
             case "json": req.contentType = "application/json"; break;
+            case "tyson": req.contentType = "application/octet-stream"; break;
             default:
                 console.log("DataLoader.resolveUrl error - invalid content type: " + filetype);
         }
@@ -263,6 +264,10 @@ define(["THREE", "underscore", "assembly", "product", "shape", "annotation", "sh
                         shell = this._shells[event.data.id];
                         data = event.data.data;
                         break;
+                    case "application/octet-stream":
+                        shell = this._shells[event.data.id];
+                        data = event.data.data;
+                        break;
                     default:
                         console.log("Blahhlal - What the hell is this?");
                 }
@@ -551,11 +556,15 @@ define(["THREE", "underscore", "assembly", "product", "shape", "annotation", "sh
         this._viewer.add3DObject(rootProduct.getObject3D(), 'geometry');
         this._viewer.add3DObject(rootProduct.getOverlay3D(), 'overlay');
         this._viewer.add3DObject(rootProduct.getAnnotation3D(), 'annotation');
+        var batchExtension = '.json'
+        if (doc.useTyson){
+            batchExtension = '.tyson';
+        }
         // Do we have batches
         if (doc.batches && doc.batches > 0) {
             for (var i = 0; i < doc.batches; i++) {
                 this.addRequest({
-                    url: req.base + "batch" + i + ".json",
+                    url: req.base + "batch" + i + batchExtension,
                     validateType: "batch"
                 });
             }