repairs for new location lookup

Stephen Birarda committed 12 years ago

Commit 74295a31 parent 745edb84 files · +31 −25Browse files

Showing the changes to interface/src/UserLocationsModel.cpp (1 of 4 files). Show all

Unified · Split

interface/src/UserLocationsModel.cpp+23−18

 #include "Application.h"
 #include "UserLocationsModel.h"
-static const QString PLACES_GET = "/api/v1/places";
+static const QString LOCATIONS_GET = "/api/v1/locations";
-static const QString PLACES_UPDATE = "/api/v1/places/%1";
+static const QString LOCATION_UPDATE_OR_DELETE = "/api/v1/locations/%1";
-static const QString PLACES_DELETE= "/api/v1/places/%1";
-UserLocation::UserLocation(QString id, QString name, QString location) :
+UserLocation::UserLocation(const QString& id, const QString& name, const QString& address) :
     _id(id),
     _name(name),
-    _location(location),
+    _address(address),
     _previousName(name),
     _updating(false) {
 }
         _updating = true;
         JSONCallbackParameters callbackParams(this, "handleRenameResponse", this, "handleRenameError");
         QJsonObject jsonNameObject;
-        jsonNameObject.insert("name", QJsonValue(newName));
+        jsonNameObject.insert("name", newName);
+        QJsonObject locationObject;
+        locationObject.insert("location", jsonNameObject);
         QJsonDocument jsonDocument(jsonNameObject);
-        AccountManager::getInstance().authenticatedRequest(PLACES_UPDATE.arg(_id),
+        AccountManager::getInstance().authenticatedRequest(LOCATION_UPDATE_OR_DELETE.arg(_id),
                                                            QNetworkAccessManager::PutOperation,
                                                            callbackParams,
                                                            jsonDocument.toJson());
     QJsonValue status = responseData["status"];
     if (!status.isUndefined() && status.toString() == "success") {
-        QString updatedName = responseData["data"].toObject()["name"].toString();
+        qDebug() << responseData;
+        QString updatedName = responseData["data"].toObject()["location"].toObject()["name"].toString();
+        qDebug() << "The updated name is" << updatedName;
         _name = updatedName;
     } else {
         _name = _previousName;
         _updating = true;
         JSONCallbackParameters callbackParams(this, "handleDeleteResponse", this, "handleDeleteError");
-        AccountManager::getInstance().authenticatedRequest(PLACES_DELETE.arg(_id),
+        AccountManager::getInstance().authenticatedRequest(LOCATION_UPDATE_OR_DELETE.arg(_id),
                                                            QNetworkAccessManager::DeleteOperation,
                                                            callbackParams);
     }
         endResetModel();
         JSONCallbackParameters callbackParams(this, "handleLocationsResponse");
-        AccountManager::getInstance().authenticatedRequest(PLACES_GET,
+        AccountManager::getInstance().authenticatedRequest(LOCATIONS_GET,
                                                            QNetworkAccessManager::GetOperation,
                                                            callbackParams);
     }
     QJsonValue status = responseData["status"];
     if (!status.isUndefined() && status.toString() == "success") {
         beginResetModel();
-        QJsonArray locations = responseData["data"].toObject()["places"].toArray();
+        QJsonArray locations = responseData["data"].toObject()["locations"].toArray();
         for (QJsonArray::const_iterator it = locations.constBegin(); it != locations.constEnd(); it++) {
             QJsonObject location = (*it).toObject();
-            QJsonObject address = location["address"].toObject();
+            QString locationAddress = "hifi://" + location["domain"].toObject()["name"].toString()
+                + location["path"].toString();
             UserLocation* userLocation = new UserLocation(location["id"].toString(), location["name"].toString(),
-                              "hifi://" + address["domain"].toString()
+                                                          locationAddress);
-                              + "/" + address["position"].toString()
-                              + "/" + address["orientation"].toString());
             _locations.append(userLocation);
             connect(userLocation, &UserLocation::deleted, this, &UserLocationsModel::removeLocation);
             connect(userLocation, &UserLocation::updated, this, &UserLocationsModel::update);
             return QVariant();
         } else if (index.column() == NameColumn) {
             return _locations[index.row()]->name();
-        } else if (index.column() == LocationColumn) {
+        } else if (index.column() == AddressColumn) {
-            return QVariant(_locations[index.row()]->location());
+            return QVariant(_locations[index.row()]->address());
         }
     }
     if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
         switch (section) {
             case NameColumn: return "Name";
-            case LocationColumn: return "Location";
+            case AddressColumn: return "Address";
             default: return QVariant();
         }
     }

repairs for new location lookup

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code