From 47d6903f4e41cc3d4a0bacc1c1938ef8ede642ca Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 6 Jun 2016 12:45:40 -0700 Subject: [PATCH] [core] Revert line-round-limit default to 1 (#5260) Refs #5258, #5234. --- scripts/generate-style-code.js | 5 +++++ src/mbgl/style/layers/line_layer_properties.hpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/generate-style-code.js b/scripts/generate-style-code.js index 0f2dcdc42..637959844 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 e0c63b516..01a853422 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 lineCap { LineCapType::Butt }; LayoutProperty lineJoin { LineJoinType::Miter }; LayoutProperty lineMiterLimit { 2 }; - LayoutProperty lineRoundLimit { 1.05 }; + LayoutProperty lineRoundLimit { 1 }; }; class LinePaintProperties {