diff --git a/js/genome/genomeUtils.js b/js/genome/genomeUtils.js index 602f89d0d..6eb7d9ebc 100644 --- a/js/genome/genomeUtils.js +++ b/js/genome/genomeUtils.js @@ -3,7 +3,6 @@ import {convertToHubURL} from "../ucsc/ucscUtils.js" import Hub from "../ucsc/ucscHub.js" const DEFAULT_GENOMES_URL = "https://igv.org/genomes/genomes.json" -const BACKUP_GENOMES_URL = "https://s3.amazonaws.com/igv.org.genomes/genomes.json" const GenomeUtils = { @@ -15,21 +14,9 @@ const GenomeUtils = { // Get default genomes if (config.loadDefaultGenomes !== false) { - try { - const url = DEFAULT_GENOMES_URL - const jsonArray = await igvxhr.loadJson(url, {timeout: 5000}) - processJson(jsonArray) - } catch (e) { - console.error(e) - try { - const url = BACKUP_GENOMES_URL - const jsonArray = await igvxhr.loadJson(url, {}) - processJson(jsonArray) - } catch (e) { - console.error(e) - console.warn("Errors loading default genome definitions.") - } - } + const url = DEFAULT_GENOMES_URL + const jsonArray = await igvxhr.loadJson(url, {timeout: 5000}) + processJson(jsonArray) } // Add user-defined genomes @@ -41,6 +28,8 @@ const GenomeUtils = { } else { processJson(genomeList) } + } else { + } GenomeUtils.KNOWN_GENOMES = table @@ -94,7 +83,7 @@ const GenomeUtils = { } } - if(!reference) { + if (!reference) { alert.present(new Error(`Unknown genome id: ${genomeID}`), undefined) } } @@ -106,5 +95,4 @@ const GenomeUtils = { } - export default GenomeUtils