修复bug
This commit is contained in:
@@ -459,10 +459,11 @@ void Map_View_Config::from_base_json(const Psc::JSON* that_json, bool not_exist_
|
||||
map2d.from_base_json(that_json->get("map2d"), not_exist_use_default_value);
|
||||
map3d.from_base_json(that_json->get("map3d"), not_exist_use_default_value);
|
||||
camera.from_base_json(that_json->get("camera"), not_exist_use_default_value);
|
||||
const auto height_key = that_json->get("base_station_fly_to_height_offset_meters")
|
||||
? "base_station_fly_to_height_offset_meters"
|
||||
: "baseStationFlyToHeightOffsetMeters";
|
||||
base_station_fly_to_height_offset_meters =
|
||||
std::max(100.0,
|
||||
read_optional_double_field(that_json, "baseStationFlyToHeightOffsetMeters",
|
||||
base_station_fly_to_height_offset_meters));
|
||||
std::max(100.0, read_optional_double_field(that_json, height_key, base_station_fly_to_height_offset_meters));
|
||||
}
|
||||
Psc::JSON Map_View_Config::to_base_json() const {
|
||||
auto ret = Psc::JSON::object();
|
||||
@@ -470,7 +471,7 @@ Psc::JSON Map_View_Config::to_base_json() const {
|
||||
ret.append({"map2d", map2d.to_base_json()});
|
||||
ret.append({"map3d", map3d.to_base_json()});
|
||||
ret.append({"camera", camera.to_base_json()});
|
||||
ret.append({"baseStationFlyToHeightOffsetMeters", base_station_fly_to_height_offset_meters});
|
||||
ret.append({"base_station_fly_to_height_offset_meters", base_station_fly_to_height_offset_meters});
|
||||
return ret;
|
||||
}
|
||||
void Cesium_Graphics_Config::from_base_json(const Psc::JSON* that_json, bool not_exist_use_default_value) {
|
||||
|
||||
Reference in New Issue
Block a user