diff options
Diffstat (limited to 'expression-test/expression_test_parser.cpp')
| -rw-r--r-- | expression-test/expression_test_parser.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/expression-test/expression_test_parser.cpp b/expression-test/expression_test_parser.cpp index 0d414cc2c0..9edc3b9866 100644 --- a/expression-test/expression_test_parser.cpp +++ b/expression-test/expression_test_parser.cpp @@ -259,14 +259,13 @@ bool parseInputs(const JSValue& inputsValue, TestData& data) { // Parse canonicalID optional<CanonicalTileID> canonical; if (evaluationContext.HasMember("canonicalID")) { - assert(evaluationContext["canonicalID"].IsObject()); - assert( - evaluationContext["canonicalID"].HasMember("z") && evaluationContext["canonicalID"]["z"].IsNumber() && - evaluationContext["canonicalID"].HasMember("x") && evaluationContext["canonicalID"]["x"].IsNumber() && - evaluationContext["canonicalID"].HasMember("y") && evaluationContext["canonicalID"]["y"].IsNumber()); - canonical = CanonicalTileID(evaluationContext["canonicalID"]["z"].GetUint(), - evaluationContext["canonicalID"]["x"].GetUint(), - evaluationContext["canonicalID"]["y"].GetUint()); + const auto& canonicalIDObject = evaluationContext["canonicalID"]; + assert(canonicalIDObject.IsObject()); + assert(canonicalIDObject.HasMember("z") && canonicalIDObject["z"].IsNumber()); + assert(canonicalIDObject.HasMember("x") && canonicalIDObject["x"].IsNumber()); + assert(canonicalIDObject.HasMember("y") && canonicalIDObject["y"].IsNumber()); + canonical = CanonicalTileID( + canonicalIDObject["z"].GetUint(), canonicalIDObject["x"].GetUint(), canonicalIDObject["y"].GetUint()); } // Parse availableImages |