Fix stroke width conversion from mapbox styles

nyalldawson · nyalldawson · commit ece2fb9d879f · 2023-04-24T12:48:23.000+10:00
Mapbox fill strokes are always 1px in width, so we should
translate these to hairline strokes in QGIS
diff --git a/src/core/vectortile/qgsmapboxglstyleconverter.cpp b/src/core/vectortile/qgsmapboxglstyleconverter.cpp
@@ -426,6 +426,8 @@ bool QgsMapBoxGlStyleConverter::parseFillLayer( const QVariantMap &jsonLayer, Qg
 
   if ( fillOutlineColor.isValid() )
   {
+    // mapbox fill strokes are always 1 px wide
+    fillSymbol->setStrokeWidth( 0 );
     fillSymbol->setStrokeColor( fillOutlineColor );
   }
   else
diff --git a/tests/src/python/test_qgsmapboxglconverter.py b/tests/src/python/test_qgsmapboxglconverter.py
@@ -1061,6 +1061,24 @@ def testLabelWithStops(self):
         self.assertTrue(labeling_style.labelSettings().isExpression)
         self.assertEqual(labeling_style.labelSettings().fieldName, 'CASE WHEN @vector_tile_zoom > 6 AND @vector_tile_zoom < 15 THEN concat(\'my \',"class",\' and \',"stuff") WHEN @vector_tile_zoom >= 15 THEN concat(\'my \',"class",\' and \',"stuff") ELSE \'\' END')
 
+    def testFillStroke(self):
+        context = QgsMapBoxGlStyleConversionContext()
+        style = {
+            "id": "Land/Not ice",
+            "type": "fill",
+            "source": "esri",
+            "source-layer": "Land",
+            "layout": {},
+            "paint": {
+                "fill-color": "rgb(71,179,18)",
+            }
+        }
+        has_renderer, renderer = QgsMapBoxGlStyleConverter.parseFillLayer(style, context)
+        self.assertTrue(has_renderer)
+
+        # mapbox fill strokes are always 1 px wide
+        self.assertEqual(renderer.symbol()[0].strokeWidth(), 0)
+
     def testFillOpacityWithStops(self):
         context = QgsMapBoxGlStyleConversionContext()
         style = {

Original file line number	Diff line number	Diff line change
`@@ -426,6 +426,8 @@ bool QgsMapBoxGlStyleConverter::parseFillLayer( const QVariantMap &jsonLayer, Qg`
`426`	`426`
`427`	`427`	`if ( fillOutlineColor.isValid() )`
`428`	`428`	`{`
	`429`	`+ // mapbox fill strokes are always 1 px wide`
	`430`	`+ fillSymbol->setStrokeWidth( 0 );`
`429`	`431`	`fillSymbol->setStrokeColor( fillOutlineColor );`
`430`	`432`	`}`
`431`	`433`	`else`