[render-test] Add support for feature state APIs

This commit is contained in:
Juha Alanen
2019-08-26 18:01:34 +03:00
committed by Juha Alanen
parent 97c4f13bec
commit 045018905b

View File

@@ -15,6 +15,7 @@
#include <mbgl/util/run_loop.hpp>
#include <mbgl/util/string.hpp>
#include <mbgl/util/timer.hpp>
#include <mbgl/renderer/renderer.hpp>
#include <mapbox/pixelmatch.hpp>
@@ -197,6 +198,9 @@ bool TestRunner::runOperations(const std::string& key, TestMetadata& metadata) {
static const std::string memoryProbeOp("probeMemory");
static const std::string memoryProbeStartOp("probeMemoryStart");
static const std::string memoryProbeEndOp("probeMemoryEnd");
static const std::string setFeatureStateOp("setFeatureState");
static const std::string getFeatureStateOp("getFeatureState");
static const std::string removeFeatureStateOp("removeFeatureState");
// wait
if (operationArray[0].GetString() == waitOp) {
@@ -453,6 +457,140 @@ bool TestRunner::runOperations(const std::string& key, TestMetadata& metadata) {
assert(AllocationIndex::isActive());
AllocationIndex::setActive(false);
AllocationIndex::reset();
// setFeatureState
} else if (operationArray[0].GetString() == setFeatureStateOp) {
assert(operationArray.Size() >= 3u);
assert(operationArray[1].IsObject());
assert(operationArray[2].IsObject());
using namespace mbgl;
using namespace mbgl::style::conversion;
std::string sourceID;
mbgl::optional<std::string> sourceLayer;
std::string featureID;
std::string stateKey;
Value stateValue;
bool valueParsed = false;
FeatureState parsedState;
const auto& featureOptions = operationArray[1].GetObject();
if (featureOptions.HasMember("source")) {
sourceID = featureOptions["source"].GetString();
}
if (featureOptions.HasMember("sourceLayer")) {
sourceLayer = { featureOptions["sourceLayer"].GetString() };
}
if (featureOptions.HasMember("id")) {
featureID = featureOptions["id"].GetString();
}
const JSValue* state = &operationArray[2];
const std::function<optional<Error> (const std::string&, const Convertible&)> convertFn = [&] (const std::string& k, const Convertible& v) -> optional<Error> {
optional<Value> value = toValue(v);
if (value) {
stateValue = std::move(*value);
valueParsed = true;
} else if (isArray(v)) {
std::vector<Value> array;
std::size_t length = arrayLength(v);
array.reserve(length);
for (size_t i = 0; i < length; ++i) {
optional<Value> arrayVal = toValue(arrayMember(v, i));
if (arrayVal) {
array.emplace_back(*arrayVal);
}
}
std::unordered_map<std::string, Value> result;
result[k]= std::move(array);
stateValue = std::move(result);
valueParsed = true;
return {};
} else if (isObject(v)) {
eachMember(v, convertFn);
}
if (!valueParsed) {
metadata.errorMessage = std::string("Could not get feature state value, state key: ") + k;
return nullopt;
}
stateKey = k;
parsedState[stateKey] = stateValue;
return nullopt;
};
eachMember(state, convertFn);
try {
frontend.render(map);
} catch (const std::exception&) {
return false;
}
frontend.getRenderer()->setFeatureState(sourceID, sourceLayer, featureID, parsedState);
// getFeatureState
} else if (operationArray[0].GetString() == getFeatureStateOp) {
assert(operationArray.Size() >= 2u);
assert(operationArray[1].IsObject());
std::string sourceID;
mbgl::optional<std::string> sourceLayer;
std::string featureID;
const auto& featureOptions = operationArray[1].GetObject();
if (featureOptions.HasMember("source")) {
sourceID = featureOptions["source"].GetString();
}
if (featureOptions.HasMember("sourceLayer")) {
sourceLayer = { featureOptions["sourceLayer"].GetString() };
}
if (featureOptions.HasMember("id")) {
featureID = featureOptions["id"].GetString();
}
try {
frontend.render(map);
} catch (const std::exception&) {
return false;
}
mbgl::FeatureState state;
frontend.getRenderer()->getFeatureState(state, sourceID, sourceLayer, featureID);
// removeFeatureState
} else if (operationArray[0].GetString() == removeFeatureStateOp) {
assert(operationArray.Size() >= 2u);
assert(operationArray[1].IsObject());
std::string sourceID;
mbgl::optional<std::string> sourceLayer;
std::string featureID;
mbgl::optional<std::string> stateKey;
const auto& featureOptions = operationArray[1].GetObject();
if (featureOptions.HasMember("source")) {
sourceID = featureOptions["source"].GetString();
}
if (featureOptions.HasMember("sourceLayer")) {
sourceLayer = { featureOptions["sourceLayer"].GetString() };
}
if (featureOptions.HasMember("id")) {
featureID = featureOptions["id"].GetString();
}
if (operationArray.Size() >= 3u) {
assert(operationArray[2].IsString());
stateKey = { operationArray[2].GetString() };
}
try {
frontend.render(map);
} catch (const std::exception&) {
return false;
}
frontend.getRenderer()->removeFeatureState(sourceID, sourceLayer, featureID, stateKey);
} else {
metadata.errorMessage = std::string("Unsupported operation: ") + operationArray[0].GetString();
return false;