layer::layer(nlohmann::json const &j) {
DB(j);
if (j["type"] == "range") {
- this->id_min = get<int>(j["first_surface_id"]);
- this->id_max = get<int>(j["last_surface_id"]);
+ this->id_min = j["first_surface_id"];
+ this->id_max = j["last_surface_id"];
} else {
- this->id_min = this->id_max = get<int>(j["surface_id"]);
+ this->id_min = this->id_max = j["surface_id"];
}
this->name = j["name"].get<std::string>();
- this->layer_id = get<int>(j["layer_id"]);
+ this->layer_id = j["layer_id"];
this->rect = genivi::full_rect;
if (j["area"]["type"] == "rect") {
auto jr = j["area"]["rect"];
this->rect = genivi::rect{
- get<int32_t>(jr["width"]), get<int32_t>(jr["height"]),
- get<int32_t>(jr["x"]), get<int32_t>(jr["y"]),
+ jr["width"], jr["height"],
+ jr["x"], jr["y"],
};
}
}
std::transform(std::cbegin(jtests), std::cend(jtests),
std::back_inserter(tests), [](json const &j) {
return std::make_pair(
- get<int>(j["surface_id"]),
- get<int>(j["expect_layer_id"]));
+ j["surface_id"],
+ j["expect_layer_id"]);
});
for (auto sid : tests) {