diff --git a/assets/download/butter.apk b/assets/download/butter.apk deleted file mode 100644 index 69d7d93..0000000 Binary files a/assets/download/butter.apk and /dev/null differ diff --git a/assets/js/maps.js b/assets/js/maps.js index 3b1b0b0..2c9a3dd 100644 --- a/assets/js/maps.js +++ b/assets/js/maps.js @@ -1,7 +1,9 @@ // Checks to see what map files exist at /usb-butter/osm-map-files/ and displays them // using the template hidden in the page -OSM_PACKAGE = "net.osmand"; +// APKs which would be acceptable to link to in the instructions +// for installing maps/OSMAnd. The first one found will be used. +OSM_PACKAGES = ["net.osmand", "net.osmand.plus"]; const getMaps = async (folder_href) => { async function populateSpan(response) { @@ -53,18 +55,21 @@ const getOsm = async () => { json_url = repoRoot + 'index-v1.json'; const response = fetch(json_url).then(async (response) => { const ix = await response.json(); - if (ix.packages && ix.packages[OSM_PACKAGE] && ix.packages[OSM_PACKAGE].length > 0) { - const button = document.getElementById('osm-dl-button'); - const links = button.querySelectorAll('a'); - const apkName = ix.packages[OSM_PACKAGE][0]['apkName']; - const size = ix.packages[OSM_PACKAGE][0]['size']; - const sizeInMB = Math.floor(size / 1024 / 1024); - for (let link of links) { - link.href = repoRoot + apkName; + for (let package of OSM_PACKAGES) { + if (ix.packages && ix.packages[package] && ix.packages[package].length > 0) { + const button = document.getElementById('osm-dl-button'); + const links = button.querySelectorAll('a'); + const apkName = ix.packages[package][0]['apkName']; + const size = ix.packages[package][0]['size']; + const sizeInMB = Math.floor(size / 1024 / 1024); + for (let link of links) { + link.href = repoRoot + apkName; + } + const cta = button.querySelector('.button-sub-text'); + cta.textContent = `${sizeInMB} MB`; + button.classList.remove('hidden'); + break; } - const cta = button.querySelector('.button-sub-text'); - cta.textContent = `${sizeInMB} MB`; - button.classList.remove('hidden'); } }); }