git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Jalview-JS/JAL-3253-applet also comments relating to JAL-3268
[jalview.git]
/
src
/
jalview
/
ext
/
ensembl
/
EnsemblGene.java
diff --git
a/src/jalview/ext/ensembl/EnsemblGene.java
b/src/jalview/ext/ensembl/EnsemblGene.java
index
11322c8
..
63a6a6c
100644
(file)
--- a/
src/jalview/ext/ensembl/EnsemblGene.java
+++ b/
src/jalview/ext/ensembl/EnsemblGene.java
@@
-34,6
+34,7
@@
import jalview.io.gff.SequenceOntologyI;
import jalview.schemes.FeatureColour;
import jalview.schemes.FeatureSettingsAdapter;
import jalview.util.MapList;
import jalview.schemes.FeatureColour;
import jalview.schemes.FeatureSettingsAdapter;
import jalview.util.MapList;
+import jalview.util.Platform;
import java.awt.Color;
import java.io.UnsupportedEncodingException;
import java.awt.Color;
import java.io.UnsupportedEncodingException;
@@
-51,13
+52,11
@@
import com.stevesoft.pat.Regex;
*/
public class EnsemblGene extends EnsemblSeqProxy
{
*/
public class EnsemblGene extends EnsemblSeqProxy
{
- private static final String GENE_PREFIX = "gene:";
-
/*
* accepts anything as we will attempt lookup of gene or
* transcript id or gene name
*/
/*
* accepts anything as we will attempt lookup of gene or
* transcript id or gene name
*/
- private static final Regex ACCESSION_REGEX = new Regex(".*");
+ private static Regex ACCESSION_REGEX;
private static final EnsemblFeatureType[] FEATURES_TO_FETCH = {
EnsemblFeatureType.gene, EnsemblFeatureType.transcript,
private static final EnsemblFeatureType[] FEATURES_TO_FETCH = {
EnsemblFeatureType.gene, EnsemblFeatureType.transcript,
@@
-100,6
+99,12
@@
public class EnsemblGene extends EnsemblSeqProxy
return EnsemblSeqType.GENOMIC;
}
return EnsemblSeqType.GENOMIC;
}
+ @Override
+ protected String getObjectType()
+ {
+ return OBJECT_TYPE_GENE;
+ }
+
/**
* Returns an alignment containing the gene(s) for the given gene or
* transcript identifier, or external identifier (e.g. Uniprot id). If given a
/**
* Returns an alignment containing the gene(s) for the given gene or
* transcript identifier, or external identifier (e.g. Uniprot id). If given a
@@
-134,7
+139,6
@@
public class EnsemblGene extends EnsemblSeqProxy
* convert to a non-duplicated list of gene identifiers
*/
List<String> geneIds = getGeneIds(query);
* convert to a non-duplicated list of gene identifiers
*/
List<String> geneIds = getGeneIds(query);
-
AlignmentI al = null;
for (String geneId : geneIds)
{
AlignmentI al = null;
for (String geneId : geneIds)
{
@@
-149,6
+153,8
@@
public class EnsemblGene extends EnsemblSeqProxy
if (geneAlignment.getHeight() == 1)
{
if (geneAlignment.getHeight() == 1)
{
+ // ensure id has 'correct' case for the Ensembl identifier
+ geneId = geneAlignment.getSequenceAt(0).getName();
findGeneLoci(geneAlignment.getSequenceAt(0), geneId);
getTranscripts(geneAlignment, geneId);
}
findGeneLoci(geneAlignment.getSequenceAt(0), geneId);
getTranscripts(geneAlignment, geneId);
}
@@
-166,25
+172,25
@@
public class EnsemblGene extends EnsemblSeqProxy
/**
* Calls the /lookup/id REST service, parses the response for gene
/**
* Calls the /lookup/id REST service, parses the response for gene
- * coordinates, and if successful, adds these to the sequence
+ * coordinates, and if successful, adds these to the sequence. If this fails,
+ * fall back on trying to parse the sequence description in case it is in
+ * Ensembl-gene format e.g. chromosome:GRCh38:17:45051610:45109016:1.
*
* @param seq
* @param geneId
*/
void findGeneLoci(SequenceI seq, String geneId)
{
*
* @param seq
* @param geneId
*/
void findGeneLoci(SequenceI seq, String geneId)
{
- /*
- * if sequence description is in gene loci format, parse this
- * - but try remote lookup anyway as 'better' if available
- */
- parseChromosomeLocations(seq);
-
GeneLociI geneLoci = new EnsemblLookup(getDomain()).getGeneLoci(geneId);
if (geneLoci != null)
{
seq.setGeneLoci(geneLoci.getSpeciesId(), geneLoci.getAssemblyId(),
geneLoci.getChromosomeId(), geneLoci.getMap());
}
GeneLociI geneLoci = new EnsemblLookup(getDomain()).getGeneLoci(geneId);
if (geneLoci != null)
{
seq.setGeneLoci(geneLoci.getSpeciesId(), geneLoci.getAssemblyId(),
geneLoci.getChromosomeId(), geneLoci.getMap());
}
+ else
+ {
+ parseChromosomeLocations(seq);
+ }
}
/**
}
/**
@@
-235,7
+241,7
@@
public class EnsemblGene extends EnsemblSeqProxy
*/
List<String> getGeneIds(String accessions)
{
*/
List<String> getGeneIds(String accessions)
{
- List<String> geneIds = new ArrayList<String>();
+ List<String> geneIds = new ArrayList<>();
for (String acc : accessions.split(getAccessionSeparator()))
{
for (String acc : accessions.split(getAccessionSeparator()))
{
@@
-358,7
+364,7
@@
public class EnsemblGene extends EnsemblSeqProxy
* look for exon features of the transcript, failing that for CDS
* (for example ENSG00000124610 has 1 CDS but no exon features)
*/
* look for exon features of the transcript, failing that for CDS
* (for example ENSG00000124610 has 1 CDS but no exon features)
*/
- String parentId = "transcript:" + accId;
+ String parentId = accId;
List<SequenceFeature> splices = findFeatures(gene,
SequenceOntologyI.EXON, parentId);
if (splices.isEmpty())
List<SequenceFeature> splices = findFeatures(gene,
SequenceOntologyI.EXON, parentId);
if (splices.isEmpty())
@@
-370,7
+376,7
@@
public class EnsemblGene extends EnsemblSeqProxy
int transcriptLength = 0;
final char[] geneChars = gene.getSequence();
int offset = gene.getStart(); // to convert to 0-based positions
int transcriptLength = 0;
final char[] geneChars = gene.getSequence();
int offset = gene.getStart(); // to convert to 0-based positions
- List<int[]> mappedFrom = new ArrayList<int[]>();
+ List<int[]> mappedFrom = new ArrayList<>();
for (SequenceFeature sf : splices)
{
for (SequenceFeature sf : splices)
{
@@
-389,7
+395,7
@@
public class EnsemblGene extends EnsemblSeqProxy
* Ensembl has gene name as transcript Name
* EnsemblGenomes doesn't, but has a url-encoded description field
*/
* Ensembl has gene name as transcript Name
* EnsemblGenomes doesn't, but has a url-encoded description field
*/
- String description = (String) transcriptFeature.getValue(NAME);
+ String description = transcriptFeature.getDescription();
if (description == null)
{
description = (String) transcriptFeature.getValue(DESCRIPTION);
if (description == null)
{
description = (String) transcriptFeature.getValue(DESCRIPTION);
@@
-412,7
+418,7
@@
public class EnsemblGene extends EnsemblSeqProxy
* transfer features to the new sequence; we use EnsemblCdna to do this,
* to filter out unwanted features types (see method retainFeature)
*/
* transfer features to the new sequence; we use EnsemblCdna to do this,
* to filter out unwanted features types (see method retainFeature)
*/
- List<int[]> mapTo = new ArrayList<int[]>();
+ List<int[]> mapTo = new ArrayList<>();
mapTo.add(new int[] { 1, transcriptLength });
MapList mapping = new MapList(mappedFrom, mapTo, 1, 1);
EnsemblCdna cdna = new EnsemblCdna(getDomain());
mapTo.add(new int[] { 1, transcriptLength });
MapList mapping = new MapList(mappedFrom, mapTo, 1, 1);
EnsemblCdna cdna = new EnsemblCdna(getDomain());
@@
-478,7
+484,7
@@
public class EnsemblGene extends EnsemblSeqProxy
*/
protected String getTranscriptId(SequenceFeature feature)
{
*/
protected String getTranscriptId(SequenceFeature feature)
{
- return (String) feature.getValue("transcript_id");
+ return (String) feature.getValue(JSON_ID);
}
/**
}
/**
@@
-498,9
+504,9
@@
public class EnsemblGene extends EnsemblSeqProxy
protected List<SequenceFeature> getTranscriptFeatures(String accId,
SequenceI geneSequence)
{
protected List<SequenceFeature> getTranscriptFeatures(String accId,
SequenceI geneSequence)
{
- List<SequenceFeature> transcriptFeatures = new ArrayList<SequenceFeature>();
+ List<SequenceFeature> transcriptFeatures = new ArrayList<>();
- String parentIdentifier = GENE_PREFIX + accId;
+ String parentIdentifier = accId;
List<SequenceFeature> sfs = geneSequence.getFeatures()
.getFeaturesByOntology(SequenceOntologyI.TRANSCRIPT);
List<SequenceFeature> sfs = geneSequence.getFeatures()
.getFeaturesByOntology(SequenceOntologyI.TRANSCRIPT);
@@
-510,7
+516,7
@@
public class EnsemblGene extends EnsemblSeqProxy
for (SequenceFeature sf : sfs)
{
String parent = (String) sf.getValue(PARENT);
for (SequenceFeature sf : sfs)
{
String parent = (String) sf.getValue(PARENT);
- if (parentIdentifier.equals(parent))
+ if (parentIdentifier.equalsIgnoreCase(parent))
{
transcriptFeatures.add(sf);
}
{
transcriptFeatures.add(sf);
}
@@
-531,29
+537,34
@@
public class EnsemblGene extends EnsemblSeqProxy
@Override
public String getTestQuery()
{
@Override
public String getTestQuery()
{
- return "ENSG00000157764"; // BRAF, 5 transcripts, reverse strand
+ return Platform.isJS() ? "ENSG00000123569" : "ENSG00000157764";
+ // ENSG00000123569 // H2BFWT histone, 2 transcripts, reverse strand
+ // ENSG00000157764 // BRAF, 5 transcripts, reverse strand
// ENSG00000090266 // NDUFB2, 15 transcripts, forward strand
// ENSG00000101812 // H2BFM histone, 3 transcripts, forward strand
// ENSG00000090266 // NDUFB2, 15 transcripts, forward strand
// ENSG00000101812 // H2BFM histone, 3 transcripts, forward strand
- // ENSG00000123569 // H2BFWT histone, 2 transcripts, reverse strand
}
/**
}
/**
- * Answers true for a feature of type 'gene' (or a sub-type of gene in the
- * Sequence Ontology), whose ID is the accession we are retrieving
+ * Answers a list of sequence features (if any) whose type is 'gene' (or a
+ * subtype of gene in the Sequence Ontology), and whose ID is the accession we
+ * are retrieving
*/
@Override
*/
@Override
- protected boolean identifiesSequence(SequenceFeature sf, String accId)
+ protected List<SequenceFeature> getIdentifyingFeatures(SequenceI seq,
+ String accId)
{
{
- if (SequenceOntologyFactory.getInstance().isA(sf.getType(),
- SequenceOntologyI.GENE))
+ List<SequenceFeature> result = new ArrayList<>();
+ List<SequenceFeature> sfs = seq.getFeatures()
+ .getFeaturesByOntology(SequenceOntologyI.GENE);
+ for (SequenceFeature sf : sfs)
{
{
- String id = (String) sf.getValue(ID);
- if ((GENE_PREFIX + accId).equals(id))
+ String id = (String) sf.getValue(JSON_ID);
+ if (accId.equalsIgnoreCase(id))
{
{
- return true;
+ result.add(sf);
}
}
}
}
- return false;
+ return result;
}
/**
}
/**
@@
-566,7
+577,7
@@
public class EnsemblGene extends EnsemblSeqProxy
@Override
protected boolean retainFeature(SequenceFeature sf, String accessionId)
{
@Override
protected boolean retainFeature(SequenceFeature sf, String accessionId)
{
- SequenceOntologyI so = SequenceOntologyFactory.getInstance();
+ SequenceOntologyI so = SequenceOntologyFactory.getSequenceOntology();
String type = sf.getType();
if (so.isA(type, SequenceOntologyI.GENE))
{
String type = sf.getType();
if (so.isA(type, SequenceOntologyI.GENE))
{
@@
-575,7
+586,7
@@
public class EnsemblGene extends EnsemblSeqProxy
if (isTranscript(type))
{
String parent = (String) sf.getValue(PARENT);
if (isTranscript(type))
{
String parent = (String) sf.getValue(PARENT);
- if (!(GENE_PREFIX + accessionId).equals(parent))
+ if (!accessionId.equalsIgnoreCase(parent))
{
return false;
}
{
return false;
}
@@
-584,17
+595,6
@@
public class EnsemblGene extends EnsemblSeqProxy
}
/**
}
/**
- * Answers false. This allows an optimisation - a single 'gene' feature is all
- * that is needed to identify the positions of the gene on the genomic
- * sequence.
- */
- @Override
- protected boolean isSpliceable()
- {
- return false;
- }
-
- /**
* Override to do nothing as Ensembl doesn't return a protein sequence for a
* gene identifier
*/
* Override to do nothing as Ensembl doesn't return a protein sequence for a
* gene identifier
*/
@@
-606,6
+606,10
@@
public class EnsemblGene extends EnsemblSeqProxy
@Override
public Regex getAccessionValidator()
{
@Override
public Regex getAccessionValidator()
{
+ if (ACCESSION_REGEX == null)
+ {
+ ACCESSION_REGEX = Platform.newRegex(".*", null);
+ }
return ACCESSION_REGEX;
}
return ACCESSION_REGEX;
}
@@
-624,7
+628,7
@@
public class EnsemblGene extends EnsemblSeqProxy
{
return new FeatureSettingsAdapter()
{
{
return new FeatureSettingsAdapter()
{
- SequenceOntologyI so = SequenceOntologyFactory.getInstance();
+ SequenceOntologyI so = SequenceOntologyFactory.getSequenceOntology();
@Override
public boolean isFeatureDisplayed(String type)
@Override
public boolean isFeatureDisplayed(String type)