From 041a561dbcaa7280fd2c14ba2051b2add756ca6f Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Wed, 27 Feb 2019 17:27:25 -0800
Subject: [PATCH] Handcraft the JSON filter-object rather than parse a string

---
 assignment-client/src/avatars/AvatarMixer.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/assignment-client/src/avatars/AvatarMixer.cpp b/assignment-client/src/avatars/AvatarMixer.cpp
index e0f7ae59ee..67bc9b4cf7 100644
--- a/assignment-client/src/avatars/AvatarMixer.cpp
+++ b/assignment-client/src/avatars/AvatarMixer.cpp
@@ -958,21 +958,17 @@ void AvatarMixer::parseDomainServerSettings(const QJsonObject& domainSettings) {
 }
 
 void AvatarMixer::setupEntityQuery() {
-    static char queryJsonString[] = R"({"avatarPriority": true, "type": "Zone"})";
-
     _entityViewer.init();
     DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();
     DependencyManager::set<AssignmentParentFinder>(_entityViewer.getTree());
     _slaveSharedData.entityTree = _entityViewer.getTree();
 
-    QJsonParseError jsonParseError;
-    const QJsonDocument priorityZoneQuery(QJsonDocument::fromJson(queryJsonString, &jsonParseError));
-    if (jsonParseError.error != QJsonParseError::NoError) {
-        qCDebug(avatars) << "Error parsing:" << queryJsonString << " - " << jsonParseError.errorString();
-        return;
-    }
-    _entityViewer.getOctreeQuery().setJSONParameters(priorityZoneQuery.object());
+    // ES query: {"avatarPriority": true, "type": "Zone"}
+    QJsonObject priorityZoneQuery;
+    priorityZoneQuery["avatarPriority"] = true;
+    priorityZoneQuery["type"] = "Zone";
 
+    _entityViewer.getOctreeQuery().setJSONParameters(priorityZoneQuery);
 }
 
 void AvatarMixer::handleOctreePacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {