scale dashes by line-gap-width if present

mapbox/mapbox-gl-js#860 (comment) js: a5fb9f9fb5c7ea056b6ec228e0b398815cc0d356
mapbox · Jan 16, 2015 · 4791bac · 4791bac
1 parent 07e2396
commit 4791bac
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/mbgl/style/style_layer.cpp b/src/mbgl/style/style_layer.cpp
@@ -188,8 +188,16 @@ void StyleLayer::applyStyleProperties<LineProperties>(const float z, const times
     applyStyleProperty(PropertyKey::LineDashArray, line.dash_array, z, now);
     applyStyleProperty(PropertyKey::LineImage, line.image, z, now);
 
-    // for scaling dasharrays
-    applyStyleProperty(PropertyKey::LineWidth, line.dash_line_width, std::floor(z), now + 10000);
+    // 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;
+        }
+    }
 }
 
 template <>

diff --git a/src/mbgl/style/style_properties.hpp b/src/mbgl/style/style_properties.hpp
@@ -38,7 +38,7 @@ struct LineProperties {
     float gap_width = 0;
     float blur = 0;
     std::vector<float> dash_array;
-    float dash_line_width = 1;
+    float dash_line_width = 0;
     std::string image;
 
     inline bool isVisible() const {