Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 04:57:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

handle new places API format in AddressManager

Browse source
This commit is contained in:
Stephen Birarda 2015-01-13 14:21:07 -08:00
parent 89dceefd2f
commit 1af87e57da
2 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
libraries/networking/src/AddressManager.cpp
View file

@ -22,7 +22,8 @@
#include "AddressManager.h" #include "AddressManager.h"
AddressManager::AddressManager() : AddressManager::AddressManager() :
_currentDomain(), _rootPlaceName(),
_rootPlaceID(),
_positionGetter(NULL), _positionGetter(NULL),
_orientationGetter(NULL) _orientationGetter(NULL)
{ {
@ -37,7 +38,7 @@ const QUrl AddressManager::currentAddress() const {
QUrl hifiURL; QUrl hifiURL;
hifiURL.setScheme(HIFI_URL_SCHEME); hifiURL.setScheme(HIFI_URL_SCHEME);
hifiURL.setHost(_currentDomain); hifiURL.setHost(_rootPlaceName);
hifiURL.setPath(currentPath()); hifiURL.setPath(currentPath());
return hifiURL; return hifiURL;
@ -174,15 +175,21 @@ void AddressManager::handleAPIResponse(QNetworkReply& requestReply) {
} }
void AddressManager::goToAddressFromObject(const QVariantMap& addressMap) { void AddressManager::goToAddressFromObject(const QVariantMap& addressMap) {
const QString ADDRESS_API_ROOT_KEY = "root";
const QString ADDRESS_API_DOMAIN_KEY = "domain"; const QString ADDRESS_API_DOMAIN_KEY = "domain";
const QString ADDRESS_API_ONLINE_KEY = "online"; const QString ADDRESS_API_ONLINE_KEY = "online";
if (!addressMap.contains(ADDRESS_API_ONLINE_KEY) if (!addressMap.contains(ADDRESS_API_ONLINE_KEY)
|| addressMap[ADDRESS_API_ONLINE_KEY].toBool()) { || addressMap[ADDRESS_API_ONLINE_KEY].toBool()) {
if (addressMap.contains(ADDRESS_API_DOMAIN_KEY)) { QVariantMap rootMap = addressMap[ADDRESS_API_ROOT_KEY].toMap();
QVariantMap domainObject = addressMap[ADDRESS_API_DOMAIN_KEY].toMap(); if (rootMap.isEmpty()) {
rootMap = addressMap;
}
QVariantMap domainObject = rootMap[ADDRESS_API_DOMAIN_KEY].toMap();
if (!domainObject.isEmpty()) {
const QString DOMAIN_NETWORK_ADDRESS_KEY = "network_address"; const QString DOMAIN_NETWORK_ADDRESS_KEY = "network_address";
const QString DOMAIN_ICE_SERVER_ADDRESS_KEY = "ice_server_address"; const QString DOMAIN_ICE_SERVER_ADDRESS_KEY = "ice_server_address";
@ -200,22 +207,22 @@ void AddressManager::goToAddressFromObject(const QVariantMap& addressMap) {
emit possibleDomainChangeRequiredViaICEForID(iceServerAddress, domainID); emit possibleDomainChangeRequiredViaICEForID(iceServerAddress, domainID);
} }
// set our current domain to the name that came back // set our current root place id to the ID that came back
const QString DOMAIN_NAME_KEY = "name"; const QString PLACE_ID_KEY = "id";
_rootPlaceID = rootMap[PLACE_ID_KEY].toUuid();
_currentDomain = domainObject[DOMAIN_NAME_KEY].toString(); // set our current root place name to the name that came back
const QString PLACE_NAME_KEY = "name";
_rootPlaceName = rootMap[PLACE_NAME_KEY].toString();
// take the path that came back // take the path that came back
const QString LOCATION_KEY = "location"; const QString PLACE_PATH_KEY = "path";
const QString LOCATION_PATH_KEY = "path";
QString returnedPath; QString returnedPath;
if (domainObject.contains(LOCATION_PATH_KEY)) { if (addressMap.contains(PLACE_PATH_KEY) && !addressMap[PLACE_PATH_KEY].toString().isEmpty()) {
returnedPath = domainObject[LOCATION_PATH_KEY].toString(); returnedPath = addressMap[PLACE_PATH_KEY].toString();
} else if (domainObject.contains(LOCATION_KEY)) { } else if (rootMap.contains(PLACE_PATH_KEY) && !rootMap[PLACE_PATH_KEY].toString().isEmpty()) {
returnedPath = domainObject[LOCATION_KEY].toMap()[LOCATION_PATH_KEY].toString(); returnedPath = rootMap[PLACE_PATH_KEY].toString();
} else if (addressMap.contains(LOCATION_PATH_KEY)) {
returnedPath = addressMap[LOCATION_PATH_KEY].toString();
} }
bool shouldFaceViewpoint = addressMap.contains(ADDRESS_API_ONLINE_KEY); bool shouldFaceViewpoint = addressMap.contains(ADDRESS_API_ONLINE_KEY);

3
libraries/networking/src/AddressManager.h
View file

@ -85,7 +85,8 @@ private:
bool handleRelativeViewpoint(const QString& pathSubsection, bool shouldFace = false); bool handleRelativeViewpoint(const QString& pathSubsection, bool shouldFace = false);
bool handleUsername(const QString& lookupString); bool handleUsername(const QString& lookupString);
QString _currentDomain; QString _rootPlaceName;
QUuid _rootPlaceID;
PositionGetter _positionGetter; PositionGetter _positionGetter;
OrientationGetter _orientationGetter; OrientationGetter _orientationGetter;
}; };