Merge branch 'line-label-density'

Conflicts:
	test/suite
This commit is contained in:
Ansis Brammanis
2015-02-11 16:36:14 -08:00
4 changed files with 20 additions and 6 deletions

View File

@@ -17,17 +17,18 @@ const std::array<std::vector<float>, 4> minScaleArrays = {{
Anchors resample(const std::vector<Coordinate> &vertices, float spacing,
const float /*minScale*/, float maxScale, const float tilePixelRatio,
const int start) {
float offset) {
maxScale = std::round(std::fmax(std::fmin(8.0f, maxScale / 2.0f), 1.0f));
spacing *= tilePixelRatio / maxScale;
offset *= tilePixelRatio;
const size_t index = util::clamp<size_t>(std::floor(std::log(maxScale) / std::log(2)), 0, minScaleArrays.size() - 1);
const std::vector<float> &minScales = minScaleArrays[index];
const size_t len = minScales.size();
float distance = 0.0f;
float markedDistance = 0.0f;
int added = start;
float markedDistance = offset != 0.0f ? offset - spacing : offset;
int added = 0;
Anchors points;

View File

@@ -7,7 +7,7 @@
namespace mbgl {
Anchors resample(const std::vector<Coordinate> &vertices, float spacing,
float minScale, float maxScale, float tilePixelRatio, int start = 0);
float minScale, float maxScale, float tilePixelRatio, float offset);
}
#endif

View File

@@ -238,9 +238,22 @@ void SymbolBucket::addFeature(const std::vector<Coordinate> &line, const Shaping
Anchors anchors;
if (properties.placement == PlacementType::Line) {
float resampleOffset = 0;
if (shaping.size()) {
float minX = std::numeric_limits<float>::infinity();
float maxX = -std::numeric_limits<float>::infinity();
for (const auto &glyph : shaping) {
minX = std::min(minX, glyph.x);
maxX = std::max(maxX, glyph.x);
}
const float labelLength = maxX - minX;
resampleOffset = (labelLength / 2.0 + glyphSize * 2.0) * fontScale;
}
// Line labels
anchors = resample(line, properties.min_distance, minScale, collision.maxPlacementScale,
collision.tilePixelRatio);
collision.tilePixelRatio, resampleOffset);
// Sort anchors by segment so that we can start placement with the
// anchors that can be shown at the lowest zoom levels.