Merge branch 'feature/JAL-3187linkedFeatures' into feature/JAL-3251biotypedMappings

[jalview.git] / src / jalview / io / gff / ExonerateHelper.java

diff --git a/src/jalview/io/gff/ExonerateHelper.java b/src/jalview/io/gff/ExonerateHelper.java
index 873fd27..303a5ac 100644 (file)
--- a/src/jalview/io/gff/ExonerateHelper.java
+++ b/src/jalview/io/gff/ExonerateHelper.java
@@ -164,8 +164,8 @@ public class ExonerateHelper extends Gff2Helper
      */
     SequenceI mapFromSequence = seq;
     SequenceI mapToSequence = mappedSequence;
-    if ((type == MappingType.NucleotideToPeptide && featureIsOnTarget)
-            || (type == MappingType.PeptideToNucleotide && !featureIsOnTarget))
+    if ((MappingType.isDnaToPeptide(type) && featureIsOnTarget)
+            || (MappingType.isPeptideToDna(type) && !featureIsOnTarget))
     {
       mapFromSequence = mappedSequence;
       mapToSequence = seq;
@@ -267,8 +267,8 @@ public class ExonerateHelper extends Gff2Helper
     {
       fromStart = alignToStart;
       toStart = alignFromStart;
-      toEnd = forwardStrand ? toStart + alignCount - 1 : toStart
-              - (alignCount - 1);
+      toEnd = forwardStrand ? toStart + alignCount - 1
+              : toStart - (alignCount - 1);
       int toLength = Math.abs(toEnd - toStart) + 1;
       int fromLength = toLength * type.getFromRatio() / type.getToRatio();
       fromEnd = fromStart + fromLength - 1;
@@ -298,7 +298,7 @@ public class ExonerateHelper extends Gff2Helper
   }
 
   /**
-   * Returns a MappingType depending on the exonerate 'model' value.
+   * Returns a MappingType depending on the exonerate 'model' value
    * 
    * @param model
    * @return
@@ -307,14 +307,25 @@ public class ExonerateHelper extends Gff2Helper
   {
     MappingType result = null;
 
-    if (model.contains(PROTEIN2DNA) || model.contains(PROTEIN2GENOME))
+    if (model.contains(PROTEIN2GENOME))
     {
-      result = MappingType.PeptideToNucleotide;
+      result = MappingType.PeptideToGenome;
     }
-    else if (model.contains(CODING2CODING) || model.contains(CODING2GENOME)
-            || model.contains(CDNA2GENOME) || model.contains(GENOME2GENOME))
+    else if (model.contains(PROTEIN2DNA))
     {
-      result = MappingType.NucleotideToNucleotide;
+      result = MappingType.PeptideToCds;
+    }
+    else if (model.contains(CODING2GENOME))
+    {
+      result = MappingType.CdsToGenome;
+    }
+    else if (model.contains(CDNA2GENOME))
+    {
+      result = MappingType.CdnaToGenome;
+    }
+    else if (model.contains(CODING2CODING) || model.contains(GENOME2GENOME))
+    {
+      result = MappingType.GenomeToCdna;
     }
     return result;
   }