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

Revert "scale dashes by line-gap-width if present"

Browse Source 
This reverts commit 4791bac675.
This commit is contained in:
John Firebaugh
2015-01-22 14:05:49 -08:00
parent a8b6e3dc71
commit 0c2ffc251c
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mbgl/style/style_layer.cpp
View File

@@ -183,16 +183,8 @@ void StyleLayer::applyStyleProperties<LineProperties>(const float z, const times
applyStyleProperty(PropertyKey::LineDashArray, line.dash_array, z, now);
applyStyleProperty(PropertyKey::LineImage, line.image, z, now);
// scale dash width by line-gap-width if present
applyStyleProperty(PropertyKey::LineGapWidth, line.dash_line_width, std::floor(z), now + 10000);
if (line.dash_line_width <= 0) {
// otherwise scale by line-width
applyStyleProperty(PropertyKey::LineWidth, line.dash_line_width, std::floor(z), now + 10000);
if (line.dash_line_width <= 0) {
// otherwise scale by default line-width value
line.dash_line_width = line.width;
}
}
// for scaling dasharrays
applyStyleProperty(PropertyKey::LineWidth, line.dash_line_width, std::floor(z), now + 10000);
}
template <>

2
src/mbgl/style/style_properties.hpp
View File

@@ -38,7 +38,7 @@ struct LineProperties {
float gap_width = 0;
float blur = 0;
std::vector<float> dash_array;
float dash_line_width = 0;
float dash_line_width = 1;
std::string image;
inline bool isVisible() const {