From 9f6a7399ebbd98cd2c713a24f7acebf4d63bd76e Mon Sep 17 00:00:00 2001 From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com> Date: Wed, 15 Feb 2023 22:09:56 -0500 Subject: [PATCH] Beacons decommission This remove the codes to support the old Beacons system. --- scripts/system/places/places.html | 10 +---- scripts/system/places/places.js | 65 +------------------------------ 2 files changed, 3 insertions(+), 72 deletions(-) diff --git a/scripts/system/places/places.html b/scripts/system/places/places.html index 1fa208ecde..5ac0357c1c 100644 --- a/scripts/system/places/places.html +++ b/scripts/system/places/places.html @@ -414,8 +414,6 @@ moreStyle = " style='background-image: url(" + placeRecords[i].thumbnail + "); background-repeat: no-repeat; background-position: 50% 50%; background-size: cover;'"; } else if (placeRecords[i].category === "Z") { moreStyle = " style='background-color: #364a6e;'"; - } else if (placeRecords[i].category === "U") { //TO REMOVE ONCE BEACONS GET REMOVED - moreStyle = " style='background-color: #38130f;'"; } var shortenedDescription = placeRecords[i].description.substr(0, 55); @@ -424,9 +422,7 @@ } var placeUrl = "hifi://" + placeRecords[i].name; - if (placeRecords[i].category === "U") { //TO REMOVE ONCE BEACONS GET REMOVED - placeUrl = placeRecords[i].address; - } else if (placeRecords[i].metaverseRegion !== "local") { + if (placeRecords[i].metaverseRegion !== "local") { placeUrl = "hifi://" + placeRecords[i].address; } @@ -730,9 +726,7 @@ document.getElementById("placeDetail-description").innerHTML = placeDetail.description; var placeUrl = "hifi://" + placeDetail.name; - if (placeDetail.category === "U") { //TO REMOVE ONCE BEACONS GET REMOVED - placeUrl = placeDetail.address; - } else if (placeDetail.metaverseRegion !== "local") { + if (placeDetail.metaverseRegion !== "local") { placeUrl = "hifi://" + placeDetail.address; } document.getElementById("placeDetail-visitBtn-container").innerHTML = ""; diff --git a/scripts/system/places/places.js b/scripts/system/places/places.js index 10ff431e15..bfb111c4da 100644 --- a/scripts/system/places/places.js +++ b/scripts/system/places/places.js @@ -199,10 +199,6 @@ } } - //################### TO REMOVED ONCE NO MORE USED ##################### - getDeprecatedBeaconsData(); - //################### END: TO REMOVED ONCE NO MORE USED ##################### - addUtilityPortals(); portalList.sort(sortOrder); @@ -312,7 +308,7 @@ "pinned": true, "order": "Z" }; - metaverseServers.push(metaverse); + metaverseServers.push(metaverse); } } @@ -403,65 +399,6 @@ } - //################### CODE TO REMOVED ONCE NO MORE USED ##################### - function getDeprecatedBeaconsData() { - var url = "https://metaverse.vircadia.com/interim/d-goto/app/goto.json"; - httpRequest = new XMLHttpRequest(); - httpRequest.open("GET", url, false); // false for synchronous request - httpRequest.send( null ); - var extractedData = httpRequest.responseText; - - httpRequest = null; - - var places; - try { - places = JSON.parse(extractedData); - } catch(e) { - places = {}; - } - - for (var i = 0;i < places.length; i++) { - - var category, accessStatus; - - var description = "..."; - var thumbnail = ""; - category = "U"; //uncertain - - if (places[i].People > 0) { - accessStatus = "LIFE"; - } else { - accessStatus = "NOBODY"; - } - - var shortenName = places[i]["Domain Name"].substr(0, 24); - - - var portal = { - "order": category + "_Z_" + getSeededRandomForString(places[i]["Domain Name"]), - "category": category, - "accessStatus": accessStatus, - "name": shortenName, - "description": description, - "thumbnail": thumbnail, - "maturity": "unrated", - "address": places[i].Visit, - "current_attendance": places[i].People, - "id": "BEACON" + i, - "visibility": "open", - "capacity": 0, - "tags": "", - "managers": places[i].Owner, - "domain": "UNKNOWN (Beacon)", - "domainOrder": "ZZZZZZZZZZZZZUA", - "metaverseServer": "", - "metaverseRegion": "external" - }; - portalList.push(portal); - } - } - //################### END::: CODE TO REMOVED ONCE NO MORE USED ##################### - function addUtilityPortals() { var localHostPortal = { "order": "Z_Z_AAAAAA",