tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Camel-case member names

Browse Source
This commit is contained in:
John Firebaugh
2016-01-06 16:33:05 -08:00
parent 0439d00313
commit 4dc7ec0202
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mbgl/map/source.cpp
View File

@@ -169,7 +169,7 @@ void Source::load() {
void Source::updateMatrices(const mat4 &projMatrix, const TransformState &transform) {
for (const auto& pair : tiles) {
Tile &tile = *pair.second;
transform.matrixFor(tile.matrix, tile.id, std::min(static_cast<int8_t>(info->max_zoom), tile.id.z));
transform.matrixFor(tile.matrix, tile.id, std::min(static_cast<int8_t>(info->maxZoom), tile.id.z));
matrix::multiply(tile.matrix, projMatrix, tile.matrix);
}
}
@@ -325,8 +325,8 @@ std::forward_list<TileID> Source::coveringTiles(const TransformState& state) con
type == SourceType::Vector ||
type == SourceType::Annotations;
if (z < info->min_zoom) return {{}};
if (z > info->max_zoom) z = info->max_zoom;
if (z < info->minZoom) return {{}};
if (z > info->maxZoom) z = info->maxZoom;
// Map four viewport corners to pixel coordinates
box points = state.cornersToBox(z);
@@ -355,7 +355,7 @@ std::forward_list<TileID> Source::coveringTiles(const TransformState& state) con
bool Source::findLoadedChildren(const TileID& tileID, int32_t maxCoveringZoom, std::forward_list<TileID>& retain) {
bool complete = true;
int32_t z = tileID.z;
auto ids = tileID.children(info->max_zoom);
auto ids = tileID.children(info->maxZoom);
for (const auto& child_id : ids) {
const TileData::State state = hasTile(child_id);
if (TileData::isReadyState(state)) {
@@ -383,7 +383,7 @@ bool Source::findLoadedChildren(const TileID& tileID, int32_t maxCoveringZoom, s
*/
void Source::findLoadedParent(const TileID& tileID, int32_t minCoveringZoom, std::forward_list<TileID>& retain) {
for (int32_t z = tileID.z - 1; z >= minCoveringZoom; --z) {
const TileID parent_id = tileID.parent(z, info->max_zoom);
const TileID parent_id = tileID.parent(z, info->maxZoom);
const TileData::State state = hasTile(parent_id);
if (TileData::isReadyState(state)) {
retain.emplace_front(parent_id);
@@ -405,8 +405,8 @@ bool Source::update(const StyleUpdateParameters& parameters) {
std::forward_list<TileID> required = coveringTiles(parameters.transformState);
// Determine the overzooming/underzooming amounts.
int32_t minCoveringZoom = util::clamp<int32_t>(zoom - 10, info->min_zoom, info->max_zoom);
int32_t maxCoveringZoom = util::clamp<int32_t>(zoom + 1, info->min_zoom, info->max_zoom);
int32_t minCoveringZoom = util::clamp<int32_t>(zoom - 10, info->minZoom, info->maxZoom);
int32_t maxCoveringZoom = util::clamp<int32_t>(zoom + 1, info->minZoom, info->maxZoom);
// Retain is a list of tiles that we shouldn't delete, even if they are not
// the most ideal tile for the current viewport. This may include tiles like

4
src/mbgl/map/source_info.hpp
View File

@@ -16,8 +16,8 @@ class TileID;
class SourceInfo {
public:
std::vector<std::string> tiles;
uint16_t min_zoom = 0;
uint16_t max_zoom = 22;
uint16_t minZoom = 0;
uint16_t maxZoom = 22;
std::string attribution;
std::array<float, 3> center = { { 0, 0, 0 } };
std::array<float, 4> bounds = { { -180, -90, 180, 90 } };

4
src/mbgl/style/style_parser.cpp
View File

@@ -255,8 +255,8 @@ std::unique_ptr<mapbox::geojsonvt::GeoJSONVT> StyleParser::parseGeoJSON(const JS
std::unique_ptr<SourceInfo> StyleParser::parseTileJSON(const JSValue& value) {
auto info = std::make_unique<SourceInfo>();
parseTileJSONMember(value, info->tiles, "tiles");
parseTileJSONMember(value, info->min_zoom, "minzoom");
parseTileJSONMember(value, info->max_zoom, "maxzoom");
parseTileJSONMember(value, info->minZoom, "minzoom");
parseTileJSONMember(value, info->maxZoom, "maxzoom");
parseTileJSONMember(value, info->attribution, "attribution");
parseTileJSONMember(value, info->center, "center");
parseTileJSONMember(value, info->bounds, "bounds");