Merge remote-tracking branch 'origin/master'

This commit is contained in:
Brad Leege
2015-02-25 16:08:44 -06:00

View File

@@ -206,7 +206,6 @@ TileData::State Source::addTile(Map& map, uv::worker& worker,
double Source::getZoom(const TransformState& state) const {
double offset = std::log(util::tileSize / info.tile_size) / std::log(2);
offset += (state.getPixelRatio() > 1.0 ? 1 :0);
return state.getZoom() + offset;
}