diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-06 12:45:40 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-06-06 12:45:40 -0700 |
| commit | 47d6903f4e41cc3d4a0bacc1c1938ef8ede642ca (patch) | |
| tree | 09cf7d0199999880c032162b9a749caca1aa0ecf | |
| parent | 313d9ce09c53d3d946a7150b7998f1b081612ff9 (diff) | |
| download | qtlocation-mapboxgl-47d6903f4e41cc3d4a0bacc1c1938ef8ede642ca.tar.gz | |
[core] Revert line-round-limit default to 1 (#5260)
Refs #5258, #5234.
| -rw-r--r-- | scripts/generate-style-code.js | 5 | ||||
| -rw-r--r-- | src/mbgl/style/layers/line_layer_properties.hpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/scripts/generate-style-code.js b/scripts/generate-style-code.js index 0f2dcdc42c..6379598446 100644 --- a/scripts/generate-style-code.js +++ b/scripts/generate-style-code.js @@ -46,6 +46,11 @@ global.propertyType = function (property) { } global.defaultValue = function (property) { + // https://github.com/mapbox/mapbox-gl-native/issues/5258 + if (property.name === 'line-round-limit') { + return 1; + } + switch (property.type) { case 'number': return property.default; diff --git a/src/mbgl/style/layers/line_layer_properties.hpp b/src/mbgl/style/layers/line_layer_properties.hpp index e0c63b516b..01a8534222 100644 --- a/src/mbgl/style/layers/line_layer_properties.hpp +++ b/src/mbgl/style/layers/line_layer_properties.hpp @@ -20,7 +20,7 @@ public: LayoutProperty<LineCapType> lineCap { LineCapType::Butt }; LayoutProperty<LineJoinType> lineJoin { LineJoinType::Miter }; LayoutProperty<float> lineMiterLimit { 2 }; - LayoutProperty<float> lineRoundLimit { 1.05 }; + LayoutProperty<float> lineRoundLimit { 1 }; }; class LinePaintProperties { |