Merge branch 'master' of https://github.com/GMOD/Apollo

GMOD · Feb 11, 2019 · 9eba6bb · 9eba6bb
2 parents 35662d4 + 07f4589
commit 9eba6bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/client/apollo/js/JSONUtils.js b/client/apollo/js/JSONUtils.js
@@ -297,6 +297,7 @@ JSONUtils.generateSubFeaturesFromCigar = function(feature){
 *    currently, for features with lazy-loaded children, ignores children
 */
 JSONUtils.createApolloFeature = function( jfeature, specified_type, useName, specified_subtype )   {
+    console.log('creating apollo feature',jfeature);
     var diagnose =  (JSONUtils.verbose_conversion && jfeature.children() && jfeature.children().length > 0);
     if (diagnose)  {
         console.log("converting JBrowse feature to Apollo feture, specified type: " + specified_type);

diff --git a/client/apollo/js/View/Track/AnnotTrack.js b/client/apollo/js/View/Track/AnnotTrack.js
@@ -1100,6 +1100,7 @@ define([
                     var keys = Object.keys(parentFeatures);
                     var singleParent = keys.length === 1;
                     var featureToAdd;
+                    console.log('preccing new feature',parentFeatures)
                     if (singleParent) {
                         featureToAdd = JSONUtils.makeSimpleFeature(parentFeatures[keys[0]]);
                     }
@@ -1169,6 +1170,7 @@ define([
                     }
 
                     var afeat ;
+                    featureToAdd = JSONUtils.handleCigarSubFeatures(featureToAdd,biotype);
                     if(biotype === 'mRNA'){
                         featureToAdd = JSONUtils.handleCigarSubFeatures(featureToAdd,biotype);
                         afeat = JSONUtils.createApolloFeature(featureToAdd, biotype, true);